Merge remote-tracking branch 'origin/feature/query' into feature/win

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));

tests/script/general/parser/stableOp.sim

 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