Changeset: e0598c7af394 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0598c7af394 Removed Files: sql/backends/monet5/iot/Tests/cleanup.sql sql/backends/monet5/iot/Tests/cleanup.stable.err sql/backends/monet5/iot/Tests/cleanup.stable.out sql/backends/monet5/iot/Tests/iot05.stable.err sql/backends/monet5/iot/Tests/iot05.stable.out Modified Files: sql/backends/monet5/iot/Tests/All sql/backends/monet5/iot/Tests/inputoutput.sql sql/backends/monet5/iot/Tests/inputoutput.stable.out sql/backends/monet5/iot/Tests/iot00.sql sql/backends/monet5/iot/Tests/iot00.stable.out sql/backends/monet5/iot/Tests/iot02.sql sql/backends/monet5/iot/Tests/iot03.sql sql/backends/monet5/iot/Tests/iot10.sql sql/backends/monet5/iot/Tests/iot10.stable.out sql/backends/monet5/iot/Tests/iot12.sql sql/backends/monet5/iot/Tests/receptor00.sql sql/backends/monet5/iot/Tests/receptor00.stable.out sql/backends/monet5/iot/Tests/receptor01.sql Branch: iot Log Message:
Approve output diffs (truncated from 485 to 300 lines): diff --git a/sql/backends/monet5/iot/Tests/All b/sql/backends/monet5/iot/Tests/All --- a/sql/backends/monet5/iot/Tests/All +++ b/sql/backends/monet5/iot/Tests/All @@ -1,13 +1,11 @@ iot00 iot02 iot03 -#iot05 iot10 iot12 #iot15 receptor00 receptor01 -cleanup #petrinet00 webtest inputoutput diff --git a/sql/backends/monet5/iot/Tests/cleanup.sql b/sql/backends/monet5/iot/Tests/cleanup.sql deleted file mode 100644 --- a/sql/backends/monet5/iot/Tests/cleanup.sql +++ /dev/null @@ -1,9 +0,0 @@ --- initialize the stream testing environment -set schema iot; - -drop procedure cq00; -drop procedure clk1; -drop procedure clk3; -drop table result; -drop table stmp; -drop table stmp1; diff --git a/sql/backends/monet5/iot/Tests/cleanup.stable.err b/sql/backends/monet5/iot/Tests/cleanup.stable.err deleted file mode 100644 --- a/sql/backends/monet5/iot/Tests/cleanup.stable.err +++ /dev/null @@ -1,34 +0,0 @@ -stderr of test 'cleanup` in directory 'sql/backends/monet5/iot` itself: - - -# 00:19:46 > -# 00:19:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38802" "--set" "mapi_usock=/var/tmp/mtest-14198/.s.monetdb.38802" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot" -# 00:19:46 > - -# builtin opt gdk_dbpath = /export/scratch1/mk/iot//Linux/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 = 38802 -# cmdline opt mapi_usock = /var/tmp/mtest-14198/.s.monetdb.38802 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbpath = /export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot -# cmdline opt gdk_debug = 536870922 - -# 00:19:46 > -# 00:19:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-14198" "--port=38802" -# 00:19:46 > - - -# 00:19:46 > -# 00:19:46 > "Done." -# 00:19:46 > - diff --git a/sql/backends/monet5/iot/Tests/cleanup.stable.out b/sql/backends/monet5/iot/Tests/cleanup.stable.out deleted file mode 100644 --- a/sql/backends/monet5/iot/Tests/cleanup.stable.out +++ /dev/null @@ -1,40 +0,0 @@ -stdout of test 'cleanup` in directory 'sql/backends/monet5/iot` itself: - - -# 00:19:46 > -# 00:19:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38802" "--set" "mapi_usock=/var/tmp/mtest-14198/.s.monetdb.38802" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot" -# 00:19:46 > - -# MonetDB 5 server v11.24.0 -# This is an unreleased version -# Serving database 'mTests_sql_backends_monet5_iot', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.589 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:38802/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-14198/.s.monetdb.38802 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -# MonetDB/iot loaded - -Ready. - -# 00:19:46 > -# 00:19:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-14198" "--port=38802" -# 00:19:46 > - -#set schema iot; -#drop procedure cq00; -#drop procedure clk1; -#drop procedure clk3; -#drop table result; -#drop table stmp; -#drop table stmp1; -#drop table stmp2; - -# 00:19:46 > -# 00:19:46 > "Done." -# 00:19:46 > - diff --git a/sql/backends/monet5/iot/Tests/inputoutput.sql b/sql/backends/monet5/iot/Tests/inputoutput.sql --- a/sql/backends/monet5/iot/Tests/inputoutput.sql +++ b/sql/backends/monet5/iot/Tests/inputoutput.sql @@ -28,3 +28,4 @@ select * from input1; select * from output1; call iot.stop(); +select * from iot.errors(); diff --git a/sql/backends/monet5/iot/Tests/inputoutput.stable.out b/sql/backends/monet5/iot/Tests/inputoutput.stable.out --- a/sql/backends/monet5/iot/Tests/inputoutput.stable.out +++ b/sql/backends/monet5/iot/Tests/inputoutput.stable.out @@ -61,6 +61,11 @@ Ready. [ 2005-09-23 12:34:27.000000, 1, 11.00 ] [ 2005-09-23 12:34:28.000000, 1, 13.00 ] [ 2005-09-23 12:34:28.000000, 1, 13.00 ] +#select * from iot.errors(); +% ., . # table_name +% table, error # name +% clob, clob # type +% 0, 0 # length # 23:38:18 > # 23:38:18 > "Done." diff --git a/sql/backends/monet5/iot/Tests/iot00.sql b/sql/backends/monet5/iot/Tests/iot00.sql --- a/sql/backends/monet5/iot/Tests/iot00.sql +++ b/sql/backends/monet5/iot/Tests/iot00.sql @@ -34,4 +34,8 @@ select * from result; --select * from iot.baskets(); --select * from iot.queries(); +select * from iot.errors(); call iot.stop(); +drop procedure cq00; +drop table stmp; +drop table result; diff --git a/sql/backends/monet5/iot/Tests/iot00.stable.out b/sql/backends/monet5/iot/Tests/iot00.stable.out --- a/sql/backends/monet5/iot/Tests/iot00.stable.out +++ b/sql/backends/monet5/iot/Tests/iot00.stable.out @@ -116,6 +116,14 @@ Ready. % timestamp, int, decimal # type % 26, 1, 10 # length [ 2005-09-23 12:34:26.736000, 1, 12.34 ] +#select * from iot.errors(); +% ., . # table_name +% table, error # name +% clob, clob # type +% 0, 0 # length +#drop procedure cq00; +#drop table stmp; +#drop table result; # 22:26:05 > # 22:26:05 > "Done." diff --git a/sql/backends/monet5/iot/Tests/iot02.sql b/sql/backends/monet5/iot/Tests/iot02.sql --- a/sql/backends/monet5/iot/Tests/iot02.sql +++ b/sql/backends/monet5/iot/Tests/iot02.sql @@ -3,23 +3,23 @@ set schema iot; set optimizer='iot_pipe'; -- Example of a stream splitter -create stream table stmp1 (t timestamp, sensor integer, val decimal(8,2)) ; -create table result1(like stmp1); -create table result2(like stmp1); +create stream table stmp2 (t timestamp, sensor integer, val decimal(8,2)) ; +create table result1(like stmp2); +create table result2(like stmp2); create procedure cq02() begin - call iot.tumble('iot','stmp1',1); - insert into result1 select * from stmp1 where val <12; - insert into result2 select * from stmp1 where val >12; + call iot.tumble('iot','stmp2',1); + insert into result1 select * from stmp2 where val <12; + insert into result2 select * from stmp2 where val >12; end; call iot.query('iot','cq02'); call iot.pause('iot','cq02'); -insert into stmp1 values('2005-09-23 12:34:26.000',1,11.0); -insert into stmp1 values('2005-09-23 12:34:27.000',1,11.0); -insert into stmp1 values('2005-09-23 12:34:28.000',1,13.0); -insert into stmp1 values('2005-09-23 12:34:28.000',1,13.0); +insert into stmp2 values('2005-09-23 12:34:26.000',1,11.0); +insert into stmp2 values('2005-09-23 12:34:27.000',1,11.0); +insert into stmp2 values('2005-09-23 12:34:28.000',1,13.0); +insert into stmp2 values('2005-09-23 12:34:28.000',1,13.0); call iot.resume('iot','cq02'); @@ -27,8 +27,13 @@ call iot.resume('iot','cq02'); call iot.wait(5); select 'RESULT'; -select * from stmp1; +select * from stmp2; select * from result1; select * from result2; call iot.stop(); +select * from iot.errors(); +drop procedure cq02; +drop table stmp2; +drop table result1; +drop table result2; diff --git a/sql/backends/monet5/iot/Tests/iot03.sql b/sql/backends/monet5/iot/Tests/iot03.sql --- a/sql/backends/monet5/iot/Tests/iot03.sql +++ b/sql/backends/monet5/iot/Tests/iot03.sql @@ -27,5 +27,7 @@ select * from result3; call iot.stop(); --select * from iot.queries(); +select * from iot.errors(); +drop procedure cq03; drop table stmp3; drop table result3; diff --git a/sql/backends/monet5/iot/Tests/iot05.stable.err b/sql/backends/monet5/iot/Tests/iot05.stable.err deleted file mode 100644 --- a/sql/backends/monet5/iot/Tests/iot05.stable.err +++ /dev/null @@ -1,34 +0,0 @@ -stderr of test 'iot05` in directory 'sql/backends/monet5/iot` itself: - - -# 22:26:05 > -# 22:26:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31285" "--set" "mapi_usock=/var/tmp/mtest-10345/.s.monetdb.31285" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot" -# 22:26:05 > - -# builtin opt gdk_dbpath = /export/scratch1/mk/iot//Linux/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 = 31285 -# cmdline opt mapi_usock = /var/tmp/mtest-10345/.s.monetdb.31285 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbpath = /export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot -# cmdline opt gdk_debug = 536870922 - -# 22:26:05 > -# 22:26:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10345" "--port=31285" -# 22:26:05 > - - -# 22:26:05 > -# 22:26:05 > "Done." -# 22:26:05 > - diff --git a/sql/backends/monet5/iot/Tests/iot05.stable.out b/sql/backends/monet5/iot/Tests/iot05.stable.out deleted file mode 100644 --- a/sql/backends/monet5/iot/Tests/iot05.stable.out +++ /dev/null @@ -1,77 +0,0 @@ -stdout of test 'iot05` in directory 'sql/backends/monet5/iot` itself: - - -# 22:26:05 > -# 22:26:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31285" "--set" "mapi_usock=/var/tmp/mtest-10345/.s.monetdb.31285" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot" -# 22:26:05 > - -# MonetDB 5 server v11.24.0 -# This is an unreleased version -# Serving database 'mTests_sql_backends_monet5_iot', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.589 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:31285/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10345/.s.monetdb.31285 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -# MonetDB/iot loaded - -Ready. - -# 22:26:05 > -# 22:26:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10345" "--port=31285" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
