Changeset: 3a2855db8e59 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3a2855db8e59 Added Files: sql/backends/monet5/Tests/cquery01.sql sql/backends/monet5/Tests/cquery01.stable.err sql/backends/monet5/Tests/cquery01.stable.out sql/backends/monet5/Tests/cquery02.sql sql/backends/monet5/Tests/cquery02.stable.err sql/backends/monet5/Tests/cquery02.stable.out sql/backends/monet5/Tests/cquery03.sql sql/backends/monet5/Tests/cquery03.stable.err sql/backends/monet5/Tests/cquery03.stable.out sql/backends/monet5/Tests/cquery04.sql sql/backends/monet5/Tests/cquery04.stable.err sql/backends/monet5/Tests/cquery04.stable.out Removed Files: sql/backends/monet5/Tests/cquery20.sql sql/backends/monet5/Tests/cquery20.stable.err sql/backends/monet5/Tests/cquery20.stable.out Modified Files: sql/backends/monet5/Tests/All sql/backends/monet5/sql_basket.c sql/backends/monet5/sql_cat.c sql/include/sql_catalog.h sql/server/rel_schema.c sql/server/sql_parser.y Branch: trails Log Message:
Added stride all option to remove all tuples in a stream table in a tuple based continuous query diffs (truncated from 1063 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 @@ -86,13 +86,16 @@ cqcreate cquery cquery00 +cquery01 +cquery02 +cquery03 +cquery04 cquery05 cquery06 cquery07 cquery08 cquery09 cquery10 -cquery20 cqstream00 cqstream01 diff --git a/sql/backends/monet5/Tests/cquery01.sql b/sql/backends/monet5/Tests/cquery01.sql new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery01.sql @@ -0,0 +1,14 @@ +-- The stride must be smaller than +create stream table cqinput01(aaa integer) set window 4 stride 5; --error + +create stream table cqinput01(aaa integer) set window 5 stride 5; --ok + +alter stream table cqinput01 set stride 10; --error + +alter stream table cqinput01 set window 4; --error + +alter stream table cqinput01 set window 6; --ok + +alter stream table cqinput01 set stride 6; --ok + +drop table cqinput01; diff --git a/sql/backends/monet5/Tests/cquery01.stable.err b/sql/backends/monet5/Tests/cquery01.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery01.stable.err @@ -0,0 +1,46 @@ +stderr of test 'cquery01` in directory 'sql/backends/monet5` itself: + + +# 14:38:22 > +# 14:38:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30485" "--set" "mapi_usock=/var/tmp/mtest-12016/.s.monetdb.30485" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 14:38:22 > + +# 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 = 30485 +# cmdline opt mapi_usock = /var/tmp/mtest-12016/.s.monetdb.30485 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5 +# cmdline opt gdk_debug = 536870922 + +# 14:38:22 > +# 14:38:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12016" "--port=30485" +# 14:38:22 > + +MAPI = (monetdb) /var/tmp/mtest-12016/.s.monetdb.30485 +QUERY = create stream table cqinput01(aaa integer) set window 4 stride 5; --error +ERROR = !CREATE TABLE: stride size is larger than the window size? +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-12016/.s.monetdb.30485 +QUERY = alter stream table cqinput01 set stride 10; --error +ERROR = !ALTER STREAM TABLE: the stride size is larger than the window size? +CODE = 42S02 +MAPI = (monetdb) /var/tmp/mtest-12016/.s.monetdb.30485 +QUERY = alter stream table cqinput01 set window 4; --error +ERROR = !ALTER STREAM TABLE: the stride size is larger than the window size? +CODE = 42S02 + +# 14:38:23 > +# 14:38:23 > "Done." +# 14:38:23 > + diff --git a/sql/backends/monet5/Tests/cquery01.stable.out b/sql/backends/monet5/Tests/cquery01.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery01.stable.out @@ -0,0 +1,76 @@ +stdout of test 'cquery01` in directory 'sql/backends/monet5` itself: + + +# 14:38:22 > +# 14:38:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30485" "--set" "mapi_usock=/var/tmp/mtest-12016/.s.monetdb.30485" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 14:38:22 > + +# 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.498 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:30485/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12016/.s.monetdb.30485 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/Timetrails module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 50_cquery.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_shp.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 14:38:22 > +# 14:38:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12016" "--port=30485" +# 14:38:22 > + +#create stream table cqinput01(aaa integer) set window 5 stride 5; --ok +#alter stream table cqinput01 set window 6; --ok +#alter stream table cqinput01 set stride 6; --ok +#drop table cqinput01; + +# 14:38:23 > +# 14:38:23 > "Done." +# 14:38:23 > + diff --git a/sql/backends/monet5/Tests/cquery02.sql b/sql/backends/monet5/Tests/cquery02.sql new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery02.sql @@ -0,0 +1,47 @@ +-- Test strides on a stream table +create stream table cqinput02(aaa integer) set window 4 stride 3; + +create table cqresult02(aaa integer); + +create procedure cq_basic02() +begin + insert into cqresult02 (select sum(aaa) from cqinput02); +end; + +start continuous procedure sys.cq_basic02(); + +insert into cqinput02 values (1), (2), (3); + +call cquery.wait(1000); + +select aaa from cqresult02; --output no tuples + +insert into cqinput02 values (4); + +call cquery.wait(1000); + +select aaa from cqresult02; --output 1 tuple with value 10 + +insert into cqinput02 values (5), (6); + +call cquery.wait(1000); + +select aaa from cqresult02; --output 1 tuple with value 10 + +insert into cqinput02 values (7); + +call cquery.wait(1000); + +select aaa from cqresult02; --output 2 tuples with value 10 and 22 + +insert into cqinput02 values (1000); + +call cquery.wait(1000); + +select aaa from cqresult02; --output 2 tuples with value 10 and 22 + +stop continuous procedure sys.cq_basic02(); + +drop procedure cq_basic02; +drop table cqinput02; +drop table cqresult02; diff --git a/sql/backends/monet5/Tests/cquery02.stable.err b/sql/backends/monet5/Tests/cquery02.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery02.stable.err @@ -0,0 +1,34 @@ +stderr of test 'cquery02` in directory 'sql/backends/monet5` itself: + + +# 14:29:21 > +# 14:29:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38794" "--set" "mapi_usock=/var/tmp/mtest-11662/.s.monetdb.38794" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 14:29:21 > + +# 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 = 38794 +# cmdline opt mapi_usock = /var/tmp/mtest-11662/.s.monetdb.38794 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5 +# cmdline opt gdk_debug = 536870922 + +# 14:29:21 > +# 14:29:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-11662" "--port=38794" +# 14:29:21 > + + +# 14:29:27 > +# 14:29:27 > "Done." +# 14:29:27 > + diff --git a/sql/backends/monet5/Tests/cquery02.stable.out b/sql/backends/monet5/Tests/cquery02.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/cquery02.stable.out @@ -0,0 +1,122 @@ +stdout of test 'cquery02` in directory 'sql/backends/monet5` itself: + + +# 14:29:21 > +# 14:29:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38794" "--set" "mapi_usock=/var/tmp/mtest-11662/.s.monetdb.38794" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5" +# 14:29:21 > + +# 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.498 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:38794/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-11662/.s.monetdb.38794 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/Timetrails module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
