Merge pull request #8814 from taosdata/fix/TS-705-D

[TS-705]<fix> tsBufNextPos vgroupIndex crash

src/query/src/qTsbuf.c

@@ -5,7 +5,7 @@
 #include "queryLog.h"
 
 static int32_t getDataStartOffset();
-static void TSBufUpdateGroupInfo(STSBuf* pTSBuf, int32_t index, STSGroupBlockInfo* pBlockInfo);
+static void TSBufUpdateGroupInfo(STSBuf* pTSBuf, int32_t qry_index, STSGroupBlockInfo* pBlockInfo);
 static STSBuf* allocResForTSBuf(STSBuf* pTSBuf);
 static int32_t STSBufUpdateHeader(STSBuf* pTSBuf, STSBufFileHeader* pHeader);
 
@@ -697,8 +697,8 @@ bool tsBufNextPos(STSBuf* pTSBuf) {
       int32_t groupIndex = pTSBuf->numOfGroups - 1;
       pCur->vgroupIndex = groupIndex;
       
-      int32_t            id = pTSBuf->pData[pCur->vgroupIndex].info.id;
-      STSGroupBlockInfo* pBlockInfo = tsBufGetGroupBlockInfo(pTSBuf, id);
+      // get current vgroupIndex BlockInfo
+      STSGroupBlockInfo* pBlockInfo = &pTSBuf->pData[pCur->vgroupIndex].info;
       int32_t            blockIndex = pBlockInfo->numOfBlocks - 1;
       
       tsBufGetBlock(pTSBuf, groupIndex, blockIndex);
@@ -718,32 +718,43 @@ bool tsBufNextPos(STSBuf* pTSBuf) {
   while (1) {
     assert(pTSBuf->tsData.len == pTSBuf->block.numOfElem * TSDB_KEYSIZE);
     
+    // tsIndex is last
     if ((pCur->order == TSDB_ORDER_ASC && pCur->tsIndex >= pTSBuf->block.numOfElem - 1) ||
         (pCur->order == TSDB_ORDER_DESC && pCur->tsIndex <= 0)) {
-      int32_t id = pTSBuf->pData[pCur->vgroupIndex].info.id;
       
-      STSGroupBlockInfo* pBlockInfo = tsBufGetGroupBlockInfo(pTSBuf, id);
-      if (pBlockInfo == NULL || (pCur->blockIndex >= pBlockInfo->numOfBlocks - 1 && pCur->order == TSDB_ORDER_ASC) ||
+      // get current vgroupIndex BlockInfo
+      STSGroupBlockInfo* pBlockInfo = &pTSBuf->pData[pCur->vgroupIndex].info;      
+      if (pBlockInfo == NULL) {
+        return false;
+      }
+
+      // blockIndex is last
+      if ((pCur->blockIndex >= pBlockInfo->numOfBlocks - 1 && pCur->order == TSDB_ORDER_ASC) ||
           (pCur->blockIndex <= 0 && pCur->order == TSDB_ORDER_DESC)) {
+        
+        // vgroupIndex is last    
         if ((pCur->vgroupIndex >= pTSBuf->numOfGroups - 1 && pCur->order == TSDB_ORDER_ASC) ||
             (pCur->vgroupIndex <= 0 && pCur->order == TSDB_ORDER_DESC)) {
+          // this is end.  both vgroupIndex and blockindex and tsIndex is last    
           pCur->vgroupIndex = -1;
           return false;
         }
         
-        if (pBlockInfo == NULL) {
-          return false;
-        }
-        
+        // blockIndex must match with next group
+        int32_t nextGroupIdx = pCur->vgroupIndex + step;
+        pBlockInfo = &pTSBuf->pData[nextGroupIdx].info;
         int32_t blockIndex = (pCur->order == TSDB_ORDER_ASC) ? 0 : (pBlockInfo->numOfBlocks - 1);
+        // vgroupIndex move next and set value in tsBufGetBlock()
         tsBufGetBlock(pTSBuf, pCur->vgroupIndex + step, blockIndex);
         break;
         
       } else {
+        // blockIndex move next and set value in tsBufGetBlock()
         tsBufGetBlock(pTSBuf, pCur->vgroupIndex, pCur->blockIndex + step);
         break;
       }
     } else {
+      // tsIndex move next
       pCur->tsIndex += step;
       break;
     }
@@ -767,7 +778,7 @@ STSElem tsBufGetElem(STSBuf* pTSBuf) {
   }
   
   STSCursor* pCur = &pTSBuf->cur;
-  if (pCur != NULL && pCur->vgroupIndex < 0) {
+  if (pCur->vgroupIndex < 0) {
     return elem1;
   }
 
@@ -796,7 +807,7 @@ int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf) {
     return -1;
   }
   
-  // src can only have one vnode index
+  // src can only have one vnode qry_index
   assert(pSrcBuf->numOfGroups == 1);
 
   // there are data in buffer, flush to disk first
@@ -819,7 +830,7 @@ int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf) {
       pDestBuf->pData = tmp;
     }
     
-    // directly copy the vnode index information
+    // directly copy the vnode qry_index information
     memcpy(&pDestBuf->pData[oldSize], pSrcBuf->pData, (size_t)pSrcBuf->numOfGroups * sizeof(STSGroupBlockInfoEx));
     
     // set the new offset value
@@ -1012,8 +1023,8 @@ static int32_t getDataStartOffset() {
 }
 
 // update prev vnode length info in file
-static void TSBufUpdateGroupInfo(STSBuf* pTSBuf, int32_t index, STSGroupBlockInfo* pBlockInfo) {
-  int32_t offset = sizeof(STSBufFileHeader) + index * sizeof(STSGroupBlockInfo);
+static void TSBufUpdateGroupInfo(STSBuf* pTSBuf, int32_t qry_index, STSGroupBlockInfo* pBlockInfo) {
+  int32_t offset = sizeof(STSBufFileHeader) + qry_index * sizeof(STSGroupBlockInfo);
   doUpdateGroupInfo(pTSBuf, offset, pBlockInfo);
 }