From d59b8f18da1c940c4df942b6082bb05c280fff5b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 3 Dec 2020 10:32:55 +0800
Subject: [PATCH] [TD-2298]

---
 src/query/src/qExecutor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index f47cd34729..1b2d3f12f5 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -3978,13 +3978,14 @@ void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) {
       qstatus.status = pQuery->status;
 
       // do nothing if no data blocks are found qualified during scan
-      qstatus.lastKey = pTableQueryInfo->lastKey;
       if (qstatus.lastKey != pTableQueryInfo->lastKey) {
         qstatus.curWindow.ekey = pTableQueryInfo->lastKey - step;
       } else { // the lastkey does not increase, which means no data checked yet
         qDebug("QInfo:%p no results generated in this scan, abort", pQInfo);
         return;
       }
+
+      qstatus.lastKey = pTableQueryInfo->lastKey;
     }
 
     if (!needScanDataBlocksAgain(pRuntimeEnv)) {
-- 
GitLab