[TD-2298]

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