From d8762b9bc956782904505638ce5af23549d16999 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 25 Apr 2023 10:48:21 +0800
Subject: [PATCH] refactor: do some internal refactor.

---
 source/dnode/vnode/src/tsdb/tsdbMergeTree.c |  6 ++--
 source/dnode/vnode/src/tsdb/tsdbRead.c      | 32 ++++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
index 5a1b9d0ce4..79f4a17f65 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c
@@ -261,8 +261,10 @@ int32_t tLDataIterOpen(struct SLDataIter *pIter, SDataFReader *pReader, int32_t
   pIter->pReader = pReader;
   pIter->iStt = iStt;
   pIter->backward = backward;
-  pIter->verRange = *pRange;
-  pIter->timeWindow = *pTimeWindow;
+  pIter->verRange.minVer = pRange->minVer;
+  pIter->verRange.maxVer = pRange->maxVer;
+  pIter->timeWindow.skey = pTimeWindow->skey;
+  pIter->timeWindow.ekey = pTimeWindow->ekey;
 
   pIter->pBlockLoadInfo = pBlockLoadInfo;
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 8d4708925b..efd8ab1288 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -148,6 +148,7 @@ typedef struct STableUidList {
 typedef struct SReaderStatus {
   bool                  loadFromFile;       // check file stage
   bool                  composedDataBlock;  // the returned data block is a composed block or not
+  bool                  mapDataCleaned;     // mapData has been cleaned up alreay or not
   SSHashObj*            pTableMap;          // SHash<STableBlockScanInfo>
   STableBlockScanInfo** pTableIter;         // table iterator used in building in-memory buffer data blocks.
   STableUidList         uidList;            // check tables in uid order, to avoid the repeatly load of blocks in STT.
@@ -875,7 +876,18 @@ _end:
   return code;
 }
 
-static void cleanupTableScanInfo(SSHashObj* pTableMap) {
+static void doCleanupTableScanInfo(STableBlockScanInfo* pScanInfo) {
+  // reset the index in last block when handing a new file
+  tMapDataClear(&pScanInfo->mapData);
+  taosArrayClear(pScanInfo->pBlockList);
+}
+
+static void cleanupTableScanInfo(SReaderStatus* pStatus) {
+  if (pStatus->mapDataCleaned) {
+    return;
+  }
+
+  SSHashObj* pTableMap = pStatus->pTableMap;
   STableBlockScanInfo** px = NULL;
   int32_t iter = 0;
 
@@ -885,10 +897,10 @@ static void cleanupTableScanInfo(SSHashObj* pTableMap) {
       break;
     }
 
-    // reset the index in last block when handing a new file
-    tMapDataClear(&(*px)->mapData);
-    taosArrayClear((*px)->pBlockList);
+    doCleanupTableScanInfo(*px);
   }
+
+  pStatus->mapDataCleaned = true;
 }
 
 static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockNumber* pBlockNum, SArray* pTableScanInfoList) {
@@ -896,8 +908,10 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, SBlockN
   size_t  numOfTables = taosArrayGetSize(pIndexList);
 
   int64_t st = taosGetTimestampUs();
-  cleanupTableScanInfo(pReader->status.pTableMap);
+  cleanupTableScanInfo(&pReader->status);
 
+  // set the flag for the new file
+  pReader->status.mapDataCleaned = false;
   for (int32_t i = 0; i < numOfTables; ++i) {
     SBlockIdx*           pBlockIdx = taosArrayGet(pIndexList, i);
     STableBlockScanInfo* pScanInfo = getTableBlockScanInfo(pReader->status.pTableMap, pBlockIdx->uid, pReader->idStr);
@@ -3022,8 +3036,12 @@ static int32_t doLoadLastBlockSequentially(STsdbReader* pReader) {
     // load the last data block of current table
     STableBlockScanInfo* pScanInfo = *(STableBlockScanInfo**)pStatus->pTableIter;
 
-    bool hasVal = initLastBlockReader(pLastBlockReader, pScanInfo, pReader);
-    if (!hasVal) {
+    // reset the index in last block when handing a new file
+    doCleanupTableScanInfo(pScanInfo);
+    pStatus->mapDataCleaned = true;
+
+    bool hasDataInLastFile = initLastBlockReader(pLastBlockReader, pScanInfo, pReader);
+    if (!hasDataInLastFile) {
       bool hasNexTable = moveToNextTable(pUidList, pStatus);
       if (!hasNexTable) {
         return TSDB_CODE_SUCCESS;
-- 
GitLab