From db08a2850f60b1f75fe5ba373790c767b8ddd5cd Mon Sep 17 00:00:00 2001
From: SetnameWang <1944647332@qq.com>
Date: Thu, 7 Nov 2024 15:21:42 +0800
Subject: [PATCH] bugfix: fix imcstore scan delta scan error.

---
 src/gausskernel/storage/cstore/cstore_am.cpp | 5 +++--
 src/gausskernel/storage/htap/imcstore_am.cpp | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gausskernel/storage/cstore/cstore_am.cpp b/src/gausskernel/storage/cstore/cstore_am.cpp
index 2f89cb3f5..5c814f1c9 100644
--- a/src/gausskernel/storage/cstore/cstore_am.cpp
+++ b/src/gausskernel/storage/cstore/cstore_am.cpp
@@ -889,8 +889,9 @@ void CStore::CStoreScan(_in_ CStoreScanState* state, _out_ VectorBatch* vecBatch
     RoughCheckIfNeed(state);
     CSTORESCAN_TRACE_END(MIN_MAX_CHECK);
 
-    if (m_isImcstore && ImcstoreFillByDeltaScan(state, vecBatchOut)) {
-        return;
+    if (m_isImcstore) {
+        state->ss_deltaScan = ImcstoreFillByDeltaScan(state, vecBatchOut);
+        if (state->ss_deltaScan) return;
     }
 
     // step3: Have CU hitted
diff --git a/src/gausskernel/storage/htap/imcstore_am.cpp b/src/gausskernel/storage/htap/imcstore_am.cpp
index c755c040d..34a32d8f5 100644
--- a/src/gausskernel/storage/htap/imcstore_am.cpp
+++ b/src/gausskernel/storage/htap/imcstore_am.cpp
@@ -300,7 +300,6 @@ bool IMCStore::ImcstoreFillByDeltaScan(_in_ CStoreScanState* state, _out_ Vector
         FillPerRowGroupDelta((IMCStoreScanState*)state, currid, vecBatchOut);
 
         if (!BatchIsNull(vecBatchOut)) {
-            state->ss_deltaScan = true;
             return true;
         }
     }
@@ -308,7 +307,6 @@ bool IMCStore::ImcstoreFillByDeltaScan(_in_ CStoreScanState* state, _out_ Vector
     if (BatchIsNull(vecBatchOut)) {
         return false;
     }
-    state->ss_deltaScan = true;
     return true;
 }