Changeset: 171c9203904b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=171c9203904b Added Files: sql/test/timetrails/Tests/onoff.sql sql/test/timetrails/Tests/onoff.stable.err sql/test/timetrails/Tests/onoff.stable.out sql/test/timetrails/Tests/retention.stable.err sql/test/timetrails/Tests/retention.stable.out Modified Files: sql/test/timetrails/Tests/All sql/test/timetrails/Tests/retention.sql sql/test/timetrails/Tests/simple_queries.sql sql/test/timetrails/Tests/simple_queries.stable.out sql/test/timetrails/Tests/summary.sql Branch: timetrails Log Message:
Fixing some tests diffs (truncated from 307 to 300 lines): diff --git a/sql/test/timetrails/Tests/All b/sql/test/timetrails/Tests/All --- a/sql/test/timetrails/Tests/All +++ b/sql/test/timetrails/Tests/All @@ -11,3 +11,4 @@ extend microbatch summary retention +onoff diff --git a/sql/test/timetrails/Tests/onoff.sql b/sql/test/timetrails/Tests/onoff.sql new file mode 100644 --- /dev/null +++ b/sql/test/timetrails/Tests/onoff.sql @@ -0,0 +1,9 @@ +-- on-off query problem. Find all the values that form a consecutive list + +CREATE TABLE coil( tick integer, level integer); + +INSERT INTO coil +VALUES +(1,0),(2,0),(3,0),(4,0),(5,1),(6,1),(7,1),(8,0),(9,2),(10,2),(11,2),(12,2),(13,0),(14,0),(15,3),(16,0),(17,0),(18,0),(19,4),(20,4),(21,4),(22,5),(23,5),(24,5),(25,0),(26,0),(27,6),(28,0),(29,6),(30,0),(31,7),(32,7),(33,7),(34,7),(35,8),(36,8),(37,8),(38,8),(39,8),(40,7),(41,7),(42,7),(43,7),(44,9),(45,9),(46,9),(47,0),(48,0),(49,0); + +select A.level, count(*)from coil A, coil B where A.tick+1 = B.tick and A.level <> B.level group by A.level; diff --git a/sql/test/timetrails/Tests/onoff.stable.err b/sql/test/timetrails/Tests/onoff.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/timetrails/Tests/onoff.stable.err @@ -0,0 +1,34 @@ +stderr of test 'onoff` in directory 'sql/test/timetrails` itself: + + +# 20:56:51 > +# 20:56:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31197" "--set" "mapi_usock=/var/tmp/mtest-14521/.s.monetdb.31197" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/timetrails//Linux/var/MonetDB/mTests_sql_test_timetrails" +# 20:56:51 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/timetrails//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 = 31197 +# cmdline opt mapi_usock = /var/tmp/mtest-14521/.s.monetdb.31197 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/mk/timetrails//Linux/var/MonetDB/mTests_sql_test_timetrails +# cmdline opt gdk_debug = 536870922 + +# 20:56:51 > +# 20:56:51 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-14521" "--port=31197" +# 20:56:51 > + + +# 20:56:51 > +# 20:56:51 > "Done." +# 20:56:51 > + diff --git a/sql/test/timetrails/Tests/onoff.stable.out b/sql/test/timetrails/Tests/onoff.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/timetrails/Tests/onoff.stable.out @@ -0,0 +1,51 @@ +stdout of test 'onoff` in directory 'sql/test/timetrails` itself: + + +# 20:56:51 > +# 20:56:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31197" "--set" "mapi_usock=/var/tmp/mtest-14521/.s.monetdb.31197" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/timetrails//Linux/var/MonetDB/mTests_sql_test_timetrails" +# 20:56:51 > + +# MonetDB 5 server v11.28.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_timetrails', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 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:31197/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-14521/.s.monetdb.31197 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 20:56:51 > +# 20:56:51 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-14521" "--port=31197" +# 20:56:51 > + +#CREATE TABLE coil( tick integer, level integer); +#INSERT INTO coil +#VALUES +#(1,0),(2,0),(3,0),(4,0),(5,1),(6,1),(7,1),(8,0),(9,2),(10,2),(11,2),(12,2),(13,0),(14,0),(15,3),(16,0),(17,0),(18,0),(19,4),(20,4),(21,4),(22,5),(23,5),(24,5),(25,0),(26,0),(27,6),(28,0),(29,6),(30,0),(31,7),(32,7),(33,7),(34,7),(35,8),(36,8),(37,8),(38,8),(39,8),(40,7),(41,7),(42,7),(43,7),(44,9),(45,9),(46,9),(47,0),(48,0),(49,0); +[ 49 ] +#select A.level, count(*)from coil A, coil B where A.tick+1 = B.tick and A.level <> B.level group by A.level; +% sys.a, sys.L4 # table_name +% level, L3 # name +% int, bigint # type +% 1, 1 # length +[ 0, 7 ] +[ 1, 1 ] +[ 2, 1 ] +[ 3, 1 ] +[ 4, 1 ] +[ 5, 1 ] +[ 6, 2 ] +[ 7, 2 ] +[ 8, 1 ] +[ 9, 1 ] + +# 20:56:51 > +# 20:56:51 > "Done." +# 20:56:51 > + diff --git a/sql/test/timetrails/Tests/retention.sql b/sql/test/timetrails/Tests/retention.sql --- a/sql/test/timetrails/Tests/retention.sql +++ b/sql/test/timetrails/Tests/retention.sql @@ -2,20 +2,20 @@ CREATE TABLE rooms_min(tick timestamp, room string, level integer, temp integer); -CREATE PROCEDURE retention(stride integer) +CREATE PROCEDURE retention() BEGIN DELETE FROM rooms - WHERE now() - stride >tick; + WHERE now() - 60 > tick; END; -CALL timetrails.register('sys','retention'); -CALL timetrails.heartbeat('sys','retention',60); -CALL timetrails.resume(); -CALL timetrails.wait(500); -CALL timetrails.pause(); +CALL cquery.register('sys','retention'); +CALL cquery.heartbeat('sys','retention',60); +CALL cquery.resume(); +CALL cquery.wait(500); +CALL cquery.pause(); -SELECT * FROM timetrails.status(); -CALL timetrails.deregister('sys','retention'); +--SELECT * FROM cquery.status(); +CALL cquery.deregister('sys','retention'); SELECT * FROM rooms_min; diff --git a/sql/test/timetrails/Tests/retention.stable.err b/sql/test/timetrails/Tests/retention.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/timetrails/Tests/retention.stable.err @@ -0,0 +1,34 @@ +stderr of test 'retention` in directory 'sql/test/timetrails` itself: + + +# 20:46:05 > +# 20:46:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30937" "--set" "mapi_usock=/var/tmp/mtest-13247/.s.monetdb.30937" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/timetrails//Linux/var/MonetDB/mTests_sql_test_timetrails" +# 20:46:05 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/timetrails//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 = 30937 +# cmdline opt mapi_usock = /var/tmp/mtest-13247/.s.monetdb.30937 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/mk/timetrails//Linux/var/MonetDB/mTests_sql_test_timetrails +# cmdline opt gdk_debug = 536870922 + +# 20:46:05 > +# 20:46:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13247" "--port=30937" +# 20:46:05 > + + +# 20:46:06 > +# 20:46:06 > "Done." +# 20:46:06 > + diff --git a/sql/test/timetrails/Tests/retention.stable.out b/sql/test/timetrails/Tests/retention.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/timetrails/Tests/retention.stable.out @@ -0,0 +1,44 @@ +stdout of test 'retention` in directory 'sql/test/timetrails` itself: + + +# 20:46:05 > +# 20:46:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30937" "--set" "mapi_usock=/var/tmp/mtest-13247/.s.monetdb.30937" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/timetrails//Linux/var/MonetDB/mTests_sql_test_timetrails" +# 20:46:05 > + +# MonetDB 5 server v11.28.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_timetrails', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 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:30937/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13247/.s.monetdb.30937 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 20:46:05 > +# 20:46:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13247" "--port=30937" +# 20:46:05 > + +#CREATE TABLE rooms_min(tick timestamp, room string, level integer, temp integer); +#CREATE PROCEDURE retention() +#BEGIN +# DELETE FROM rooms +# WHERE now() - 60 > tick; +#END; +#SELECT * FROM rooms_min; +% sys.rooms_min, sys.rooms_min, sys.rooms_min, sys.rooms_min # table_name +% tick, room, level, temp # name +% timestamp, clob, int, int # type +% 26, 0, 1, 1 # length +#DROP PROCEDURE retention; +#DROP TABLE rooms_min; + +# 20:46:06 > +# 20:46:06 > "Done." +# 20:46:06 > + diff --git a/sql/test/timetrails/Tests/simple_queries.sql b/sql/test/timetrails/Tests/simple_queries.sql --- a/sql/test/timetrails/Tests/simple_queries.sql +++ b/sql/test/timetrails/Tests/simple_queries.sql @@ -23,7 +23,7 @@ WHERE tick BETWEEN timestamp '2017/01/01 GROUP BY room, level; --std_dev -SELECT min(tick), std_dev(temp) +SELECT min(tick), stddev_pop(temp) FROM rooms WHERE tick BETWEEN timestamp '2017/01/01 09:00:00' AND timestamp '2017/01/31 23:59:59' GROUP BY room, level; diff --git a/sql/test/timetrails/Tests/simple_queries.stable.out b/sql/test/timetrails/Tests/simple_queries.stable.out --- a/sql/test/timetrails/Tests/simple_queries.stable.out +++ b/sql/test/timetrails/Tests/simple_queries.stable.out @@ -64,6 +64,16 @@ Ready. % 26, 24 # length [ 2017-01-01 09:00:00.000000, 21.4 ] [ 2017-01-01 13:00:00.000000, 17.4 ] +#SELECT min(tick), stddev_pop(temp) +#FROM rooms +#WHERE tick BETWEEN timestamp '2017/01/01 09:00:00' AND timestamp '2017/01/31 23:59:59' +#GROUP BY room, level; +% sys.L3, sys.L6 # table_name +% L2, L5 # name +% timestamp, double # type +% 26, 24 # length +[ 2017-01-01 09:00:00.000000, 3.318031937 ] +[ 2017-01-01 13:00:00.000000, 2.198152633 ] #SELECT min(tick), avg(temp) #FROM rooms #WHERE tick BETWEEN timestamp '2017/01/01 09:00:00' AND timestamp '2017/01/31 23:59:59' diff --git a/sql/test/timetrails/Tests/summary.sql b/sql/test/timetrails/Tests/summary.sql --- a/sql/test/timetrails/Tests/summary.sql +++ b/sql/test/timetrails/Tests/summary.sql @@ -2,24 +2,24 @@ CREATE TABLE rooms_min(tick timestamp, room string, level integer, temp integer); -CREATE PROCEDURE summarize(stride integer) +CREATE PROCEDURE summarize() BEGIN INSERT INTO rooms_min WITH T(tick, period, room, level, temp) - AS ( SELECT min(tick), epoch(tick)/stride AS period, room, level, avg(temp) + AS ( SELECT min(tick), epoch(tick)/60 AS period, room, level, avg(temp) FROM rooms GROUP BY period, room, level) SELECT tick,room,level,temp FROM T; END; -CALL timetrails.register('sys','summarize'); -CALL timetrails.heartbeat('sys','summarize',60); -CALL timetrails.resume(); -CALL timetrails.wait(500); -CALL timetrails.pause(); +CALL cquery.register('sys','summarize'); +CALL cquery.heartbeat('sys','summarize',60); +CALL cquery.resume(); +CALL cquery.wait(100); +CALL cquery.pause(); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
