diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index 29a4dd3e349faa623a6e9161a075cc3edf6f1670..4e85cde7ca03815af522bdae921852f80ef495d1 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -53,79 +53,79 @@ _err:
   return -1;
 }
 
-//int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
+// int metaGetTableEntryByUidTest(void* meta, SArray *uidList) {
 //
-//  SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
-//  SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
-//  SMeta  *pMeta = meta;
-//  int64_t version;
-//  SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
+//   SArray* readerList = taosArrayInit(taosArrayGetSize(uidList), sizeof(SMetaReader));
+//   SArray* uidVersion = taosArrayInit(taosArrayGetSize(uidList), sizeof(STbDbKey));
+//   SMeta  *pMeta = meta;
+//   int64_t version;
+//   SHashObj *uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
 //
-//  int64_t stt1 = taosGetTimestampUs();
-//  for(int i = 0; i < taosArrayGetSize(uidList); i++) {
-//    void* ppVal = NULL;
-//    int vlen = 0;
-//    uint64_t *  uid = taosArrayGet(uidList, i);
-//    // query uid.idx
-//    if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
-//      continue;
-//    }
-//    version = *(int64_t *)ppVal;
+//   int64_t stt1 = taosGetTimestampUs();
+//   for(int i = 0; i < taosArrayGetSize(uidList); i++) {
+//     void* ppVal = NULL;
+//     int vlen = 0;
+//     uint64_t *  uid = taosArrayGet(uidList, i);
+//     // query uid.idx
+//     if (tdbTbGet(pMeta->pUidIdx, uid, sizeof(*uid), &ppVal, &vlen) < 0) {
+//       continue;
+//     }
+//     version = *(int64_t *)ppVal;
 //
-//    STbDbKey tbDbKey = {.version = version, .uid = *uid};
-//    taosArrayPush(uidVersion, &tbDbKey);
-//    taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
-//  }
-//  int64_t stt2 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
+//     STbDbKey tbDbKey = {.version = version, .uid = *uid};
+//     taosArrayPush(uidVersion, &tbDbKey);
+//     taosHashPut(uHash, uid, sizeof(int64_t), ppVal, sizeof(int64_t));
+//   }
+//   int64_t stt2 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest1 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt2-stt1);
 //
-//  TBC        *pCur = NULL;
-//  tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
-//  tdbTbcMoveToFirst(pCur);
-//  void *pKey = NULL;
-//  int   kLen = 0;
+//   TBC        *pCur = NULL;
+//   tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
+//   tdbTbcMoveToFirst(pCur);
+//   void *pKey = NULL;
+//   int   kLen = 0;
 //
-//  while(1){
-//    SMetaReader pReader = {0};
-//    int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
-//    if (ret < 0) break;
-//    STbDbKey *tmp = (STbDbKey*)pKey;
-//    int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
-//    if(ver == NULL || *ver != tmp->version) continue;
-//    taosArrayPush(readerList, &pReader);
-//  }
-//  tdbTbcClose(pCur);
+//   while(1){
+//     SMetaReader pReader = {0};
+//     int32_t ret = tdbTbcNext(pCur, &pKey, &kLen, &pReader.pBuf, &pReader.szBuf);
+//     if (ret < 0) break;
+//     STbDbKey *tmp = (STbDbKey*)pKey;
+//     int64_t *ver = (int64_t*)taosHashGet(uHash, &tmp->uid, sizeof(int64_t));
+//     if(ver == NULL || *ver != tmp->version) continue;
+//     taosArrayPush(readerList, &pReader);
+//   }
+//   tdbTbcClose(pCur);
 //
-//  taosArrayClear(readerList);
-//  int64_t stt3 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
-//  for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
-//    SMetaReader pReader = {0};
+//   taosArrayClear(readerList);
+//   int64_t stt3 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest2 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt3-stt2);
+//   for(int i = 0; i < taosArrayGetSize(uidVersion); i++) {
+//     SMetaReader pReader = {0};
 //
-//    STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
-//    // query table.db
-//    if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
-//      continue;
-//    }
-//    taosArrayPush(readerList, &pReader);
-//  }
-//  int64_t stt4 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
+//     STbDbKey *tbDbKey = taosArrayGet(uidVersion, i);
+//     // query table.db
+//     if (tdbTbGet(pMeta->pTbDb, tbDbKey, sizeof(STbDbKey), &pReader.pBuf, &pReader.szBuf) < 0) {
+//       continue;
+//     }
+//     taosArrayPush(readerList, &pReader);
+//   }
+//   int64_t stt4 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest3 rows:%d, cost:%ld us", taosArrayGetSize(uidList), stt4-stt3);
 //
-//  for(int i = 0; i < taosArrayGetSize(readerList); i++){
-//    SMetaReader* pReader  = taosArrayGet(readerList, i);
-//    metaReaderInit(pReader, meta, 0);
-//    // decode the entry
-//    tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
+//   for(int i = 0; i < taosArrayGetSize(readerList); i++){
+//     SMetaReader* pReader  = taosArrayGet(readerList, i);
+//     metaReaderInit(pReader, meta, 0);
+//     // decode the entry
+//     tDecoderInit(&pReader->coder, pReader->pBuf, pReader->szBuf);
 //
-//    if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
-//    }
-//    metaReaderClear(pReader);
-//  }
-//  int64_t stt5 = taosGetTimestampUs();
-//  qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
-//  return 0;
-//}
+//     if (metaDecodeEntry(&pReader->coder, &pReader->me) < 0) {
+//     }
+//     metaReaderClear(pReader);
+//   }
+//   int64_t stt5 = taosGetTimestampUs();
+//   qDebug("metaGetTableEntryByUidTest4 rows:%d, cost:%ld us", taosArrayGetSize(readerList), stt5-stt4);
+//   return 0;
+// }
 
 int metaGetTableEntryByUid(SMetaReader *pReader, tb_uid_t uid) {
   SMeta  *pMeta = pReader->pMeta;
@@ -824,7 +824,7 @@ SArray *metaGetSmaTbUids(SMeta *pMeta) {
 #endif
 
 const void *metaGetTableTagVal(void *pTag, int16_t type, STagVal *val) {
-  STag *tag = (STag*) pTag;
+  STag *tag = (STag *)pTag;
   if (type == TSDB_DATA_TYPE_JSON) {
     return tag;
   }
@@ -926,6 +926,9 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
         break;
       }
     }
+    if (p->suid != pKey->suid) {
+      break;
+    }
     first = false;
     if (p != NULL) {
       int32_t cmp = (*param->filterFunc)(p->data, pKey->data, pKey->type);
@@ -966,10 +969,10 @@ int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj
   SMCtbCursor *pCur = metaOpenCtbCursor(pMeta, suid);
 
   SHashObj *uHash = NULL;
-  size_t len = taosArrayGetSize(uidList);   // len > 0 means there already have uids
-  if(len > 0){
+  size_t    len = taosArrayGetSize(uidList);  // len > 0 means there already have uids
+  if (len > 0) {
     uHash = taosHashInit(32, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
-    for(int i = 0; i < len; i++){
+    for (int i = 0; i < len; i++) {
       int64_t *uid = taosArrayGet(uidList, i);
       taosHashPut(uHash, uid, sizeof(int64_t), &i, sizeof(i));
     }
@@ -982,7 +985,7 @@ int32_t metaGetTableTags(SMeta *pMeta, uint64_t suid, SArray *uidList, SHashObj
 
     if (len > 0 && taosHashGet(uHash, &id, sizeof(int64_t)) == NULL) {
       continue;
-    }else if (len == 0) {
+    } else if (len == 0) {
       taosArrayPush(uidList, &id);
     }