From fe653c948e73ab30653579c5d344dcf22c39c5ae Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao@163.com>
Date: Tue, 21 Jun 2022 09:42:48 +0800
Subject: [PATCH] fix(stream): window close

---
 source/libs/executor/src/timewindowoperator.c | 7 ++++---
 tests/script/jenkins/basic.txt                | 1 +
 tests/script/tsim/stream/windowClose.sim      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index c556e94c74..e078a7cffb 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2360,9 +2360,6 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream,
     }
   }
   // semi interval operator does not catch result
-  if (!IS_FINAL_OP(pInfo)) {
-    pInfo->twAggSup.calTrigger = STREAM_TRIGGER_AT_ONCE;
-  }
   pInfo->pUpdateRes = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
   pInfo->pUpdateRes->info.type = STREAM_REPROCESS;
   blockDataEnsureCapacity(pInfo->pUpdateRes, 128);
@@ -2376,6 +2373,10 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream,
     pOperator->name = "StreamSemiIntervalOperator";
   }
 
+  if (!IS_FINAL_OP(pInfo)) {
+    pInfo->twAggSup.calTrigger = STREAM_TRIGGER_AT_ONCE;
+  }
+
   pOperator->operatorType = pPhyNode->type;
   pOperator->blocking = true;
   pOperator->status = OP_NOT_OPENED;
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 41bbfaa938..276b5e6e34 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -81,6 +81,7 @@
 # ./test.sh -f tsim/stream/triggerSession0.sim
 ./test.sh -f tsim/stream/partitionby.sim
 ./test.sh -f tsim/stream/schedSnode.sim
+./test.sh -f tsim/stream/windowClose.sim
 
 
 # ---- transaction
diff --git a/tests/script/tsim/stream/windowClose.sim b/tests/script/tsim/stream/windowClose.sim
index 07d7fb794e..695d5749fa 100644
--- a/tests/script/tsim/stream/windowClose.sim
+++ b/tests/script/tsim/stream/windowClose.sim
@@ -22,7 +22,7 @@ sql create stream stream1 trigger window_close into streamt as select  _wstartts
 
 sql insert into tu1 values(now, 1);
 
-sleep 300
+sleep 500
 sql select * from streamt;
 if $rows != 0 then
   print ======$rows