From 5b7ccc42ca88e01c720b664b929cf6fef641f8dc Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Wed, 19 Apr 2023 13:38:30 +0800 Subject: [PATCH] inc sleep time --- source/libs/executor/src/timewindowoperator.c | 4 +- source/libs/stream/src/streamState.c | 1 + tests/script/tsim/stream/basic0.sim | 6 +-- tests/script/tsim/stream/basic2.sim | 4 +- .../script/tsim/stream/checkStreamSTable.sim | 12 ++--- .../script/tsim/stream/checkStreamSTable1.sim | 4 +- tests/script/tsim/stream/deleteInterval.sim | 48 +++++++++--------- tests/script/tsim/stream/deleteSession.sim | 50 +++++++++---------- tests/script/tsim/stream/deleteState.sim | 24 ++++----- .../stream/distributeIntervalRetrive0.sim | 2 +- .../script/tsim/stream/distributeSession0.sim | 2 +- .../script/tsim/stream/fillHistoryBasic2.sim | 6 +-- .../tsim/stream/fillIntervalDelete0.sim | 22 ++++---- .../tsim/stream/fillIntervalDelete1.sim | 18 +++---- .../script/tsim/stream/fillIntervalLinear.sim | 10 ++-- .../tsim/stream/fillIntervalPartitionBy.sim | 8 +-- .../tsim/stream/fillIntervalPrevNext.sim | 8 +-- .../tsim/stream/fillIntervalPrevNext1.sim | 8 +-- .../script/tsim/stream/fillIntervalValue.sim | 14 +++--- .../script/tsim/stream/ignoreCheckUpdate.sim | 18 +++---- tests/script/tsim/stream/partitionby.sim | 10 ++-- tests/script/tsim/stream/partitionby1.sim | 6 +-- .../tsim/stream/partitionbyColumnInterval.sim | 6 +-- .../tsim/stream/partitionbyColumnState.sim | 14 +++--- tests/script/tsim/stream/scalar.sim | 2 +- tests/script/tsim/stream/schedSnode.sim | 2 +- tests/script/tsim/stream/session0.sim | 8 +-- tests/script/tsim/stream/session1.sim | 4 +- tests/script/tsim/stream/sliding.sim | 2 +- tests/script/tsim/stream/state0.sim | 28 +++++------ tests/script/tsim/stream/state1.sim | 12 ++--- tests/script/tsim/stream/triggerInterval0.sim | 10 ++-- tests/script/tsim/stream/udTableAndTag0.sim | 20 ++++---- tests/script/tsim/stream/udTableAndTag1.sim | 18 +++---- tests/script/tsim/stream/udTableAndTag2.sim | 26 +++++----- 35 files changed, 219 insertions(+), 218 deletions(-) diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index f6f4a75cd9..50a8772448 100644 --- a/source/libs/executor/src/timewindowoperator.c +++ b/source/libs/executor/src/timewindowoperator.c @@ -2509,7 +2509,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) { setStreamDataVersion(pTaskInfo, pInfo->dataVersion, pInfo->pState->checkPointId); qDebug("===stream===clear semi operator"); } else { - if (pInfo->twAggSup.maxTs - pInfo->twAggSup.checkPointInterval > pInfo->twAggSup.checkPointTs) { + if (pInfo->twAggSup.maxTs > 0 && pInfo->twAggSup.maxTs - pInfo->twAggSup.checkPointInterval > pInfo->twAggSup.checkPointTs) { streamStateCommit(pInfo->pState); streamStateDeleteCheckPoint(pInfo->pState, pInfo->twAggSup.maxTs - pInfo->twAggSup.deleteMark); pInfo->twAggSup.checkPointTs = pInfo->twAggSup.maxTs; @@ -4732,7 +4732,7 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) { return pInfo->binfo.pRes; } setOperatorCompleted(pOperator); - if (pInfo->twAggSup.maxTs - pInfo->twAggSup.checkPointInterval > pInfo->twAggSup.checkPointTs) { + if (pInfo->twAggSup.maxTs > 0 && pInfo->twAggSup.maxTs - pInfo->twAggSup.checkPointInterval > pInfo->twAggSup.checkPointTs) { streamStateCommit(pInfo->pState); streamStateDeleteCheckPoint(pInfo->pState, pInfo->twAggSup.maxTs - pInfo->twAggSup.deleteMark); setStreamDataVersion(pTaskInfo, pInfo->dataVersion, pInfo->pState->checkPointId); diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c index 7fa19a9860..d5696f5046 100644 --- a/source/libs/stream/src/streamState.c +++ b/source/libs/stream/src/streamState.c @@ -260,6 +260,7 @@ int32_t streamStateCommit(SStreamState* pState) { SStreamSnapshot* pShot = getSnapshot(pState->pFileState); flushSnapshot(pState->pFileState, pShot, true); } + pState->checkPointId++; return 0; #else if (tdbCommit(pState->pTdbState->db, pState->pTdbState->txn) < 0) { diff --git a/tests/script/tsim/stream/basic0.sim b/tests/script/tsim/stream/basic0.sim index f560a5df61..917a0a73ab 100644 --- a/tests/script/tsim/stream/basic0.sim +++ b/tests/script/tsim/stream/basic0.sim @@ -51,7 +51,7 @@ print =============== query data from child table $loop_count = 0 loop0: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 20 then @@ -91,7 +91,7 @@ print =============== query data from child table $loop_count = 0 loop1: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 20 then @@ -130,7 +130,7 @@ print =============== query data from child table $loop_count = 0 loop2: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 20 then diff --git a/tests/script/tsim/stream/basic2.sim b/tests/script/tsim/stream/basic2.sim index 8d0df2697b..0ad82b8b05 100644 --- a/tests/script/tsim/stream/basic2.sim +++ b/tests/script/tsim/stream/basic2.sim @@ -52,7 +52,7 @@ $loop_count = 0 loop0: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -92,7 +92,7 @@ $loop_count = 0 loop1: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/checkStreamSTable.sim b/tests/script/tsim/stream/checkStreamSTable.sim index 288dd35cfe..3b31cbc383 100644 --- a/tests/script/tsim/stream/checkStreamSTable.sim +++ b/tests/script/tsim/stream/checkStreamSTable.sim @@ -34,7 +34,7 @@ print $data20, $data21, $data22 loop0: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -118,7 +118,7 @@ print $data20, $data21, $data22, $data23 loop1: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -224,7 +224,7 @@ print $data20, $data21, $data22, $data23, $data24 loop2: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -303,7 +303,7 @@ print $data20, $data21, $data22, $data23 loop3: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -387,7 +387,7 @@ print $data20, $data21, $data22, $data23 loop4: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -463,7 +463,7 @@ sql insert into t1 values(1648791233000,1,2,3,1.0); loop8: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/checkStreamSTable1.sim b/tests/script/tsim/stream/checkStreamSTable1.sim index 495e1cf358..57d0f0190d 100644 --- a/tests/script/tsim/stream/checkStreamSTable1.sim +++ b/tests/script/tsim/stream/checkStreamSTable1.sim @@ -21,7 +21,7 @@ sql insert into t1 values(1648791212000,2,2,3); $loop_count = 0 loop0: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -51,7 +51,7 @@ sql insert into t1 values(1648791214000,1,2,3); $loop_count = 0 loop1: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/deleteInterval.sim b/tests/script/tsim/stream/deleteInterval.sim index 9540e448d4..c4c8c6d4d0 100644 --- a/tests/script/tsim/stream/deleteInterval.sim +++ b/tests/script/tsim/stream/deleteInterval.sim @@ -4,7 +4,7 @@ looptest: system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 200 +sleep 1000 sql connect sql drop stream if exists streams0; @@ -19,13 +19,13 @@ sql create table t1(ts timestamp, a int, b int , c int, d double); sql create stream streams0 trigger at_once IGNORE EXPIRED 0 into streamt as select _wstart c1, count(*) c2, max(a) c3 from t1 interval(10s); sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL); -sleep 200 +sleep 1000 sql delete from t1 where ts = 1648791213000; $loop_count = 0 loop0: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -43,7 +43,7 @@ sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL); $loop_count = 0 loop1: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -66,13 +66,13 @@ sql insert into t1 values(1648791213001,2,2,2,2.0); sql insert into t1 values(1648791213002,3,3,3,3.0); sql insert into t1 values(1648791213003,4,4,4,4.0); -sleep 200 +sleep 1000 sql delete from t1 where ts >= 1648791213001 and ts <= 1648791213002; $loop_count = 0 loop3: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -98,7 +98,7 @@ sql insert into t1 values(1648791223003,3,2,3,1.0); $loop_count = 0 loop4: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -111,14 +111,14 @@ if $rows != 2 then goto loop4 endi -sleep 200 +sleep 1000 sql delete from t1 where ts >= 1648791223000 and ts <= 1648791223003; $loop_count = 0 loop5: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -156,7 +156,7 @@ sql delete from t1 where ts >= 1648791213001 and ts <= 1648791233005; $loop_count = 0 loop6: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -201,7 +201,7 @@ sql insert into t2 values(1648791213000,NULL,NULL,NULL,NULL); $loop_count = 0 loop7: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -214,14 +214,14 @@ if $rows != 1 then goto loop7 endi -sleep 200 +sleep 1000 sql delete from t1 where ts = 1648791213000; $loop_count = 0 loop8: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; @@ -249,14 +249,14 @@ sql insert into t2 values(1648791223001,1,2,3,1.0); sql insert into t2 values(1648791223002,3,2,3,1.0); sql insert into t2 values(1648791223003,3,2,3,1.0); -sleep 200 +sleep 1000 sql delete from t2 where ts >= 1648791223000 and ts <= 1648791223001; $loop_count = 0 loop11: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -284,14 +284,14 @@ if $data12 != 3 then goto loop11 endi -sleep 200 +sleep 1000 sql delete from st where ts >= 1648791223000 and ts <= 1648791223003; $loop_count = 0 loop12: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -323,14 +323,14 @@ sql insert into t2 values(1648791213005,3,2,3,1.0); sql insert into t2 values(1648791213006,3,2,3,1.0); sql insert into t2 values(1648791223004,1,2,3,1.0); -sleep 200 +sleep 1000 sql delete from t2 where ts >= 1648791213004 and ts <= 1648791213006; $loop_count = 0 loop13: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -373,14 +373,14 @@ sql insert into t1 values(1648791233006,2,2,3,1.0); sql insert into t2 values(1648791233005,5,2,3,1.0); sql insert into t2 values(1648791233006,3,2,3,1.0); -sleep 200 +sleep 1000 sql delete from st where ts >= 1648791213001 and ts <= 1648791233005; $loop_count = 0 loop14: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -429,7 +429,7 @@ $loop_count = 0 sql delete from t1; loop15: -sleep 200 +sleep 1000 sql select * from test.streamt3 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -447,7 +447,7 @@ $loop_count = 0 sql delete from t1 where ts > 100; loop16: -sleep 200 +sleep 1000 sql select * from test.streamt3 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -465,7 +465,7 @@ $loop_count = 0 sql delete from st; loop17: -sleep 200 +sleep 1000 sql select * from test.streamt3 order by c1, c2, c3; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/deleteSession.sim b/tests/script/tsim/stream/deleteSession.sim index 3645939178..7ce311ed6a 100644 --- a/tests/script/tsim/stream/deleteSession.sim +++ b/tests/script/tsim/stream/deleteSession.sim @@ -4,7 +4,7 @@ looptest: system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 200 +sleep 1000 sql connect sql drop stream if exists streams0; @@ -19,13 +19,13 @@ sql create table t1(ts timestamp, a int, b int , c int, d double); sql create stream streams0 trigger at_once IGNORE EXPIRED 0 into streamt as select _wstart c1, count(*) c2, max(a) c3 from t1 session(ts, 5s); sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL); -sleep 200 +sleep 1000 sql delete from t1 where ts = 1648791213000; $loop_count = 0 loop0: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -43,7 +43,7 @@ sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL); $loop_count = 0 loop1: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -66,13 +66,13 @@ sql insert into t1 values(1648791213001,2,2,2,2.0); sql insert into t1 values(1648791213002,3,3,3,3.0); sql insert into t1 values(1648791213003,4,4,4,4.0); -sleep 200 +sleep 1000 sql delete from t1 where ts >= 1648791213001 and ts <= 1648791213002; $loop_count = 0 loop3: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -98,7 +98,7 @@ sql insert into t1 values(1648791223003,3,2,3,1.0); $loop_count = 0 loop4: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -111,14 +111,14 @@ if $rows != 2 then goto loop4 endi -sleep 200 +sleep 1000 sql delete from t1 where ts >= 1648791223000 and ts <= 1648791223003; $loop_count = 0 loop5: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -156,7 +156,7 @@ sql delete from t1 where ts >= 1648791213001 and ts <= 1648791233005; $loop_count = 0 loop6: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -199,7 +199,7 @@ sql insert into t2 values(1648791213000,NULL,NULL,NULL,NULL); $loop_count = 0 loop7: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -212,14 +212,14 @@ if $rows != 1 then goto loop7 endi -sleep 200 +sleep 1000 sql delete from t1 where ts = 1648791213000; $loop_count = 0 loop8: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; @@ -247,14 +247,14 @@ sql insert into t2 values(1648791223001,1,2,3,1.0); sql insert into t2 values(1648791223002,3,2,3,1.0); sql insert into t2 values(1648791223003,3,2,3,1.0); -sleep 200 +sleep 1000 sql delete from t2 where ts >= 1648791223000 and ts <= 1648791223001; $loop_count = 0 loop11: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -282,14 +282,14 @@ if $data12 != 3 then goto loop11 endi -sleep 200 +sleep 1000 sql delete from st where ts >= 1648791223000 and ts <= 1648791223003; $loop_count = 0 loop12: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -321,14 +321,14 @@ sql insert into t2 values(1648791213005,3,2,3,1.0); sql insert into t2 values(1648791213006,3,2,3,1.0); sql insert into t2 values(1648791223004,1,2,3,1.0); -sleep 200 +sleep 1000 sql delete from t2 where ts >= 1648791213004 and ts <= 1648791213006; $loop_count = 0 loop13: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -371,14 +371,14 @@ sql insert into t1 values(1648791233006,2,2,3,1.0); sql insert into t2 values(1648791233005,5,2,3,1.0); sql insert into t2 values(1648791233006,3,2,3,1.0); -sleep 200 +sleep 1000 sql delete from st where ts >= 1648791213001 and ts <= 1648791233005; $loop_count = 0 loop14: -sleep 200 +sleep 1000 sql select * from test.streamt2 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -443,7 +443,7 @@ sql insert into t2 values(1648791242005,14,14,14,NULL); $loop_count = 0 loop19: -sleep 200 +sleep 1000 sql select * from test.streamt3 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -461,7 +461,7 @@ sql delete from t2 where ts >= 1648791213001 and ts <= 1648791218003; $loop_count = 0 loop20: -sleep 200 +sleep 1000 sql select * from test.streamt3 order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -550,7 +550,7 @@ sql insert into t2 values(1648791231000,2,2,3); $loop_count = 0 loop21: -sleep 200 +sleep 1000 sql select * from streamt4 order by c1 desc;; $loop_count = $loop_count + 1 @@ -597,7 +597,7 @@ print delete from st where ts >= 1648791220000 and ts <=1648791223000; sql delete from st where ts >= 1648791220000 and ts <=1648791223000; loop22: -sleep 200 +sleep 1000 sql select * from streamt4 order by c1 desc;; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/deleteState.sim b/tests/script/tsim/stream/deleteState.sim index c84e52067c..576c074b19 100644 --- a/tests/script/tsim/stream/deleteState.sim +++ b/tests/script/tsim/stream/deleteState.sim @@ -4,7 +4,7 @@ looptest: system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 200 +sleep 1000 sql connect sql drop stream if exists streams0; @@ -19,13 +19,13 @@ sql create table t1(ts timestamp, a int, b int , c int, d double); sql create stream streams0 trigger at_once IGNORE EXPIRED 0 into streamt as select _wstart c1, count(*) c2, max(b) c3 from t1 state_window(a); sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL); -sleep 200 +sleep 1000 sql delete from t1 where ts = 1648791213000; $loop_count = 0 loop0: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -43,7 +43,7 @@ sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL); $loop_count = 0 loop1: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -61,13 +61,13 @@ sql insert into t1 values(1648791213001,1,2,2,2.0); sql insert into t1 values(1648791213002,1,3,3,3.0); sql insert into t1 values(1648791213003,1,4,4,4.0); -sleep 200 +sleep 1000 sql delete from t1 where ts >= 1648791213001 and ts <= 1648791213002; $loop_count = 0 loop3: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -93,7 +93,7 @@ sql insert into t1 values(1648791223003,2,2,3,1.0); $loop_count = 0 loop4: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -106,14 +106,14 @@ if $rows != 2 then goto loop4 endi -sleep 200 +sleep 1000 sql delete from t1 where ts >= 1648791223000 and ts <= 1648791223003; $loop_count = 0 loop5: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -151,7 +151,7 @@ sql delete from t1 where ts >= 1648791213001 and ts <= 1648791233005; $loop_count = 0 loop6: -sleep 200 +sleep 1000 sql select * from streamt order by c1, c2, c3; $loop_count = $loop_count + 1 @@ -210,7 +210,7 @@ sql insert into t2 values(1648791231000,2,2,3); $loop_count = 0 loop21: -sleep 200 +sleep 1000 sql select * from streamt4 order by c1 desc;; $loop_count = $loop_count + 1 @@ -257,7 +257,7 @@ print delete from st where ts >= 1648791220000 and ts <=1648791223000; sql delete from st where ts >= 1648791220000 and ts <=1648791223000; loop22: -sleep 200 +sleep 1000 sql select * from streamt4 order by c1 desc;; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/distributeIntervalRetrive0.sim b/tests/script/tsim/stream/distributeIntervalRetrive0.sim index 0d797ac593..461ab6aff6 100644 --- a/tests/script/tsim/stream/distributeIntervalRetrive0.sim +++ b/tests/script/tsim/stream/distributeIntervalRetrive0.sim @@ -274,7 +274,7 @@ sql insert into t2 values(1262275200000,1,2,3); $loop_count = 0 loop4: -sleep 300 +sleep 1000 sql select * from streamt1 order by c0; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/distributeSession0.sim b/tests/script/tsim/stream/distributeSession0.sim index 25ac479a38..077d81e6e8 100644 --- a/tests/script/tsim/stream/distributeSession0.sim +++ b/tests/script/tsim/stream/distributeSession0.sim @@ -57,7 +57,7 @@ $loop_count = 0 loop1: sql select * from streamtST; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 diff --git a/tests/script/tsim/stream/fillHistoryBasic2.sim b/tests/script/tsim/stream/fillHistoryBasic2.sim index 2f6c3ea92d..296514523b 100644 --- a/tests/script/tsim/stream/fillHistoryBasic2.sim +++ b/tests/script/tsim/stream/fillHistoryBasic2.sim @@ -85,7 +85,7 @@ sleep 1000 $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamtST1; $loop_count = $loop_count + 1 @@ -217,7 +217,7 @@ $loop_count = 0 loop2: sql select * from streamtST1; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -256,7 +256,7 @@ $loop_count = 0 loop3: sql select * from streamtST3; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 diff --git a/tests/script/tsim/stream/fillIntervalDelete0.sim b/tests/script/tsim/stream/fillIntervalDelete0.sim index 41b018a862..092ad39157 100644 --- a/tests/script/tsim/stream/fillIntervalDelete0.sim +++ b/tests/script/tsim/stream/fillIntervalDelete0.sim @@ -4,7 +4,7 @@ looptest: system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 200 +sleep 1000 sql connect sql drop stream if exists streams1; @@ -22,12 +22,12 @@ sql create stream streams3 trigger at_once IGNORE EXPIRED 0 into streamt3 as se sql create stream streams4 trigger at_once IGNORE EXPIRED 0 into streamt4 as select _wstart as ts, max(a), sum(b), count(*) from t1 where ts >= 1648791210000 and ts < 1648791261000 interval(1s) fill(prev); sql create stream streams5 trigger at_once IGNORE EXPIRED 0 into streamt5 as select _wstart as ts, max(a), sum(b), count(*) from t1 where ts >= 1648791210000 and ts < 1648791261000 interval(1s) fill(linear); sql insert into t1 values(1648791213000,1,1,1,1.0,'aaa'); -sleep 200 +sleep 1000 $loop_count = 0 loop0: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -46,7 +46,7 @@ sql delete from t1; $loop_count = 0 loop1: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -96,7 +96,7 @@ sql insert into t1 values(1648791219000,5,5,5,5.0,'eee'); $loop_count = 0 loop2: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -119,7 +119,7 @@ sql delete from t1 where ts >= 1648791214000; $loop_count = 0 loop3: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -175,7 +175,7 @@ sql insert into t1 values(1648791219000,6,6,6,6.0,'fff'); $loop_count = 0 loop4: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -195,7 +195,7 @@ sql delete from t1 where ts <= 1648791216000; $loop_count = 0 loop5: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -267,12 +267,12 @@ sql insert into t1 values(1648791217000,1,1,1,1.0,'aaa'); sql insert into t2 values(1648791215000,1,1,1,1.0,'aaa'); -sleep 200 +sleep 1000 $loop_count = 0 loop7: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -291,7 +291,7 @@ sql delete from t1; $loop_count = 0 loop8: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/fillIntervalDelete1.sim b/tests/script/tsim/stream/fillIntervalDelete1.sim index 108f5f862d..fb9a60c5a4 100644 --- a/tests/script/tsim/stream/fillIntervalDelete1.sim +++ b/tests/script/tsim/stream/fillIntervalDelete1.sim @@ -6,7 +6,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start #==system sh/exec.sh -n dnode1 -s start -v -sleep 200 +sleep 1000 sql connect sql drop stream if exists streams1; @@ -32,7 +32,7 @@ sql insert into t1 values(1648791217000,6,6,6,6.0,'ddd'); $loop_count = 0 loop0: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -52,7 +52,7 @@ sql delete from t1 where ts = 1648791213000; $loop_count = 0 loop2: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -122,7 +122,7 @@ sql insert into t1 values(1648791213000,6,6,6,6.0,'fff'); $loop_count = 0 loop3: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -146,7 +146,7 @@ sql delete from t1 where ts >= 1648791211000 and ts <= 1648791214000; $loop_count = 0 loop4: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -240,7 +240,7 @@ sql insert into t2 values(1648791222000,6,6,6,6.0,'fff'); $loop_count = 0 loop5: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -265,7 +265,7 @@ $loop_count = 0 loop6: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -374,7 +374,7 @@ sql insert into t1 values(1648791230002,7,7,7,7.0,'fff'); $loop_count = 0 loop7: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 20 then @@ -421,7 +421,7 @@ sql delete from t1 where ts > 1648791210001 and ts < 1648791230000; $loop_count = 0 loop8: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 20 then diff --git a/tests/script/tsim/stream/fillIntervalLinear.sim b/tests/script/tsim/stream/fillIntervalLinear.sim index 3fa369d8d5..aa24287df1 100644 --- a/tests/script/tsim/stream/fillIntervalLinear.sim +++ b/tests/script/tsim/stream/fillIntervalLinear.sim @@ -6,7 +6,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start #==system sh/exec.sh -n dnode1 -s start -v -sleep 200 +sleep 1000 sql connect print step 1 start @@ -24,7 +24,7 @@ sql insert into t1 values(1648791210000,1,1,1,1.0,'ccc') (1648791219000,2,2,2,2. $loop_count = 0 loop1: -sleep 200 +sleep 1000 sql use test1; sql select * from streamt1 order by ts; @@ -214,7 +214,7 @@ $loop_count = 0 loop2: -sleep 200 +sleep 1000 sql select * from streamt2 order by ts; @@ -403,7 +403,7 @@ sql insert into t1 values(1648791213000,4,4,4,4.0,'ddd'); $loop_count = 0 loop3: -sleep 300 +sleep 1000 sql select * from streamt3 order by ts; $loop_count = $loop_count + 1 @@ -524,7 +524,7 @@ $loop_count = 0 loop4: -sleep 200 +sleep 1000 sql select * from test3.streamt3 order by ts; diff --git a/tests/script/tsim/stream/fillIntervalPartitionBy.sim b/tests/script/tsim/stream/fillIntervalPartitionBy.sim index 6a11b9952c..80b5a3a1fd 100644 --- a/tests/script/tsim/stream/fillIntervalPartitionBy.sim +++ b/tests/script/tsim/stream/fillIntervalPartitionBy.sim @@ -4,7 +4,7 @@ looptest: system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 200 +sleep 1000 sql connect sql drop stream if exists streams1; @@ -36,7 +36,7 @@ sql insert into t2 values(1648791216000,10,6,6,6.0,'ddd'); $loop_count = 0 loop2: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -85,7 +85,7 @@ print ======delete from t1 where ts = 1648791216000; $loop_count = 0 loop3: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -132,7 +132,7 @@ sql insert into t2 values(1648791217000,11,11,11,11.0,'eee') (1648791219000,11,1 $loop_count = 0 loop4: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/fillIntervalPrevNext.sim b/tests/script/tsim/stream/fillIntervalPrevNext.sim index ec963e1d4a..6ca26f87cb 100644 --- a/tests/script/tsim/stream/fillIntervalPrevNext.sim +++ b/tests/script/tsim/stream/fillIntervalPrevNext.sim @@ -6,7 +6,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start #==system sh/exec.sh -n dnode1 -s start -v -sleep 200 +sleep 1000 sql connect sql drop stream if exists streams1; @@ -24,7 +24,7 @@ sql insert into t1 values(1648791211000,1,1,1,1.0,'aaa') (1648791217000,2,2,2,2. $loop_count = 0 loop1: -sleep 200 +sleep 1000 sql use test1; sql select * from streamt1 order by ts; @@ -271,7 +271,7 @@ sql insert into t1 values(1648791213000,4,4,4,4.0,'aaa') (1648791215000,5,5,5,5. $loop_count = 0 loop5: -sleep 200 +sleep 1000 sql select * from streamt5 order by ts; $loop_count = $loop_count + 1 @@ -403,7 +403,7 @@ if $loop_count == 10 then return -1 endi -sleep 200 +sleep 1000 sql select * from streamt6 order by ts; diff --git a/tests/script/tsim/stream/fillIntervalPrevNext1.sim b/tests/script/tsim/stream/fillIntervalPrevNext1.sim index 40ef895c5a..d1d8c79655 100644 --- a/tests/script/tsim/stream/fillIntervalPrevNext1.sim +++ b/tests/script/tsim/stream/fillIntervalPrevNext1.sim @@ -6,7 +6,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start #==system sh/exec.sh -n dnode1 -s start -v -sleep 200 +sleep 1000 sql connect @@ -27,7 +27,7 @@ sql insert into t1 values(1648791213000,4,4,4,4.0,'ddd'); $loop_count = 0 loop7: -sleep 300 +sleep 1000 sql select * from streamt7 order by ts; $loop_count = $loop_count + 1 @@ -143,7 +143,7 @@ endi loop71: $loop_count = 0 -sleep 300 +sleep 1000 sql select * from streamt8 order by ts; @@ -262,7 +262,7 @@ sql insert into t1 values(1648791207000,6,6,6,6.0,'fff') (1648791209000,7,7,7,7. $loop_count = 0 loop8: -sleep 200 +sleep 1000 sql select * from streamt7 order by ts; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/fillIntervalValue.sim b/tests/script/tsim/stream/fillIntervalValue.sim index b447e9a559..41df5113c8 100644 --- a/tests/script/tsim/stream/fillIntervalValue.sim +++ b/tests/script/tsim/stream/fillIntervalValue.sim @@ -5,7 +5,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 200 +sleep 1000 sql connect sql drop database if exists test; @@ -25,7 +25,7 @@ sql insert into t1 values(1648791253000,1,2,3,1.0,'aaa'); $loop_count = 0 loop0: -sleep 200 +sleep 1000 sql select * from streamt order by ts; $loop_count = $loop_count + 1 @@ -84,7 +84,7 @@ print "force fill vaule" $loop_count = 0 loop0a: -sleep 200 +sleep 1000 sql select * from streamta order by ts; $loop_count = $loop_count + 1 @@ -153,7 +153,7 @@ sql insert into t1 values(1648791213000,4,4,4,4.0,'aaa') (1648791215000,5,5,5,5. $loop_count = 0 loop1: -sleep 200 +sleep 1000 sql select * from streamt2 order by ts; $loop_count = $loop_count + 1 @@ -291,7 +291,7 @@ sql insert into t1 values(1648791200000,1,1,1,1.0,'aaa'); $loop_count = 0 loop3: -sleep 200 +sleep 1000 sql select * from streamt3 order by ts; $loop_count = $loop_count + 1 @@ -484,7 +484,7 @@ sql insert into t2 values(1648791273000,1,2,3,1.0,'bbb'); $loop_count = 0 loop4: -sleep 200 +sleep 1000 sql select * from streamt4 order by pname, ts; print ===> $data[0][0] , $data[0][1] , $data[0][2] , $data[0][3] @@ -583,7 +583,7 @@ print "force fill null" $loop_count = 0 loop4a: -sleep 200 +sleep 1000 sql select * from streamt4a order by pname, ts; print ===> $data[0][0] , $data[0][1] , $data[0][2] , $data[0][3] diff --git a/tests/script/tsim/stream/ignoreCheckUpdate.sim b/tests/script/tsim/stream/ignoreCheckUpdate.sim index 2cd0117feb..051cb950df 100644 --- a/tests/script/tsim/stream/ignoreCheckUpdate.sim +++ b/tests/script/tsim/stream/ignoreCheckUpdate.sim @@ -22,7 +22,7 @@ sql insert into t1 values(1648791213000,2,2,2); $loop_count = 0 loop0: -sleep 300 +sleep 1000 sql select * from streamt order by 1,2,3; $loop_count = $loop_count + 1 @@ -46,7 +46,7 @@ sql insert into t1 values(1648791213000,3,3,3); $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamt order by 1,2,3; $loop_count = $loop_count + 1 @@ -84,7 +84,7 @@ sql insert into t1 values(1648791213000,2,2,2); $loop_count = 0 loop2: -sleep 300 +sleep 1000 sql select * from streamt1 order by 1,2,3; $loop_count = $loop_count + 1 @@ -109,7 +109,7 @@ $loop_count = 0 loop3: -sleep 300 +sleep 1000 sql select * from streamt1 order by 1,2,3; $loop_count = $loop_count + 1 @@ -147,7 +147,7 @@ sql insert into t1 values(1648791213000,2,2,1); $loop_count = 0 loop2: -sleep 300 +sleep 1000 sql select * from streamt2 order by 1,2,3; $loop_count = $loop_count + 1 @@ -172,7 +172,7 @@ $loop_count = 0 loop3: -sleep 300 +sleep 1000 sql select * from streamt2 order by 1,2,3; $loop_count = $loop_count + 1 @@ -215,7 +215,7 @@ sql insert into t2 values(1648791213000,2,2,2); $loop_count = 0 loop0: -sleep 300 +sleep 1000 sql select * from streamt3 order by 1,2,3; $loop_count = $loop_count + 1 @@ -239,7 +239,7 @@ sql insert into t1 values(1648791213000,3,3,3); $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamt3 order by 1,2,3; $loop_count = $loop_count + 1 @@ -262,7 +262,7 @@ sql insert into t2 values(1648791213000,4,4,4); $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamt3 order by 1,2,3; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/partitionby.sim b/tests/script/tsim/stream/partitionby.sim index e63459e97d..800802506b 100644 --- a/tests/script/tsim/stream/partitionby.sim +++ b/tests/script/tsim/stream/partitionby.sim @@ -22,7 +22,7 @@ sql insert into ts4 values(1648791213001,1,12,3,1.0); $loop_count = 0 loop0: -sleep 300 +sleep 1000 sql select * from test0.streamtST1; $loop_count = $loop_count + 1 @@ -40,11 +40,11 @@ sql insert into ts2 values(1648791223001,1,12,3,1.0); sql insert into ts3 values(1648791223001,1,12,3,1.0); sql insert into ts4 values(1648791223001,1,12,3,1.0); -sleep 300 +sleep 1000 sql delete from st where ts = 1648791223001; loop00: -sleep 300 +sleep 1000 sql select * from test0.streamtST1; $loop_count = $loop_count + 1 @@ -77,7 +77,7 @@ sql insert into ts2 values(1648791211000,1,2,3); $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamt; $loop_count = $loop_count + 1 @@ -115,7 +115,7 @@ sql insert into ts2 values(1648791222001,2,2,3,10); $loop_count = 0 loop2: -sleep 300 +sleep 1000 sql select * from streamtST order by c7 asc; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/partitionby1.sim b/tests/script/tsim/stream/partitionby1.sim index c8bb25e0dd..497aa1601a 100644 --- a/tests/script/tsim/stream/partitionby1.sim +++ b/tests/script/tsim/stream/partitionby1.sim @@ -21,7 +21,7 @@ sql insert into ts4 values(1648791213001,1,12,3,1.0); $loop_count = 0 loop0: -sleep 300 +sleep 1000 sql select * from streamtST1; $loop_count = $loop_count + 1 @@ -53,7 +53,7 @@ sql insert into ts2 values(1648791211000,1,2,3); $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamt; $loop_count = $loop_count + 1 @@ -91,7 +91,7 @@ sql insert into ts2 values(1648791222001,2,2,3,4); $loop_count = 0 loop2: -sleep 300 +sleep 1000 sql select * from streamtST; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/partitionbyColumnInterval.sim b/tests/script/tsim/stream/partitionbyColumnInterval.sim index 99e2e0d61b..e3c978248a 100644 --- a/tests/script/tsim/stream/partitionbyColumnInterval.sim +++ b/tests/script/tsim/stream/partitionbyColumnInterval.sim @@ -583,7 +583,7 @@ sql insert into t2 values(1648791223000,2,2,3,1.0); sql insert into t3 values(1648791223000,3,2,3,1.0); sql insert into t4 values(1648791223000,4,2,3,1.0); -sleep 300 +sleep 1000 sql delete from st where ts = 1648791223000; @@ -608,7 +608,7 @@ sql insert into t2 values(1648791223001,21,2,3,1.0); sql insert into t3 values(1648791223001,31,2,3,1.0); sql insert into t4 values(1648791223001,41,2,3,1.0); -sleep 300 +sleep 1000 sql delete from st where ts = 1648791223001; @@ -633,7 +633,7 @@ sql insert into t2 values(1648791223001,22,2,3,1.0); sql insert into t3 values(1648791223001,32,2,3,1.0); sql insert into t4 values(1648791223001,42,2,3,1.0); -sleep 300 +sleep 1000 sql delete from st where ts = 1648791223001; diff --git a/tests/script/tsim/stream/partitionbyColumnState.sim b/tests/script/tsim/stream/partitionbyColumnState.sim index b69ab2df52..2697c96fac 100644 --- a/tests/script/tsim/stream/partitionbyColumnState.sim +++ b/tests/script/tsim/stream/partitionbyColumnState.sim @@ -19,7 +19,7 @@ sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL); $loop_count = 0 loop0: -sleep 300 +sleep 1000 sql select * from streamt order by c1, c4, c2, c3; $loop_count = $loop_count + 1 @@ -38,7 +38,7 @@ sql insert into t1 values(1648791213000,1,1,3,1.0); $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamt order by c1, c4, c2, c3; $loop_count = $loop_count + 1 @@ -61,7 +61,7 @@ sql insert into t1 values(1648791213000,2,1,3,1.0); $loop_count = 0 loop2: -sleep 300 +sleep 1000 sql select * from streamt order by c1, c4, c2, c3; $loop_count = $loop_count + 1 @@ -87,7 +87,7 @@ sql insert into t1 values(1648791213002,1,1,3,1.0); $loop_count = 0 loop3: -sleep 300 +sleep 1000 sql select * from streamt order by c1, c4, c2, c3; $loop_count = $loop_count + 1 @@ -124,7 +124,7 @@ sql insert into t1 values(1648791213001,1,1,3,1.0) (1648791223001,2,2,3,1.0) (16 $loop_count = 0 loop4: -sleep 300 +sleep 1000 sql select * from streamt order by c1, c4, c2, c3; $loop_count = $loop_count + 1 @@ -197,7 +197,7 @@ sql insert into t1 values(1648791213001,1,2,1,3); $loop_count = 0 loop5: -sleep 300 +sleep 1000 sql select * from streamt1 order by c1, c4, c2, c3; $loop_count = $loop_count + 1 @@ -218,7 +218,7 @@ sql insert into t1 values(1648791213001,1,1,1,7) (1648791223002,1,1,2,8); $loop_count = 0 loop6: -sleep 300 +sleep 1000 sql select * from streamt1 order by c1, c4, c2, c3; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/scalar.sim b/tests/script/tsim/stream/scalar.sim index e211357276..ec55c3da66 100644 --- a/tests/script/tsim/stream/scalar.sim +++ b/tests/script/tsim/stream/scalar.sim @@ -31,7 +31,7 @@ sql insert into t1 values(1648791213001,2,11,11,11); $loop_count = 0 loop1: -sleep 200 +sleep 1000 sql select * from streamt0 order by a desc; diff --git a/tests/script/tsim/stream/schedSnode.sim b/tests/script/tsim/stream/schedSnode.sim index 6a4d6f79bb..e55954277a 100644 --- a/tests/script/tsim/stream/schedSnode.sim +++ b/tests/script/tsim/stream/schedSnode.sim @@ -64,7 +64,7 @@ $loop_count = 0 loop1: sql select * from target.streamtST1; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 diff --git a/tests/script/tsim/stream/session0.sim b/tests/script/tsim/stream/session0.sim index 622c5f7c6d..4bcd10a764 100644 --- a/tests/script/tsim/stream/session0.sim +++ b/tests/script/tsim/stream/session0.sim @@ -27,7 +27,7 @@ sql insert into t1 values(1648791213002,NULL,NULL,NULL,NULL,5) (1648791233012,NU $loop_count = 0 loop0: -sleep 300 +sleep 1000 sql select * from streamt order by s desc; $loop_count = $loop_count + 1 @@ -127,7 +127,7 @@ sql insert into t1 values(1648791213002,4,2,3,4.1,12) (1648791223009,4,2,3,4.1,1 $loop_count = 0 loop1: -sleep 300 +sleep 1000 sql select * from streamt order by s desc ; $loop_count = $loop_count + 1 @@ -192,7 +192,7 @@ sql insert into t2 values(1648791223003,20,7,3,10.1,7); $loop_count = 0 loop2: -sleep 300 +sleep 1000 sql select * from streamt2 where c4=7; $loop_count = $loop_count + 1 @@ -251,7 +251,7 @@ sql insert into t1 values(1648791223004,20,7,9,10.1); $loop_count = 0 loop3: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/session1.sim b/tests/script/tsim/stream/session1.sim index 8d9008f772..0960672d8b 100644 --- a/tests/script/tsim/stream/session1.sim +++ b/tests/script/tsim/stream/session1.sim @@ -205,7 +205,7 @@ sql insert into t1 values(1648791213000,1,2,3,1.0); $loop_count = 0 loop13: -sleep 200 +sleep 1000 sql select * from streamt3; @@ -224,7 +224,7 @@ sql insert into t1 values(1648791213000,6,2,3,1.0); $loop_count = 0 loop14: -sleep 200 +sleep 1000 sql select * from streamt3; $loop_count = $loop_count + 1 diff --git a/tests/script/tsim/stream/sliding.sim b/tests/script/tsim/stream/sliding.sim index b7069da2de..25fc93e5d5 100644 --- a/tests/script/tsim/stream/sliding.sim +++ b/tests/script/tsim/stream/sliding.sim @@ -694,7 +694,7 @@ sql insert into t2 values(1648791313000,4,1,1,1.0); $loop_count = 0 loop6: -sleep 200 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/state0.sim b/tests/script/tsim/stream/state0.sim index d009f742b7..c3e850510c 100644 --- a/tests/script/tsim/stream/state0.sim +++ b/tests/script/tsim/stream/state0.sim @@ -26,7 +26,7 @@ sql insert into t1 values(1648791213000,1,2,3,1.0,2); $loop_count = 0 loop0: sql select * from streamt1 order by c desc; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -41,7 +41,7 @@ sql insert into t1 values(1648791214000,1,2,3,1.0,3); $loop_count = 0 loop00: sql select * from streamt1 order by c desc; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -58,7 +58,7 @@ sql insert into t1 values(1648791214000,1,2,3,1.0,6); $loop_count = 0 loop1: sql select * from streamt1 where c >=4 order by `_wstart`; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -169,7 +169,7 @@ sql insert into t1 values(1648791213011,1,2,3,1.0,7); $loop_count = 0 loop2: sql select * from streamt1 where c in (5,4,7) order by `_wstart`; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -211,7 +211,7 @@ sql insert into t1 values(1648791213011,1,2,3,1.0,8); $loop_count = 0 loop21: sql select * from streamt1 where c in (5,4,8) order by `_wstart`; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -231,7 +231,7 @@ sql insert into t1 values(1648791213011,10,20,10,10.0,12); $loop_count = 0 loop3: sql select * from streamt1 where c in (5,4,10,11,12) order by `_wstart`; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -337,7 +337,7 @@ sql insert into t1 values(1648791213030,3,14,14,14.0,15) (1648791214020,15,15,15 $loop_count = 0 loop4: sql select * from streamt1 where c in (14,15,16) order by `_wstart`; -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -463,7 +463,7 @@ sql insert into t1 values(1648791213000,1,2,4,1.0,2); $loop_count = 0 loop5: -sleep 300 +sleep 1000 sql select * from streamt1 order by c desc; $loop_count = $loop_count + 1 @@ -530,7 +530,7 @@ sql insert into t1 values(1648791220000,10,2,4,1.0,2); $loop_count = 0 loop6: -sleep 300 +sleep 1000 sql select * from streamt3; @@ -568,7 +568,7 @@ sql insert into t1 (ts, c1) values (1668073288215, 29); $loop_count = 0 loop7: -sleep 200 +sleep 1000 sql select * from streamt4 order by startts; @@ -607,7 +607,7 @@ sql delete from t1 where ts = cast(1668073288219 as timestamp); $loop_count = 0 loop8: -sleep 200 +sleep 1000 sql select * from streamt4 order by startts; @@ -641,7 +641,7 @@ sql insert into t1 (ts, c1) values (1668073288226, 65); $loop_count = 0 loop81: -sleep 200 +sleep 1000 sql select * from streamt4 order by startts; @@ -680,7 +680,7 @@ sql insert into t1 (ts, c1) values (1668073288224, 64); $loop_count = 0 loop9: -sleep 200 +sleep 1000 sql select * from streamt4 order by startts; @@ -779,7 +779,7 @@ sql delete from b where c >= 1648791213001 and c <= 1648791233005;; $loop_count = 0 loop10: -sleep 200 +sleep 1000 sql select c2 from streamt; diff --git a/tests/script/tsim/stream/state1.sim b/tests/script/tsim/stream/state1.sim index 67e02c0890..297477ed55 100644 --- a/tests/script/tsim/stream/state1.sim +++ b/tests/script/tsim/stream/state1.sim @@ -27,7 +27,7 @@ sql insert into t1(ts) values(1648791213000); $loop_count = 0 loop0: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -46,7 +46,7 @@ sql insert into t1 values(1648791214000,1,2,3,1.0,3); $loop_count = 0 loop1: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -66,7 +66,7 @@ sql insert into t1 values(1648791215000,2,2,3,1.0,4); $loop_count = 0 loop2: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -84,7 +84,7 @@ sql insert into t1(ts) values(1648791216000); $loop_count = 0 loop3: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -111,7 +111,7 @@ sql insert into t1 values(1648791213010,1,2,3,1.1); $loop_count = 0 loop4: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 @@ -132,7 +132,7 @@ sql insert into t1 values(1648791213005,2,2,3,1.1); $loop_count = 0 loop5: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then return -1 diff --git a/tests/script/tsim/stream/triggerInterval0.sim b/tests/script/tsim/stream/triggerInterval0.sim index 1c62f689ac..92c0e5fa15 100644 --- a/tests/script/tsim/stream/triggerInterval0.sim +++ b/tests/script/tsim/stream/triggerInterval0.sim @@ -18,7 +18,7 @@ sql create table t1(ts timestamp, a int, b int , c int, d double); sql create stream streams1 trigger window_close IGNORE EXPIRED 0 into streamt as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s); sql insert into t1 values(1648791213001,1,2,3,1.0); -sleep 300 +sleep 1000 sql select * from streamt; if $rows != 0 then print ======$rows @@ -35,7 +35,7 @@ print step 0 $loop_count = 0 loop0: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -61,7 +61,7 @@ print step 1 $loop_count = 0 loop1: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -91,7 +91,7 @@ print step 2 $loop_count = 0 loop2: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -123,7 +123,7 @@ print step 3 $loop_count = 0 loop3: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/udTableAndTag0.sim b/tests/script/tsim/stream/udTableAndTag0.sim index e3ab344bbe..33d042e4be 100644 --- a/tests/script/tsim/stream/udTableAndTag0.sim +++ b/tests/script/tsim/stream/udTableAndTag0.sim @@ -28,7 +28,7 @@ sql insert into t2 values(1648791213000,1,2,3); $loop_count = 0 loop0: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -59,7 +59,7 @@ endi $loop_count = 0 loop1: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -96,7 +96,7 @@ sql insert into t2 values(1648791213000,1,2,3); $loop_count = 0 loop2: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -144,7 +144,7 @@ endi $loop_count = 0 loop3: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -181,7 +181,7 @@ sql insert into t2 values(1648791213000,1,2,3); $loop_count = 0 loop4: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -227,7 +227,7 @@ endi $loop_count = 0 loop5: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -245,7 +245,7 @@ endi $loop_count = 0 loop6: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -292,7 +292,7 @@ sql insert into t1 values(1648791213000,1,1,1) t2 values(1648791213000,2,2,2) t3 $loop_count = 0 loop7: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -325,7 +325,7 @@ endi $loop_count = 0 loop8: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -411,7 +411,7 @@ sql insert into t1 values(1648791213000,1,1,1) t2 values(1648791213000,2,2,2) t3 $loop_count = 0 loop9: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/udTableAndTag1.sim b/tests/script/tsim/stream/udTableAndTag1.sim index fbedaa6e4e..a2d756ddf9 100644 --- a/tests/script/tsim/stream/udTableAndTag1.sim +++ b/tests/script/tsim/stream/udTableAndTag1.sim @@ -29,7 +29,7 @@ sql insert into t2 values(1648791213000,2,2,3); $loop_count = 0 loop0: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -58,7 +58,7 @@ endi $loop_count = 0 loop1: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -96,7 +96,7 @@ sql insert into t2 values(1648791213000,2,2,3); $loop_count = 0 loop2: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -142,7 +142,7 @@ endi $loop_count = 0 loop3: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -180,7 +180,7 @@ sql insert into t2 values(1648791213000,2,2,3); $loop_count = 0 loop4: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -226,7 +226,7 @@ endi $loop_count = 0 loop5: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -244,7 +244,7 @@ endi $loop_count = 0 loop6: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -290,7 +290,7 @@ sql insert into t1 values(1648791213000,1,1,1) t2 values(1648791213000,2,2,2) t3 $loop_count = 0 loop7: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -323,7 +323,7 @@ endi $loop_count = 0 loop8: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then diff --git a/tests/script/tsim/stream/udTableAndTag2.sim b/tests/script/tsim/stream/udTableAndTag2.sim index c0e72712df..4ffcaa5ccd 100644 --- a/tests/script/tsim/stream/udTableAndTag2.sim +++ b/tests/script/tsim/stream/udTableAndTag2.sim @@ -28,7 +28,7 @@ sql insert into t2 values(1648791213000,2,2,3); $loop_count = 0 loop0: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -53,7 +53,7 @@ endi $loop_count = 0 loop1: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -102,7 +102,7 @@ sql insert into t2 values(1648791213000,2,2,3); $loop_count = 0 loop2: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -130,7 +130,7 @@ print sql select cc from result2.streamt2 order by 1; $loop_count = 0 loop21: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -155,7 +155,7 @@ endi $loop_count = 0 loop3: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -204,7 +204,7 @@ sql insert into t2 values(1648791213000,2,2,3); $loop_count = 0 loop4: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -241,7 +241,7 @@ endi $loop_count = 0 loop5: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -270,7 +270,7 @@ endi $loop_count = 0 loop6: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -312,7 +312,7 @@ sql insert into t1 values(1648791213000,1,1,1) t2 values(1648791213000,2,2,2) t3 $loop_count = 0 loop7: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -336,7 +336,7 @@ endi $loop_count = 0 loop8: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -385,7 +385,7 @@ sql insert into t2 values(1648791213000,2,2,3); $loop_count = 0 loop9: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -418,7 +418,7 @@ endi $loop_count = 0 loop10: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then @@ -464,7 +464,7 @@ endi $loop_count = 0 loop11: -sleep 300 +sleep 1000 $loop_count = $loop_count + 1 if $loop_count == 10 then