Changeset: 9b53c0dd6ad7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b53c0dd6ad7 Added Files: sql/backends/monet5/Tests/cqcreate.stable.err sql/backends/monet5/Tests/cqcreate.stable.out sql/backends/monet5/Tests/cquery06.stable.err sql/backends/monet5/Tests/cquery06.stable.out sql/backends/monet5/Tests/cquery07.stable.err sql/backends/monet5/Tests/cquery07.stable.out Modified Files: sql/backends/monet5/Tests/cqstream02.sql sql/backends/monet5/Tests/cqstream03.sql sql/backends/monet5/Tests/cqstream03.stable.err sql/backends/monet5/Tests/cquery00.stable.err sql/backends/monet5/Tests/cquery05.sql sql/backends/monet5/Tests/cquery10.sql sql/backends/monet5/Tests/cquery20.sql sql/backends/monet5/Tests/cquery20.stable.out sql/backends/monet5/sql_cquery.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_scenario.c sql/server/sql_parser.y sql/server/sql_qc.c sql/server/sql_qc.h Branch: trails Log Message:
Dealing continuous queries calls with the SQL query cache. Default heartbeat increased to 1 second diffs (truncated from 574 to 300 lines): diff --git a/sql/backends/monet5/Tests/cqcreate.stable.err b/sql/backends/monet5/Tests/cqcreate.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cqcreate.stable.err @@ -0,0 +1,34 @@ +stderr of test 'cqcreate` in directory 'sql/backends/monet5` itself: + + +# 10:26:34 > +# 10:26:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39287" "--set" "mapi_usock=/var/tmp/mtest-24395/.s.monetdb.39287" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 10:26:34 > + +# builtin opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 39287 +# cmdline opt mapi_usock = /var/tmp/mtest-24395/.s.monetdb.39287 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5 +# cmdline opt gdk_debug = 536870922 + +# 10:26:34 > +# 10:26:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-24395" "--port=39287" +# 10:26:34 > + + +# 10:26:34 > +# 10:26:34 > "Done." +# 10:26:34 > + diff --git a/sql/backends/monet5/Tests/cqcreate.stable.out b/sql/backends/monet5/Tests/cqcreate.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cqcreate.stable.out @@ -0,0 +1,35 @@ +stdout of test 'cqcreate` in directory 'sql/backends/monet5` itself: + + +# 10:26:34 > +# 10:26:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39287" "--set" "mapi_usock=/var/tmp/mtest-24395/.s.monetdb.39287" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 10:26:34 > + +# MonetDB 5 server v11.28.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.499 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://dhcp-120.eduroam.cwi.nl:39287/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-24395/.s.monetdb.39287 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/Timetrails module loaded + +Ready. + +# 10:26:34 > +# 10:26:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-24395" "--port=39287" +# 10:26:34 > + +#CREATE stream TABLE testing (a int); +#CREATE TABLE results (b int); +#CREATE PROCEDURE stressing() BEGIN INSERT INTO results SELECT a FROM testing; END; + +# 10:26:34 > +# 10:26:34 > "Done." +# 10:26:34 > + 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 @@ -17,10 +17,7 @@ insert into stmp10 values('2005-09-23 12 insert into stmp10 values('2005-09-23 12:34:28.000',1,13.0); insert into stmp10 values('2005-09-23 12:34:28.000',1,15.0); -start continuous sys.cq_collector(); - --- Run the query a few times -call cquery."cycles"(3); +start continuous sys.cq_collector() with cycles 3; call cquery.wait(1000); @@ -32,4 +29,3 @@ select * from tmp_aggregate; drop procedure cq_collector; drop table stmp10; drop table tmp_aggregate; - 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 @@ -15,8 +15,8 @@ begin insert into agenda13 select count(*), 'full batch' from tmp13; end if; end; -start continuous sys.cq_agenda(); -call cquery."heartbeat"('sys','cq_agenda',1000); + +start continuous sys.cq_agenda() with heartbeat 1000; select * from cquery.status(); @@ -24,4 +24,3 @@ stop continuous sys.cq_agenda(); 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 @@ -27,8 +27,8 @@ stderr of test 'cqstream03` in directory # 12:58:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-17764" "--port=38071" # 12:58:46 > -MAPI = (monetdb) /var/tmp/mtest-17764/.s.monetdb.38071 -QUERY = call cquery.heartbeat('sys','cq_agenda',1000); +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 +QUERY = call cquery."heartbeat"('sys','cq_agenda',1000); ERROR = !Beat ignored, a window constraint exists diff --git a/sql/backends/monet5/Tests/cquery00.stable.err b/sql/backends/monet5/Tests/cquery00.stable.err --- a/sql/backends/monet5/Tests/cquery00.stable.err +++ b/sql/backends/monet5/Tests/cquery00.stable.err @@ -43,6 +43,7 @@ QUERY = # some simple MAL tests + # 22:29:14 > # 22:29:14 > "Done." # 22:29:14 > 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 @@ -7,9 +7,7 @@ begin insert into cqresult05 (select count(*) from cqresult05); end; -start continuous sys.cq_basic(); - -call cquery."heartbeat"('sys','cq_basic',1000); +start continuous sys.cq_basic() with heartbeat 1000; call cquery.wait(2100); @@ -24,6 +22,5 @@ stop continuous sys.cq_basic(); select 'RESULT'; select * from cqresult05; - drop procedure cq_basic; drop table cqresult05; diff --git a/sql/backends/monet5/Tests/cquery06.stable.err b/sql/backends/monet5/Tests/cquery06.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery06.stable.err @@ -0,0 +1,37 @@ +stderr of test 'cquery06` in directory 'sql/backends/monet5` itself: + + +# 10:26:37 > +# 10:26:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39287" "--set" "mapi_usock=/var/tmp/mtest-24395/.s.monetdb.39287" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 10:26:37 > + +# builtin opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 39287 +# cmdline opt mapi_usock = /var/tmp/mtest-24395/.s.monetdb.39287 +# cmdline opt monet_prompt = +# 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 > + +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 +QUERY = pause continuous cq_basic06(); --error + + +# 10:26:39 > +# 10:26:39 > "Done." +# 10:26:39 > + diff --git a/sql/backends/monet5/Tests/cquery06.stable.out b/sql/backends/monet5/Tests/cquery06.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery06.stable.out @@ -0,0 +1,39 @@ +stdout of test 'cquery06` in directory 'sql/backends/monet5` itself: + + +# 10:26:37 > +# 10:26:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39287" "--set" "mapi_usock=/var/tmp/mtest-24395/.s.monetdb.39287" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 10:26:37 > + +# MonetDB 5 server v11.28.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.499 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://dhcp-120.eduroam.cwi.nl:39287/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-24395/.s.monetdb.39287 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/Timetrails module loaded + +Ready. + +# 10:26:37 > +# 10:26:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-24395" "--port=39287" +# 10:26:37 > + +#create table cqresult06(i integer); +#create procedure cq_basic06() +#begin +# insert into cqresult06 (select count(*) from cqresult06); +#end; +#drop procedure cq_basic06; +#drop table cqresult06; + +# 10:26:39 > +# 10:26:39 > "Done." +# 10:26:39 > + diff --git a/sql/backends/monet5/Tests/cquery07.stable.err b/sql/backends/monet5/Tests/cquery07.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery07.stable.err @@ -0,0 +1,52 @@ +stderr of test 'cquery07` in directory 'sql/backends/monet5` itself: + + +# 10:26:39 > +# 10:26:39 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39287" "--set" "mapi_usock=/var/tmp/mtest-24395/.s.monetdb.39287" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 10:26:39 > + +# builtin opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 39287 +# cmdline opt mapi_usock = /var/tmp/mtest-24395/.s.monetdb.39287 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5 +# cmdline opt gdk_debug = 536870922 + +# 10:26:39 > +# 10:26:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-24395" "--port=39287" +# 10:26:39 > + +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 +QUERY = stop continuous cq_basic07(); --error + +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 +QUERY = pause continuous cq_basic07(); --error + +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 +QUERY = resume continuous cq_basic07() WITH HEARTBEAT 2000 CYCLES 300; --error + +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 +QUERY = stop continuous cq_basic07(); --error + +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 +QUERY = pause continuous cq_basic07(); --error + +MAPI = (monetdb) /var/tmp/mtest-24395/.s.monetdb.39287 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
