From af18afba9d0d1fc822c3f06934376faed16a4561 Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Wed, 19 Jul 2023 17:19:55 +0800
Subject: [PATCH 1/2] fill history

---
 source/libs/executor/src/scanoperator.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 9abe4ffef6..b8d94695ca 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1820,11 +1820,6 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
 
   if (pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN1 ||
       pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN2) {
-    if (pInfo->blockRecoverContiCnt > 100) {
-      pInfo->blockRecoverTotCnt += pInfo->blockRecoverContiCnt;
-      pInfo->blockRecoverContiCnt = 0;
-      return NULL;
-    }
 
     switch (pInfo->scanMode) {
       case STREAM_SCAN_FROM_RES: {

From 8a6ed67f9df4e779a286fa7270e918b0ed3c187b Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Thu, 20 Jul 2023 09:13:30 +0800
Subject: [PATCH 2/2] fill history

---
 source/libs/executor/inc/executorInt.h  | 1 -
 source/libs/executor/src/scanoperator.c | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/inc/executorInt.h b/source/libs/executor/inc/executorInt.h
index b3d0ff8225..9c41eb2bf0 100644
--- a/source/libs/executor/inc/executorInt.h
+++ b/source/libs/executor/inc/executorInt.h
@@ -366,7 +366,6 @@ typedef struct SStreamScanInfo {
   SNode*     pTagIndexCond;
 
   // recover
-  int32_t      blockRecoverContiCnt;
   int32_t      blockRecoverTotCnt;
   SSDataBlock* pRecoverRes;
 
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index b8d94695ca..f1de80ec4c 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1820,6 +1820,9 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
 
   if (pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN1 ||
       pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN2) {
+    if (isTaskKilled(pTaskInfo)) {
+      return NULL;
+    }
 
     switch (pInfo->scanMode) {
       case STREAM_SCAN_FROM_RES: {
@@ -1862,7 +1865,6 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
 
     pInfo->pRecoverRes = doTableScan(pInfo->pTableScanOp);
     if (pInfo->pRecoverRes != NULL) {
-      pInfo->blockRecoverContiCnt++;
       calBlockTbName(pInfo, pInfo->pRecoverRes);
       if (!pInfo->igCheckUpdate && pInfo->pUpdateInfo) {
         if (pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN1) {