From 424e574e94b2250b536c9d6418dff8fb23d05891 Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao@163.com>
Date: Mon, 28 Oct 2024 11:09:56 +0800
Subject: [PATCH] fix issue

---
 source/libs/executor/src/executor.c                | 1 +
 source/libs/executor/src/streamtimesliceoperator.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index a5211f2da0..30f23f60da 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -1099,6 +1099,7 @@ static int32_t getOpratorIntervalInfo(SOperatorInfo* pOperator, int64_t* pWaterM
   SStreamScanInfo* pScanOp = (SStreamScanInfo*) pOperator->info;
   *pWaterMark = pScanOp->twAggSup.waterMark;
   *pInterval = pScanOp->interval;
+  *pLastWindow = pScanOp->lastScanRange;
   return TSDB_CODE_SUCCESS; 
 }
 
diff --git a/source/libs/executor/src/streamtimesliceoperator.c b/source/libs/executor/src/streamtimesliceoperator.c
index 3d7219a262..07c96d38df 100644
--- a/source/libs/executor/src/streamtimesliceoperator.c
+++ b/source/libs/executor/src/streamtimesliceoperator.c
@@ -1315,8 +1315,9 @@ static void doStreamTimeSliceImpl(SOperatorInfo* pOperator, SSDataBlock* pBlock)
       pkLen = colDataGetRowLength(pPkColDataInfo, startPos);
     }
 
-    if (pInfo->ignoreExpiredData && checkExpiredData(&pAggSup->stateStore, pAggSup->pUpdateInfo, &pInfo->twAggSup,
-                                                     pBlock->info.id.uid, tsCols[startPos], pPkVal, pkLen)) {
+    if (pInfo->twAggSup.calTrigger != STREAM_TRIGGER_FORCE_WINDOW_CLOSE && pInfo->ignoreExpiredData &&
+        checkExpiredData(&pAggSup->stateStore, pAggSup->pUpdateInfo, &pInfo->twAggSup, pBlock->info.id.uid,
+                         tsCols[startPos], pPkVal, pkLen)) {
       qDebug("===stream===ignore expired data, window end ts:%" PRId64 ", maxts - wartermak:%" PRId64, tsCols[startPos],
              pInfo->twAggSup.maxTs - pInfo->twAggSup.waterMark);
       continue;