From ba38a625cf81e8547cc4d929ed6da1c06edda3cf Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 29 Jun 2023 13:42:23 +0800
Subject: [PATCH] fix(stream): remove the shared ptr between reader ptr.

---
 source/dnode/vnode/src/tsdb/tsdbRead2.c | 64 +++++++++++++------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c
index 351089a3ed..0034eefa05 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@@ -173,7 +173,6 @@ typedef struct SReaderStatus {
   SFilesetIter          fileIter;
   SDataBlockIter        blockIter;
   SArray*               pLDataIterArray;
-//  SLDataIter*           pLDataIter;
   SRowMerger            merger;
   SColumnInfoData*      pPrimaryTsCol;      // primary time stamp output col info data
 } SReaderStatus;
@@ -2444,7 +2443,6 @@ static int32_t mergeFileBlockAndLastBlock(STsdbReader* pReader, SLastBlockReader
     // row in last file block
     TSDBROW fRow = tsdbRowFromBlockData(pBlockData, pDumpInfo->rowIndex);
     int64_t ts = getCurrentKeyInLastBlock(pLastBlockReader);
-//    ASSERT(ts >= key);
 
     if (ASCENDING_TRAVERSE(pReader->order)) {
       if (key < ts) {  // imem, mem are all empty, file blocks (data blocks and last block) exist
@@ -2788,6 +2786,37 @@ static bool isValidFileBlockRow(SBlockData* pBlockData, SFileBlockDumpInfo* pDum
   return true;
 }
 
+static int32_t checkTombBlockRecords(SArray* pData, STombBlock* pBlock, uint64_t suid, uint64_t uid, int64_t maxVer) {
+  STombRecord record = {0};
+
+  for (int32_t j = 0; j < pBlock->suid->size; ++j) {
+    int32_t code = tTombBlockGet(pBlock, j, &record);
+    if (code != TSDB_CODE_SUCCESS) {
+       return code;
+    }
+
+    if (record.suid < suid) {
+      continue;
+    }
+
+    // todo use binary search instead here
+    if (record.uid < uid) {
+      continue;
+    }
+
+    if (record.uid > uid) {
+      break;
+    }
+
+    if (record.version <= maxVer) {
+      SDelData delData = {.version = record.version, .sKey = record.skey, .eKey = record.ekey};
+      taosArrayPush(pData, &delData);
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t loadTomRecordInfoFromSttFiles(SArray* pLDataIterList, uint64_t suid, STableBlockScanInfo* pBlockScanInfo,
                                              uint64_t maxVer) {
   int32_t size = taosArrayGetSize(pLDataIterList);
@@ -2800,8 +2829,6 @@ static int32_t loadTomRecordInfoFromSttFiles(SArray* pLDataIterList, uint64_t su
     pBlockScanInfo->pDelData = taosArrayInit(4, sizeof(SDelData));
   }
 
-  STombRecord record = {0};
-
   for(int32_t i = 0; i < size; ++i) {
     SArray* pLeveledLDataIter = taosArrayGetP(pLDataIterList, i);
 
@@ -2814,34 +2841,13 @@ static int32_t loadTomRecordInfoFromSttFiles(SArray* pLDataIterList, uint64_t su
       SLDataIter* pIter = taosArrayGetP(pLeveledLDataIter, f);
 
       SArray* pTombBlockArray = pIter->pBlockLoadInfo->pTombBlockArray;
-
       int32_t numOfBlocks = taosArrayGetSize(pTombBlockArray);
       for (int32_t k = 0; k < numOfBlocks; ++k) {
         STombBlock* pBlock = taosArrayGetP(pTombBlockArray, k);
 
-        for (int32_t j = 0; j < pBlock->suid->size; ++j) {
-          int32_t code = tTombBlockGet(pBlock, j, &record);
-          if (code != TSDB_CODE_SUCCESS) {
-            // todo handle error
-          }
-
-          if (record.suid < suid) {
-            continue;
-          }
-
-          // todo use binary search instead here
-          if (record.uid < uid) {
-            continue;
-          }
-
-          if (record.uid > uid) {
-            break;
-          }
-
-          if (record.version <= maxVer) {
-            SDelData delData = {.version = record.version, .sKey = record.skey, .eKey = record.ekey};
-            taosArrayPush(pBlockScanInfo->pDelData, &delData);
-          }
+        int32_t code = checkTombBlockRecords(pBlockScanInfo->pDelData, pBlock, suid, uid, maxVer);
+        if (code != TSDB_CODE_SUCCESS) {
+          return code;
         }
       }
     }
@@ -4803,7 +4809,6 @@ int32_t tsdbReaderOpen2(void* pVnode, SQueryTableDataCond* pCond, void* pTableLi
 }
 
 static void clearSharedPtr(STsdbReader* p) {
-  p->status.pLDataIterArray = NULL;
   p->status.pTableMap = NULL;
   p->status.uidList.tableUidList = NULL;
   p->pReadSnap = NULL;
@@ -4814,7 +4819,6 @@ static void clearSharedPtr(STsdbReader* p) {
 
 static void setSharedPtr(STsdbReader* pDst, const STsdbReader* pSrc) {
   pDst->status.pTableMap = pSrc->status.pTableMap;
-  pDst->status.pLDataIterArray = pSrc->status.pLDataIterArray;
   pDst->status.uidList = pSrc->status.uidList;
   pDst->pSchema = pSrc->pSchema;
   pDst->pSchemaMap = pSrc->pSchemaMap;
-- 
GitLab