From a32bbd5fbf0c016d325f6c6d569b92c4d8b78485 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 16 Oct 2020 10:41:31 +0800
Subject: [PATCH] [td-225]

---
 src/tsdb/src/tsdbRead.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index f0a2694b60..f13e5e5de8 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -808,7 +808,7 @@ static int32_t handleDataMergeIfNeeded(STsdbQueryHandle* pQueryHandle, SCompBloc
       return code;
     }
 
-    doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
+//    doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
   } else {
     /*
      * no data in cache, only load data from file
@@ -871,7 +871,7 @@ static int32_t loadFileDataBlock(STsdbQueryHandle* pQueryHandle, SCompBlock* pBl
       }
 
       assert(pCheckInfo->lastKey <= pBlock->keyLast);
-      doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
+//      doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
     } else {  // the whole block is loaded in to buffer
       cur->pos = ASCENDING_TRAVERSE(pQueryHandle->order)? 0:(pBlock->numOfRows - 1);
       code = handleDataMergeIfNeeded(pQueryHandle, pBlock, pCheckInfo);
@@ -891,7 +891,7 @@ static int32_t loadFileDataBlock(STsdbQueryHandle* pQueryHandle, SCompBlock* pBl
       }
 
       assert(pCheckInfo->lastKey >= pBlock->keyFirst);
-      doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
+//      doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
     } else {
       cur->pos = ASCENDING_TRAVERSE(pQueryHandle->order)? 0:(pBlock->numOfRows-1);
       code = handleDataMergeIfNeeded(pQueryHandle, pBlock, pCheckInfo);
-- 
GitLab