Changeset: 99b5f68aab32 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99b5f68aab32
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/backends/monet5/Tests/cfunction00.sql
sql/backends/monet5/Tests/cfunction01.sql
sql/backends/monet5/Tests/cfunction02.sql
sql/backends/monet5/Tests/cfunction03.sql
sql/backends/monet5/Tests/cqstream00.sql
sql/backends/monet5/Tests/cqstream01.sql
sql/backends/monet5/Tests/cqstream02.sql
sql/backends/monet5/Tests/cquery02.sql
sql/backends/monet5/Tests/cquery04.sql
sql/backends/monet5/Tests/cquery05.sql
sql/backends/monet5/Tests/cquery06.sql
sql/backends/monet5/Tests/cquery07.sql
sql/backends/monet5/Tests/cquery09.sql
sql/backends/monet5/Tests/cquery10.sql
sql/backends/monet5/Tests/cquery12.sql
sql/backends/monet5/Tests/cquery13.sql
sql/backends/monet5/Tests/cquery14.sql
sql/backends/monet5/Tests/cquery16.sql
sql/backends/monet5/Tests/cquery17.sql
sql/backends/monet5/Tests/cquery18.sql
sql/backends/monet5/Tests/cquery19.sql
sql/backends/monet5/Tests/cquery21.sql
sql/backends/monet5/Tests/cquery22.sql
sql/backends/monet5/cquery.mal
sql/backends/monet5/sql_cquery.c
sql/backends/monet5/sql_cquery.h
sql/scripts/50_cquery.sql
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: trails
Log Message:
No need for cquery.wait, as the sleep procedure is now available at 25_debug.sql
diffs (truncated from 1623 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -10540,7 +10540,6 @@ stdout of test 'MAL-signatures` in direc
[ "cquery", "prelude", "command cquery.prelude():void ",
"CQprelude;", "" ]
[ "cquery", "show", "pattern cquery.show(alias:str):void ", "CQshow;",
"Debug a single continuous query" ]
[ "cquery", "status", "pattern cquery.status() (tick:bat[:timestamp],
alias:bat[:str], state:bat[:str], error:bat[:str]) ", "CQstatus;", "Status
of all registered continuous queries" ]
-[ "cquery", "wait", "pattern cquery.wait(cnt:int):void ", "CQwait;",
"Sleep for some time" ]
[ "date", "!=", "pattern date.!=(v:date, w:date):bit ", "CMDvarNE;",
"Equality of two dates" ]
[ "date", "!=", "pattern date.!=(v:date, w:date, nil_matches:bit):bit
", "CMDvarNE;", "Equality of two dates" ]
[ "date", "#fromstr", "command date.#fromstr():void ",
"date_fromstr;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -14946,7 +14946,6 @@ stdout of test 'MAL-signatures` in direc
[ "cquery", "prelude", "command cquery.prelude():void ",
"CQprelude;", "" ]
[ "cquery", "show", "pattern cquery.show(alias:str):void ", "CQshow;",
"Debug a single continuous query" ]
[ "cquery", "status", "pattern cquery.status() (tick:bat[:timestamp],
alias:bat[:str], state:bat[:str], error:bat[:str]) ", "CQstatus;", "Status
of all registered continuous queries" ]
-[ "cquery", "wait", "pattern cquery.wait(cnt:int):void ", "CQwait;",
"Sleep for some time" ]
[ "date", "!=", "pattern date.!=(v:date, w:date):bit ", "CMDvarNE;",
"Equality of two dates" ]
[ "date", "!=", "pattern date.!=(v:date, w:date, nil_matches:bit):bit
", "CMDvarNE;", "Equality of two dates" ]
[ "date", "#fromstr", "command date.#fromstr():void ",
"date_fromstr;", "" ]
diff --git a/sql/backends/monet5/Tests/cfunction00.sql
b/sql/backends/monet5/Tests/cfunction00.sql
--- a/sql/backends/monet5/Tests/cfunction00.sql
+++ b/sql/backends/monet5/Tests/cfunction00.sql
@@ -14,7 +14,7 @@ END;
-- to call a continuous function in the scheduler, we must pass the keyword
"function" explicitly
start continuous function aggr00();
-call cquery.wait(1000); #give it time to start
+call sleep(1000); #give it time to start
select aggr00(); #should return 1
select aggr00(); #should return 2
diff --git a/sql/backends/monet5/Tests/cfunction01.sql
b/sql/backends/monet5/Tests/cfunction01.sql
--- a/sql/backends/monet5/Tests/cfunction01.sql
+++ b/sql/backends/monet5/Tests/cfunction01.sql
@@ -17,7 +17,7 @@ END;
select result from cquery.aggr01; #error
start continuous function aggr01();
-call cquery.wait(1000); #wait to be started
+call sleep(1000); #wait to be started
select result from cquery.aggr01; #should be empty
pause continuous aggr01;
@@ -25,7 +25,7 @@ pause continuous aggr01;
insert into ftmp values(1),(1);
resume continuous aggr01;
-call cquery.wait(1000); #wait for processing
+call sleep(1000); #wait for processing
select result from cquery.aggr01; #should return 2
pause continuous aggr01;
@@ -33,10 +33,10 @@ insert into ftmp values(2),(2);
insert into ftmp values(3),(3);
resume continuous aggr01;
-call cquery.wait(1000);
+call sleep(1000);
select result from cquery.aggr01; #should return 2,4,6
-call cquery.wait(1000);
+call sleep(1000);
select result from cquery.aggr01; #should return 2,4,6
stop continuous aggr01;
diff --git a/sql/backends/monet5/Tests/cfunction02.sql
b/sql/backends/monet5/Tests/cfunction02.sql
--- a/sql/backends/monet5/Tests/cfunction02.sql
+++ b/sql/backends/monet5/Tests/cfunction02.sql
@@ -13,7 +13,7 @@ end;
start continuous function cfunc2('test') with heartbeat 1000 cycles 3;
-call cquery.wait(4000);
+call sleep(4000);
stop continuous cfunc2; --error, cfunc2 is no longer available
diff --git a/sql/backends/monet5/Tests/cfunction03.sql
b/sql/backends/monet5/Tests/cfunction03.sql
--- a/sql/backends/monet5/Tests/cfunction03.sql
+++ b/sql/backends/monet5/Tests/cfunction03.sql
@@ -10,7 +10,7 @@ end;
start continuous function cfunc3(time '15:00:00') with heartbeat 100 cycles 3;
-call cquery.wait(3000);
+call sleep(3000);
select count(*) from results3;
diff --git a/sql/backends/monet5/Tests/cqstream00.sql
b/sql/backends/monet5/Tests/cqstream00.sql
--- a/sql/backends/monet5/Tests/cqstream00.sql
+++ b/sql/backends/monet5/Tests/cqstream00.sql
@@ -21,7 +21,7 @@ end;
start continuous sys.cq_splitter();
-- wait for a few seconds for scheduler to do work
-call cquery.wait(5000);
+call sleep(5000);
-- STOP cq_splitter;
pause continuous cq_splitter;
diff --git a/sql/backends/monet5/Tests/cqstream01.sql
b/sql/backends/monet5/Tests/cqstream01.sql
--- a/sql/backends/monet5/Tests/cqstream01.sql
+++ b/sql/backends/monet5/Tests/cqstream01.sql
@@ -16,7 +16,7 @@ end;
start continuous sys.cq_window();
-- wait for a few seconds for scheduler to do its swork
-call cquery.wait(3000);
+call sleep(3000);
-- STOP cq_window;
pause continuous cq_window;
diff --git a/sql/backends/monet5/Tests/cqstream02.sql
b/sql/backends/monet5/Tests/cqstream02.sql
--- a/sql/backends/monet5/Tests/cqstream02.sql
+++ b/sql/backends/monet5/Tests/cqstream02.sql
@@ -19,7 +19,7 @@ insert into stmp10 values('2005-09-23 12
start continuous sys.cq_collector() with cycles 3;
-call cquery.wait(4000);
+call sleep(4000);
pause continuous cq_collector;
diff --git a/sql/backends/monet5/Tests/cquery02.sql
b/sql/backends/monet5/Tests/cquery02.sql
--- a/sql/backends/monet5/Tests/cquery02.sql
+++ b/sql/backends/monet5/Tests/cquery02.sql
@@ -12,31 +12,31 @@ start continuous procedure sys.cq_basic0
insert into cqinput02 values (1), (2), (3);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult02; --output no tuples
insert into cqinput02 values (4);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult02; --output 1 tuple with value 10
insert into cqinput02 values (5), (6);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult02; --output 1 tuple with value 10
insert into cqinput02 values (7);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult02; --output 2 tuples with value 10 and 22
insert into cqinput02 values (1000);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult02; --output 2 tuples with value 10 and 22
diff --git a/sql/backends/monet5/Tests/cquery04.sql
b/sql/backends/monet5/Tests/cquery04.sql
--- a/sql/backends/monet5/Tests/cquery04.sql
+++ b/sql/backends/monet5/Tests/cquery04.sql
@@ -14,19 +14,19 @@ insert into cqinput04 values (1), (2);
insert into cqinput04 values (3), (4);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult04; --output 2 tuples with value 2
insert into cqinput04 values (5);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult04; --output 2 tuples with value 2
insert into cqinput04 values (6);
-call cquery.wait(1000);
+call sleep(1000);
select aaa from cqresult04; --output 3 tuples with value 2
diff --git a/sql/backends/monet5/Tests/cquery05.sql
b/sql/backends/monet5/Tests/cquery05.sql
--- a/sql/backends/monet5/Tests/cquery05.sql
+++ b/sql/backends/monet5/Tests/cquery05.sql
@@ -9,7 +9,7 @@ end;
start continuous sys.cq_basic() with heartbeat 1000 cycles 3;
-call cquery.wait(3500);
+call sleep(3500);
--select * from cquery.status();
--select * from cquery.summary();
diff --git a/sql/backends/monet5/Tests/cquery06.sql
b/sql/backends/monet5/Tests/cquery06.sql
--- a/sql/backends/monet5/Tests/cquery06.sql
+++ b/sql/backends/monet5/Tests/cquery06.sql
@@ -10,7 +10,7 @@ pause continuous cq_basic06; --error
start continuous cq_basic06() with heartbeat 1000; --1 second
-call cquery.wait(2100);
+call sleep(2100);
pause continuous cq_basic06; --it's ok
diff --git a/sql/backends/monet5/Tests/cquery07.sql
b/sql/backends/monet5/Tests/cquery07.sql
--- a/sql/backends/monet5/Tests/cquery07.sql
+++ b/sql/backends/monet5/Tests/cquery07.sql
@@ -10,7 +10,7 @@ stop continuous cq_basic07; --error
start continuous cq_basic07() WITH HEARTBEAT 1000 CYCLES 300; --1 second
-call cquery.wait(2100);
+call sleep(2100);
pause continuous cq_basic07; --ok
diff --git a/sql/backends/monet5/Tests/cquery09.sql
b/sql/backends/monet5/Tests/cquery09.sql
--- a/sql/backends/monet5/Tests/cquery09.sql
+++ b/sql/backends/monet5/Tests/cquery09.sql
@@ -8,7 +8,7 @@ end;
start continuous sys.cq_c(1) as cq_ca;
-call cquery.wait(4000);
+call sleep(4000);
drop table result9; --error
diff --git a/sql/backends/monet5/Tests/cquery10.sql
b/sql/backends/monet5/Tests/cquery10.sql
--- a/sql/backends/monet5/Tests/cquery10.sql
+++ b/sql/backends/monet5/Tests/cquery10.sql
@@ -16,7 +16,7 @@ start continuous sys.cq_cycles() with cy
-- reactivate all continuous queries
-call cquery.wait(4000);
+call sleep(4000);
pause continuous cq_cycles;
select 'RESULT';
diff --git a/sql/backends/monet5/Tests/cquery12.sql
b/sql/backends/monet5/Tests/cquery12.sql
--- a/sql/backends/monet5/Tests/cquery12.sql
+++ b/sql/backends/monet5/Tests/cquery12.sql
@@ -30,7 +30,7 @@ insert into testing11c values (1);
insert into testing11c values (2);
insert into testing11c values (3);
-call cquery.wait(1000);
+call sleep(1000);
stop continuous cq_query11b;
diff --git a/sql/backends/monet5/Tests/cquery13.sql
b/sql/backends/monet5/Tests/cquery13.sql
--- a/sql/backends/monet5/Tests/cquery13.sql
+++ b/sql/backends/monet5/Tests/cquery13.sql
@@ -14,7 +14,7 @@ end;
start continuous sys.cq_query13a() with heartbeat 3000;
start continuous sys.cq_query13b() with heartbeat 1000 cycles 1;
-call cquery.wait(2500);
+call sleep(2500);
drop procedure sys.cq_query13a;
drop procedure sys.cq_query13b;
diff --git a/sql/backends/monet5/Tests/cquery14.sql
b/sql/backends/monet5/Tests/cquery14.sql
--- a/sql/backends/monet5/Tests/cquery14.sql
+++ b/sql/backends/monet5/Tests/cquery14.sql
@@ -15,7 +15,7 @@ end;
start continuous sys.cq_query14b() with cycles 1;
-call cquery.wait(2500);
+call sleep(2500);
select count(*) from results14; --should be 2
diff --git a/sql/backends/monet5/Tests/cquery16.sql
b/sql/backends/monet5/Tests/cquery16.sql
--- a/sql/backends/monet5/Tests/cquery16.sql
+++ b/sql/backends/monet5/Tests/cquery16.sql
@@ -12,7 +12,7 @@ end;
insert into testing16 values (1);
start continuous sys.cq_query16a() with cycles 1;
-call cquery.wait(1000);
+call sleep(1000);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
