diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index db68f77a18b706ca74e6c77495a4d59d7406a726..25a78ed02aec54bee8c5c1efa7d46a340b3ca8d1 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1253,8 +1253,15 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   if (pQueryInfo->tsBuf != NULL) {
     // note: here used the idx instead of actual vnode id.
-    int32_t vnodeIndex = pTableMetaInfo->vgroupIndex;
-    code = dumpFileBlockByGroupId(pQueryInfo->tsBuf, vnodeIndex, pMsg, &pQueryMsg->tsBuf.tsLen, &pQueryMsg->tsBuf.tsNumOfBlocks);
+    int32_t vgId = 0;
+    if (pTableMetaInfo->vgroupList != NULL) {
+      int32_t vnodeIndex = pTableMetaInfo->vgroupIndex;
+      vgId = pTableMetaInfo->vgroupList->vgroups[vnodeIndex].vgId;
+    } else {
+      vgId = query.vgId;
+    }
+
+    code = dumpFileBlockByGroupId(pQueryInfo->tsBuf, vgId, pMsg, &pQueryMsg->tsBuf.tsLen, &pQueryMsg->tsBuf.tsNumOfBlocks);
     if (code != TSDB_CODE_SUCCESS) {
       goto _end;
     }
@@ -1317,8 +1324,6 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   memcpy(pMsg, pSql->sqlstr, sqlLen);
   pMsg += sqlLen;
 
-
-
   pQueryMsg->extend = 1;
   
   STLV *tlv = (STLV *)pMsg;
diff --git a/src/query/inc/qTsbuf.h b/src/query/inc/qTsbuf.h
index 00cc4e897f130348b81a7d96419c1b292cacca8c..109065b962d5a8dd9f02c7aa767a8fbf9e84983b 100644
--- a/src/query/inc/qTsbuf.h
+++ b/src/query/inc/qTsbuf.h
@@ -110,7 +110,7 @@ int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf);
 
 STSBuf* tsBufClone(STSBuf* pTSBuf);
 
-STSGroupBlockInfo* tsBufGetGroupBlockInfo(STSBuf* pTSBuf, int32_t id);
+SArray* tsBufGetGroupBlockInfo(STSBuf* pTSBuf, int32_t id);
 
 void    tsBufFlush(STSBuf* pTSBuf);
 void    tsBufResetPos(STSBuf* pTSBuf);
diff --git a/src/query/src/qTsbuf.c b/src/query/src/qTsbuf.c
index 2c7e09b84408beae3814cdd943388eb031639257..85dc8d1f0976f684e6d1ee1bbac794cc6b9e4e94 100644
--- a/src/query/src/qTsbuf.c
+++ b/src/query/src/qTsbuf.c
@@ -651,13 +651,16 @@ static int32_t doUpdateGroupInfo(STSBuf* pTSBuf, int64_t offset, STSGroupBlockIn
   return 0;
 }
 
-STSGroupBlockInfo* tsBufGetGroupBlockInfo(STSBuf* pTSBuf, int32_t id) {
-  int32_t j = tsBufFindGroupById(pTSBuf->pData, pTSBuf->numOfGroups, id);
-  if (j == -1) {
-    return NULL;
+SArray* tsBufGetGroupBlockInfo(STSBuf* pTSBuf, int32_t id) {
+  SArray* pList = taosArrayInit(4, sizeof(STSGroupBlockInfo));
+
+  for(int32_t i = 0; i < pTSBuf->numOfGroups; ++i) {
+    if (pTSBuf->pData[i].info.id == id) {
+      taosArrayPush(pList, &pTSBuf->pData[i].info);
+    }
   }
-  
-  return &pTSBuf->pData[j].info;
+
+  return pList;
 }
 
 int32_t STSBufUpdateHeader(STSBuf* pTSBuf, STSBufFileHeader* pHeader) {
@@ -1099,28 +1102,33 @@ void tsBufGetGroupIdList(STSBuf* pTSBuf, int32_t* num, int32_t** id) {
   }
 }
 
-int32_t dumpFileBlockByGroupId(STSBuf* pTSBuf, int32_t groupIndex, void* buf, int32_t* len, int32_t* numOfBlocks) {
-  assert(groupIndex >= 0 && groupIndex < pTSBuf->numOfGroups);
-  STSGroupBlockInfo *pBlockInfo = &pTSBuf->pData[groupIndex].info;
+int32_t dumpFileBlockByGroupId(STSBuf* pTSBuf, int32_t groupId, void* buf, int32_t* len, int32_t* numOfBlocks) {
+  SArray* pList = tsBufGetGroupBlockInfo(pTSBuf, groupId);
 
   *len = 0;
   *numOfBlocks = 0;
 
-  if (fseek(pTSBuf->f, pBlockInfo->offset, SEEK_SET) != 0) {
-    int code = TAOS_SYSTEM_ERROR(ferror(pTSBuf->f));
-//    qError("%p: fseek failed: %s", pSql, tstrerror(code));
-    return code;
-  }
+  char* p = buf;
+  for(int32_t i = 0; i < taosArrayGetSize(pList); ++i) {
+    STSGroupBlockInfo* pBlockInfo = taosArrayGet(pList, i);
 
-  size_t s = fread(buf, 1, pBlockInfo->compLen, pTSBuf->f);
-  if (s != pBlockInfo->compLen) {
-    int code = TAOS_SYSTEM_ERROR(ferror(pTSBuf->f));
-//    tscError("%p: fread didn't return expected data: %s", pSql, tstrerror(code));
-    return code;
-  }
+    if (fseek(pTSBuf->f, pBlockInfo->offset, SEEK_SET) != 0) {
+      int code = TAOS_SYSTEM_ERROR(ferror(pTSBuf->f));
+      //    qError("%p: fseek failed: %s", pSql, tstrerror(code));
+      return code;
+    }
 
-  *len = pBlockInfo->compLen;
-  *numOfBlocks = pBlockInfo->numOfBlocks;
+    size_t s = fread(p, 1, pBlockInfo->compLen, pTSBuf->f);
+    if (s != pBlockInfo->compLen) {
+      int code = TAOS_SYSTEM_ERROR(ferror(pTSBuf->f));
+      //    tscError("%p: fread didn't return expected data: %s", pSql, tstrerror(code));
+      return code;
+    }
+
+    *len += pBlockInfo->compLen;
+    *numOfBlocks += pBlockInfo->numOfBlocks;
+    p += pBlockInfo->compLen;
+  }
 
   return TSDB_CODE_SUCCESS;
 }