diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index c556e94c74b8f3795cca197fd26544579aceeaad..e078a7cffbe2a98eb89c9ef6cd8b53a08792a935 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 41bbfaa9388e810f2df6e70631aade4d06f8ee3f..276b5e6e34cdcfe06df82eb03214262293adfd1d 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 07d7fb794e75647f147b189dfffff193b4e80d6d..695d5749faeddc08fa6f8376600b6cbcb188edd5 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