Changeset: 2218cfba550b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2218cfba550b
Added Files:
sql/backends/monet5/Tests/cquery15.sql
sql/backends/monet5/Tests/cquery15.stable.err
sql/backends/monet5/Tests/cquery15.stable.out
Modified Files:
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/cfunction00.sql
sql/backends/monet5/Tests/cfunction01.sql
sql/backends/monet5/Tests/cqstream00.sql
sql/backends/monet5/Tests/cqstream01.sql
sql/backends/monet5/Tests/cqstream02.sql
sql/backends/monet5/Tests/cqstream02.stable.err
sql/backends/monet5/Tests/cqstream03.sql
sql/backends/monet5/Tests/cqstream03.stable.err
sql/backends/monet5/Tests/cquery02.sql
sql/backends/monet5/Tests/cquery03.sql
sql/backends/monet5/Tests/cquery03.stable.err
sql/backends/monet5/Tests/cquery04.sql
sql/backends/monet5/Tests/cquery05.sql
sql/backends/monet5/Tests/cquery06.sql
sql/backends/monet5/Tests/cquery06.stable.err
sql/backends/monet5/Tests/cquery07.sql
sql/backends/monet5/Tests/cquery07.stable.err
sql/backends/monet5/Tests/cquery09.sql
sql/backends/monet5/Tests/cquery09.stable.err
sql/backends/monet5/Tests/cquery10.sql
sql/backends/monet5/Tests/cquery10.stable.err
sql/backends/monet5/Tests/cquery11.sql
sql/backends/monet5/Tests/cquery12.sql
sql/backends/monet5/Tests/cquery13.sql
sql/backends/monet5/sql_execute.c
sql/server/rel_schema.c
sql/server/sql_qc.c
Branch: trails
Log Message:
Added alias property for a continuous query definition: START CONTINUOUS ... AS
alias
This allows to register the same UDF in the Petri-net using different
parameters, as long the aliases are different.
diffs (truncated from 749 to 300 lines):
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -100,6 +100,7 @@ cquery11
cquery12
cquery13
cquery14
+cquery15
cqstream00
cqstream01
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
@@ -19,7 +19,7 @@ call cquery.wait(1000); #give it time to
select aggr00(); #should return 1
select aggr00(); #should return 2
-stop continuous function aggr00();
+stop continuous function aggr00;
drop function aggr00;
--factory factories.aggr00():int; #[0] (0) 0
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
@@ -22,24 +22,24 @@ start continuous function aggr01();
call cquery.wait(1000); #wait to be started
select aggr01(); #should return 0
-pause continuous function aggr01();
+pause continuous function aggr01;
insert into ftmp values(1),(1);
-resume continuous function aggr01();
+resume continuous function aggr01;
call cquery.wait(1000); #wait for processing
select aggr01(); #should return 2
-pause continuous function aggr01();
+pause continuous function aggr01;
insert into ftmp values(2),(2);
insert into ftmp values(3),(3);
-resume continuous function aggr01();
+resume continuous function aggr01;
select aggr01(); #should return 6
call cquery.wait(1000);
select aggr01(); #should return 6
-stop continuous function aggr01();
+stop continuous function aggr01;
drop function aggr01;
drop table ftmp;
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
@@ -24,7 +24,7 @@ start continuous sys.cq_splitter();
call cquery.wait(5000);
-- STOP cq_splitter;
-pause continuous sys.cq_splitter();
+pause continuous cq_splitter;
--select * from cquery.status();
--select * from cquery.status();
@@ -36,7 +36,7 @@ select val from result1;
select val from result2;
-- ideally auto remove upon dropping the procedure
-stop continuous sys.cq_splitter();
+stop continuous cq_splitter;
drop procedure cq_splitter;
drop table stmp2;
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
@@ -19,7 +19,7 @@ start continuous sys.cq_window();
call cquery.wait(3000);
-- STOP cq_window;
-pause continuous sys.cq_window();
+pause continuous cq_window;
select 'RESULT';
select val from stmp2;
@@ -28,7 +28,7 @@ select val from result2;
--select * from cquery.log();
-- ideally auto remove upon dropping the procedure
-stop continuous sys.cq_window();
+stop continuous cq_window;
drop procedure cq_window;
drop table stmp2;
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
@@ -21,7 +21,7 @@ start continuous sys.cq_collector() with
call cquery.wait(4000);
-pause continuous sys.cq_collector();
+pause continuous cq_collector;
select * from tmp_aggregate;
diff --git a/sql/backends/monet5/Tests/cqstream02.stable.err
b/sql/backends/monet5/Tests/cqstream02.stable.err
--- a/sql/backends/monet5/Tests/cqstream02.stable.err
+++ b/sql/backends/monet5/Tests/cqstream02.stable.err
@@ -27,9 +27,9 @@ stderr of test 'cqstream02` in directory
# 13:01:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20007" "--port=32966"
# 13:01:24 >
-MAPI = (monetdb) /var/tmp/mtest-18505/.s.monetdb.34326
-QUERY = pause continuous sys.cq_collector();
-ERROR = !The continuous procedure user.cq_collector(); has not yet started
+MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
+QUERY = pause continuous cq_collector;
+ERROR = !The continuous procedure cq_collector has not yet started
CODE = 42000
# 13:01:25 >
diff --git a/sql/backends/monet5/Tests/cqstream03.sql
b/sql/backends/monet5/Tests/cqstream03.sql
--- a/sql/backends/monet5/Tests/cqstream03.sql
+++ b/sql/backends/monet5/Tests/cqstream03.sql
@@ -19,7 +19,7 @@ start continuous sys.cq_agenda() with he
select * from cquery.status();
-stop continuous sys.cq_agenda(); --error
+stop continuous cq_agenda; --error
drop procedure cq_agenda;
drop table tmp13;
drop table agenda13;
diff --git a/sql/backends/monet5/Tests/cqstream03.stable.err
b/sql/backends/monet5/Tests/cqstream03.stable.err
--- a/sql/backends/monet5/Tests/cqstream03.stable.err
+++ b/sql/backends/monet5/Tests/cqstream03.stable.err
@@ -31,9 +31,9 @@ MAPI = (monetdb) /var/tmp/mtest-19488/.
QUERY = start continuous sys.cq_agenda() with heartbeat 2000;
ERROR = !Heartbeat ignored, a window constraint exists
CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-19446/.s.monetdb.36302
-QUERY = stop continuous sys.cq_agenda(); --error
-ERROR = !The continuous procedure user.cq_agenda(); has not yet started
+MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
+QUERY = stop continuous cq_agenda; --error
+ERROR = !The continuous procedure cq_agenda has not yet started
CODE = 42000
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
@@ -40,7 +40,7 @@ call cquery.wait(1000);
select aaa from cqresult02; --output 2 tuples with value 10 and 22
-stop continuous procedure sys.cq_basic02();
+stop continuous procedure cq_basic02;
drop procedure cq_basic02;
drop table cqinput02;
diff --git a/sql/backends/monet5/Tests/cquery03.sql
b/sql/backends/monet5/Tests/cquery03.sql
--- a/sql/backends/monet5/Tests/cquery03.sql
+++ b/sql/backends/monet5/Tests/cquery03.sql
@@ -15,8 +15,7 @@ call cqfoo(123);
select * from cqtbl;
start continuous cqfoo(321) with cycles 1;
-stop continuous cqfoo(321);
---stop continuous cqfoo;
+stop continuous cqfoo;
select * from cqtbl;
drop procedure cqfoo;
diff --git a/sql/backends/monet5/Tests/cquery03.stable.err
b/sql/backends/monet5/Tests/cquery03.stable.err
--- a/sql/backends/monet5/Tests/cquery03.stable.err
+++ b/sql/backends/monet5/Tests/cquery03.stable.err
@@ -27,9 +27,9 @@ stderr of test 'cquery03` in directory '
# 14:15:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10355" "--port=32676"
# 14:15:08 >
-MAPI = (monetdb) /var/tmp/mtest-16604/.s.monetdb.32786
-QUERY = stop continuous cqfoo(321);
-ERROR = !The continuous procedure user.cqfoo(X_4); has not yet started
+MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
+QUERY = stop continuous cqfoo;
+ERROR = !The continuous procedure cqfoo has not yet started
CODE = 42000
# 14:15:08 >
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
@@ -30,7 +30,7 @@ call cquery.wait(1000);
select aaa from cqresult04; --output 3 tuples with value 2
-stop continuous procedure sys.cq_basic04();
+stop continuous procedure cq_basic04;
drop procedure cq_basic04;
drop table cqinput04;
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
@@ -11,13 +11,13 @@ start continuous sys.cq_basic() with hea
call cquery.wait(2400);
-pause continuous sys.cq_basic();
+pause continuous cq_basic;
--select * from cquery.status();
--select * from cquery.summary();
--select * from cquery.log();
-stop continuous sys.cq_basic();
+stop continuous cq_basic;
select 'RESULT';
select * from cqresult05;
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
@@ -6,15 +6,15 @@ begin
insert into cqresult06 (select count(*) from cqresult06);
end;
-pause continuous cq_basic06(); --error
+pause continuous cq_basic06; --error
start continuous cq_basic06() with heartbeat 1000; --1 second
call cquery.wait(2100);
-pause continuous cq_basic06(); --it's ok
+pause continuous cq_basic06; --it's ok
-stop continuous cq_basic06();
+stop continuous cq_basic06;
drop procedure cq_basic06;
drop table cqresult06;
diff --git a/sql/backends/monet5/Tests/cquery06.stable.err
b/sql/backends/monet5/Tests/cquery06.stable.err
--- a/sql/backends/monet5/Tests/cquery06.stable.err
+++ b/sql/backends/monet5/Tests/cquery06.stable.err
@@ -23,13 +23,13 @@ stderr of test 'cquery06` in directory '
# cmdline opt gdk_dbpath =
/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5
# cmdline opt gdk_debug = 536870922
-# 10:26:37 >
-# 10:26:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24395" "--port=39287"
-# 10:26:37 >
+# 16:51:14 >
+# 16:51:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5601" "--port=32593"
+# 16:51:14 >
-MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287
-QUERY = pause continuous cq_basic06(); --error
-ERROR = !The continuous procedure user.cq_basic06(); has not yet started
+MAPI = (monetdb) /var/tmp/mtest-5601/.s.monetdb.32593
+QUERY = pause continuous cq_basic06; --error
+ERROR = !The continuous procedure cq_basic06 has not yet started
CODE = 42000
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
@@ -6,27 +6,27 @@ begin
insert into cqresult07 (select count(*) from cqresult07);
end;
-stop continuous cq_basic07(); --error
+stop continuous cq_basic07; --error
start continuous cq_basic07() WITH HEARTBEAT 1000 CYCLES 300; --1 second
call cquery.wait(2100);
-pause continuous cq_basic07(); --ok
+pause continuous cq_basic07; --ok
-pause continuous cq_basic07(); --error
+pause continuous cq_basic07; --error
-resume continuous cq_basic07() WITH HEARTBEAT 2000 CYCLES 300; --ok
+resume continuous cq_basic07 WITH HEARTBEAT 2000 CYCLES 300; --ok
-resume continuous cq_basic07() WITH HEARTBEAT 2000 CYCLES 300; --error
+resume continuous cq_basic07 WITH HEARTBEAT 2000 CYCLES 300; --error
-stop continuous cq_basic07(); --ok
+stop continuous cq_basic07; --ok
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
