From 67e2a153b05cc54508165fce1b4e192a81086939 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 23:02:21 +0800 Subject: [PATCH 1/2] [TD-225]fix compiler error. --- src/tsdb/src/tsdbRead.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 39030b15d7..4045e302c7 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -2148,16 +2148,7 @@ bool tsdbNextDataBlockWithoutMerge(TsdbQueryHandleT* pHandle) { size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo); assert(numOfTables > 0); - if (pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL) { - SMemRef* pMemRef = pQueryHandle->pMemRef; - tsdbMayTakeMemSnapshot(pQueryHandle); - bool ret = getNeighborRows(pQueryHandle); - tsdbMayUnTakeMemSnapshot(pQueryHandle); - - // restore the pMemRef - pQueryHandle->pMemRef = pMemRef; - return ret; - } else if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST && pQueryHandle->cachelastrow) { + if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST && pQueryHandle->cachelastrow) { // the last row is cached in buffer, return it directly. // here note that the pQueryHandle->window must be the TS_INITIALIZER int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)); From 9c58bfbd79720ba8eb5fb27c55e95547535cd1be Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 23:16:01 +0800 Subject: [PATCH 2/2] [TD-225]update the sim. --- tests/script/general/parser/stableOp.sim | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/script/general/parser/stableOp.sim b/tests/script/general/parser/stableOp.sim index 133de95b9c..f4b1bd4b8a 100644 --- a/tests/script/general/parser/stableOp.sim +++ b/tests/script/general/parser/stableOp.sim @@ -1,6 +1,5 @@ system sh/stop_dnodes.sh - system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/exec.sh -n dnode1 -s start @@ -78,7 +77,6 @@ if $rows != 0 then return -1 endi - sql DROP STABLE $stb sql show stables