From cf489cb442fc8e0a64eb9df28334d3eadb3b260c Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Mon, 29 Jul 2024 10:44:56 +0800
Subject: [PATCH] adj operator res

---
 source/libs/executor/src/scanoperator.c | 12 ++++--------
 tests/system-test/7-tmq/tmq_taosx.py    | 12 ------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index c4716c5850..acc3de3447 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -2556,13 +2556,9 @@ static int32_t rebuildDeleteBlockData(SSDataBlock* pBlock, STimeWindow* pWindow,
 
   if (hasUnqualified) {
     code = trimDataBlock(pBlock, pBlock->info.rows, p);
-    QUERY_CHECK_CODE(code, lino, _end);
     qDebug("%s re-build delete datablock, start key revised to:%" PRId64 ", rows:%" PRId64, id, skey,
            pBlock->info.rows);
-    if (code != TSDB_CODE_SUCCESS) {
-      qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
-      return code;
-    }
+    QUERY_CHECK_CODE(code, lino, _end);
   } else {
     qDebug("%s not update the delete block", id);
   }
@@ -2752,7 +2748,7 @@ static int32_t doQueueScanNext(SOperatorInfo* pOperator, SSDataBlock** ppRes) {
 
   if (isTaskKilled(pTaskInfo)) {
     (*ppRes) = NULL;
-    return code;
+    return pTaskInfo->code;
   }
 
   if (pTaskInfo->streamInfo.currentOffset.type == TMQ_OFFSET__SNAPSHOT_DATA) {
@@ -2762,8 +2758,8 @@ static int32_t doQueueScanNext(SOperatorInfo* pOperator, SSDataBlock** ppRes) {
       if (pResult && pResult->info.rows > 0) {
         bool hasPrimaryKey = pAPI->tqReaderFn.tqGetTablePrimaryKey(pInfo->tqReader);
         code = processPrimaryKey(pResult, hasPrimaryKey, &pTaskInfo->streamInfo.currentOffset);
-        qDebug("tmqsnap doQueueScan get data uid:%" PRId64 "", pResult->info.id.uid);
-        if (pResult->info.rows > 0) {
+        qDebug("tmqsnap doQueueScan get data utid:%" PRId64 "", pResult->info.id.uid);
+        if (pResult->info.rows > 0 || code != TSDB_CODE_SUCCESS) {
           (*ppRes) = pResult;
           return code;
         }
diff --git a/tests/system-test/7-tmq/tmq_taosx.py b/tests/system-test/7-tmq/tmq_taosx.py
index 883ed628a6..efa5f6b0f1 100644
--- a/tests/system-test/7-tmq/tmq_taosx.py
+++ b/tests/system-test/7-tmq/tmq_taosx.py
@@ -292,18 +292,6 @@ class TDTestCase:
 
         return
 
-    def checkVgroupTable(self):
-        buildPath = tdCom.getBuildPath()
-        cfgPath = tdCom.getClientCfgPath()
-        cmdStr = '%s/build/bin/tmq_taosx_ci -c %s -sv 1 -dv 1 -t'%(buildPath, cfgPath)
-        tdLog.info(cmdStr)
-        os.system(cmdStr)
-
-        self.checkJson(cfgPath, "tmq_taosx_tmp_snapshot")
-        self.checkDataTable()
-
-        return
-
     def checkSnapshot1VgroupTable(self):
         buildPath = tdCom.getBuildPath()
         cfgPath = tdCom.getClientCfgPath()