Changeset: aafea9554ca6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aafea9554ca6 Added Files: sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.out sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.out sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.out sql/backends/monet5/iot/Tests/ais/Tests/ais04.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais04.stable.out sql/backends/monet5/iot/Tests/ais/Tests/ais05.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais05.stable.out sql/backends/monet5/iot/Tests/ais/Tests/ais06.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais06.stable.out sql/backends/monet5/iot/Tests/ais/Tests/ais08.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais08.stable.out sql/backends/monet5/iot/Tests/ais/Tests/ais09.stable.err sql/backends/monet5/iot/Tests/ais/Tests/ais09.stable.out sql/backends/monet5/iot/Tests/receptor01.stable.err sql/backends/monet5/iot/Tests/receptor01.stable.out Modified Files: sql/backends/monet5/iot/50_iot.sql sql/backends/monet5/iot/Tests/iot06.stable.out sql/backends/monet5/iot/Tests/iot13.sql sql/backends/monet5/iot/petrinet.c Branch: iot Log Message:
Approve tests diffs (truncated from 1072 to 300 lines): diff --git a/sql/backends/monet5/iot/50_iot.sql b/sql/backends/monet5/iot/50_iot.sql --- a/sql/backends/monet5/iot/50_iot.sql +++ b/sql/backends/monet5/iot/50_iot.sql @@ -74,6 +74,8 @@ create procedure iot.emitter("schema" st create procedure iot.heartbeat("schema" string, "table" string, msec integer) external name iot.heartbeat; +create procedure iot.heartbeat("schema" string, "table" string, msec bigint) + external name iot.heartbeat; -- cleaup activities create procedure iot.tumble("schema" string, "table" string, elem integer) @@ -92,7 +94,7 @@ external name iot.gettumble; create function iot.getwindow("schema" string, "table" string) returns integer external name iot.getwindow; -create function iot.getheartbeat("schema" string, "table" string) returns integer +create function iot.getheartbeat("schema" string, "table" string) returns bigint external name iot.getheartbeat; create function iot.baskets() diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.err b/sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.err @@ -0,0 +1,34 @@ +stderr of test 'ais01` in directory 'sql/backends/monet5/iot/Tests/ais` itself: + + +# 22:36:54 > +# 22:36:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32280" "--set" "mapi_usock=/var/tmp/mtest-17740/.s.monetdb.32280" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais" +# 22:36:54 > + +# 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 = 32280 +# cmdline opt mapi_usock = /var/tmp/mtest-17740/.s.monetdb.32280 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais +# cmdline opt gdk_debug = 536870922 + +# 22:36:55 > +# 22:36:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-17740" "--port=32280" +# 22:36:55 > + + +# 22:36:55 > +# 22:36:55 > "Done." +# 22:36:55 > + diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.out b/sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais01.stable.out @@ -0,0 +1,92 @@ +stdout of test 'ais01` in directory 'sql/backends/monet5/iot/Tests/ais` itself: + + +# 22:36:54 > +# 22:36:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32280" "--set" "mapi_usock=/var/tmp/mtest-17740/.s.monetdb.32280" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais" +# 22:36:54 > + +# MonetDB 5 server v11.24.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5_iot_Tests_ais', 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:32280/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-17740/.s.monetdb.32280 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/iot 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: 24_zorder.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_gsl.sql +# loading sql script: 46_profiler.sql +# loading sql script: 50_iot.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_lidar.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 + +# 22:36:55 > +# 22:36:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-17740" "--port=32280" +# 22:36:55 > + +#CREATE SCHEMA ais; +#SET SCHEMA ais; +#SET optimizer = 'iot_pipe'; +#CREATE STREAM TABLE vessels1 (implicit_timestamp timestamp, mmsi int, lat real, lon real, nav_status tinyint, sog real, rotais smallint); +#INSERT INTO iot.webserverstreams SELECT tabl.id, 2 , 8, 's' FROM sys.tables tabl INNER JOIN sys.schemas sch ON tabl.schema_id = sch.id WHERE tabl.name = 'vessels1' AND sch.name = 'ais'; +[ 1 ] +#CREATE TABLE ais01r (calc_time timestamp, mmsi int, sog real); +#CREATE PROCEDURE ais01q() +#BEGIN +# INSERT INTO ais01r +# WITH data_time AS (SELECT current_timestamp AS cur_time) +# SELECT cur_time, mmsi, sog FROM vessels1 CROSS JOIN data_time WHERE (implicit_timestamp, mmsi) IN (SELECT max(implicit_timestamp), mmsi FROM vessels1 GROUP BY mmsi); +#END; +#DELETE FROM iot.webserverstreams; +[ 1 ] +#DROP PROCEDURE ais01q; +#DROP TABLE vessels1; +#DROP TABLE ais01r; + +# 22:36:55 > +# 22:36:55 > "Done." +# 22:36:55 > + diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.err b/sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.err @@ -0,0 +1,34 @@ +stderr of test 'ais02` in directory 'sql/backends/monet5/iot/Tests/ais` itself: + + +# 22:36:55 > +# 22:36:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32280" "--set" "mapi_usock=/var/tmp/mtest-17740/.s.monetdb.32280" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais" +# 22:36:55 > + +# 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 = 32280 +# cmdline opt mapi_usock = /var/tmp/mtest-17740/.s.monetdb.32280 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais +# cmdline opt gdk_debug = 536870922 + +# 22:36:56 > +# 22:36:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-17740" "--port=32280" +# 22:36:56 > + + +# 22:36:56 > +# 22:36:56 > "Done." +# 22:36:56 > + diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.out b/sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais02.stable.out @@ -0,0 +1,48 @@ +stdout of test 'ais02` in directory 'sql/backends/monet5/iot/Tests/ais` itself: + + +# 22:36:55 > +# 22:36:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32280" "--set" "mapi_usock=/var/tmp/mtest-17740/.s.monetdb.32280" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais" +# 22:36:55 > + +# MonetDB 5 server v11.24.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5_iot_Tests_ais', 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:32280/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-17740/.s.monetdb.32280 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/iot loaded + +Ready. + +# 22:36:56 > +# 22:36:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-17740" "--port=32280" +# 22:36:56 > + +#SET SCHEMA ais; +#SET optimizer = 'iot_pipe'; +#CREATE STREAM TABLE vessels2 (implicit_timestamp timestamp, mmsi int, lat real, lon real, nav_status tinyint, sog real, rotais smallint); +#INSERT INTO iot.webserverstreams SELECT tabl.id, 2 , 8, 's' FROM sys.tables tabl INNER JOIN sys.schemas sch ON tabl.schema_id = sch.id WHERE tabl.name = 'vessels2' AND sch.name = 'ais'; +[ 1 ] +#CREATE TABLE ais02r (calc_time timestamp, number_ships int); +#CREATE PROCEDURE ais02q() +#BEGIN +# INSERT INTO ais02r +# SELECT current_timestamp, count(DISTINCT mmsi) FROM vessels2; +#END; +#DELETE FROM iot.webserverstreams; +[ 1 ] +#DROP PROCEDURE ais02q; +#DROP TABLE vessels2; +#DROP TABLE ais02r; + +# 22:36:56 > +# 22:36:56 > "Done." +# 22:36:56 > + diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.err b/sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.err @@ -0,0 +1,34 @@ +stderr of test 'ais03` in directory 'sql/backends/monet5/iot/Tests/ais` itself: + + +# 22:36:56 > +# 22:36:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32280" "--set" "mapi_usock=/var/tmp/mtest-17740/.s.monetdb.32280" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais" +# 22:36:56 > + +# 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 = 32280 +# cmdline opt mapi_usock = /var/tmp/mtest-17740/.s.monetdb.32280 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais +# cmdline opt gdk_debug = 536870922 + +# 22:36:56 > +# 22:36:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-17740" "--port=32280" +# 22:36:56 > + + +# 22:36:56 > +# 22:36:56 > "Done." +# 22:36:56 > + diff --git a/sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.out b/sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/iot/Tests/ais/Tests/ais03.stable.out @@ -0,0 +1,49 @@ +stdout of test 'ais03` in directory 'sql/backends/monet5/iot/Tests/ais` itself: + + +# 22:36:56 > +# 22:36:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32280" "--set" "mapi_usock=/var/tmp/mtest-17740/.s.monetdb.32280" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot_Tests_ais" +# 22:36:56 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list