From 376688479c6e532f0fb4becbcdd6255d6c788bba Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Fri, 16 Jun 2023 08:39:37 +0800
Subject: [PATCH] fix: remove multi-reader since two level merge is used

---
 source/libs/executor/src/scanoperator.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 2c1327e0ad..e43eb17528 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -55,7 +55,6 @@ typedef struct STableMergeScanSortSourceParam {
   int32_t        readerIdx;
   uint64_t       uid;
   SSDataBlock*   inputBlock;
-  bool           multiReader;
   STsdbReader*   dataReader;
 } STableMergeScanSortSourceParam;
 
@@ -2653,8 +2652,7 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
   int64_t      st = taosGetTimestampUs();
   void*        p = tableListGetInfo(pInfo->base.pTableListInfo, readIdx + pInfo->tableStartIndex);
   SReadHandle* pHandle = &pInfo->base.readHandle;
-  source->multiReader = true;
-  if (NULL == source->dataReader || !source->multiReader) {
+  if (NULL == source->dataReader) {
     code = pAPI->tsdReader.tsdReaderOpen(pHandle->vnode, pQueryCond, p, 1, pBlock, (void**)&source->dataReader, GET_TASKID(pTaskInfo), false, NULL);
     if (code != 0) {
       T_LONG_JMP(pTaskInfo->env, code);
@@ -2718,22 +2716,14 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
     pInfo->base.readRecorder.elapsedTime += (taosGetTimestampUs() - st) / 1000.0;
 
     qTrace("tsdb/read-table-data: %p, close reader", reader);
-    if (!source->multiReader) {
-      pAPI->tsdReader.tsdReaderClose(pInfo->base.dataReader);
-      source->dataReader = NULL;
-    }
     pInfo->base.dataReader = NULL;
     return pBlock;
   }
 
-  if (!source->multiReader) {
-    pAPI->tsdReader.tsdReaderClose(pInfo->base.dataReader);
-    source->dataReader = NULL;
-  }
-  pInfo->base.dataReader = NULL;
-
   pAPI->tsdReader.tsdReaderClose(source->dataReader);
   source->dataReader = NULL;
+  pInfo->base.dataReader = NULL;
+
   return NULL;
 }
 
@@ -2805,7 +2795,6 @@ int32_t startGroupTableMergeScan(SOperatorInfo* pOperator) {
     STableMergeScanSortSourceParam param = {0};
     param.readerIdx = i;
     param.pOperator = pOperator;
-    param.multiReader = (numOfTable <= MULTI_READER_MAX_TABLE_NUM) ? true : false;
     param.inputBlock = createOneDataBlock(pInfo->pResBlock, false);
     blockDataEnsureCapacity(param.inputBlock, pOperator->resultInfo.capacity);