Changeset: 3062e95bbfc5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3062e95bbfc5
Added Files:
sql/backends/monet5/iot/Tests/iot03.stable.err
sql/backends/monet5/iot/Tests/iot03.stable.out
sql/backends/monet5/iot/Tests/iot04.stable.err
sql/backends/monet5/iot/Tests/iot04.stable.out
sql/backends/monet5/iot/Tests/iot12.stable.err
sql/backends/monet5/iot/Tests/iot12.stable.out
sql/backends/monet5/iot/Tests/iot14.stable.err
sql/backends/monet5/iot/Tests/iot14.stable.out
Modified Files:
sql/backends/monet5/iot/Tests/bug02.stable.err
sql/backends/monet5/iot/Tests/bug02.stable.out
sql/backends/monet5/iot/Tests/iot04.sql
sql/backends/monet5/iot/Tests/iot12.sql
sql/backends/monet5/iot/Tests/iot14.sql
sql/backends/monet5/iot/Tests/iot16.sql
sql/backends/monet5/iot/Tests/iot16.stable.out
sql/backends/monet5/iot/petrinet.c
Branch: iot
Log Message:
A few more smaller fixes
diffs (truncated from 752 to 300 lines):
diff --git a/sql/backends/monet5/iot/Tests/bug02.stable.err
b/sql/backends/monet5/iot/Tests/bug02.stable.err
--- a/sql/backends/monet5/iot/Tests/bug02.stable.err
+++ b/sql/backends/monet5/iot/Tests/bug02.stable.err
@@ -1,9 +1,9 @@
stderr of test 'bug02` in directory 'sql/backends/monet5/iot` itself:
-# 16:06:35 >
-# 16:06:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36465" "--set"
"mapi_usock=/var/tmp/mtest-21122/.s.monetdb.36465" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
-# 16:06:35 >
+# 09:56:30 >
+# 09:56:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31933" "--set"
"mapi_usock=/var/tmp/mtest-28297/.s.monetdb.31933" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 09:56:30 >
# builtin opt gdk_dbpath =
/export/scratch1/mk/iot//Linux/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
@@ -17,22 +17,22 @@ stderr of test 'bug02` in directory 'sql
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 36465
-# cmdline opt mapi_usock = /var/tmp/mtest-21122/.s.monetdb.36465
+# cmdline opt mapi_port = 31933
+# cmdline opt mapi_usock = /var/tmp/mtest-28297/.s.monetdb.31933
# 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
-# 16:06:35 >
-# 16:06:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21122" "--port=36465"
-# 16:06:35 >
+# 09:56:30 >
+# 09:56:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28297" "--port=31933"
+# 09:56:30 >
-MAPI = (monetdb) /var/tmp/mtest-21122/.s.monetdb.36465
+MAPI = (monetdb) /var/tmp/mtest-28297/.s.monetdb.31933
QUERY = call iot.show('sys','test');
+ERROR = !Continous query sys.test not accessible
+# 09:56:30 >
+# 09:56:30 > "Done."
+# 09:56:30 >
-# 16:06:35 >
-# 16:06:35 > "Done."
-# 16:06:35 >
-
diff --git a/sql/backends/monet5/iot/Tests/bug02.stable.out
b/sql/backends/monet5/iot/Tests/bug02.stable.out
--- a/sql/backends/monet5/iot/Tests/bug02.stable.out
+++ b/sql/backends/monet5/iot/Tests/bug02.stable.out
@@ -1,9 +1,9 @@
stdout of test 'bug02` in directory 'sql/backends/monet5/iot` itself:
-# 16:06:35 >
-# 16:06:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36465" "--set"
"mapi_usock=/var/tmp/mtest-21122/.s.monetdb.36465" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
-# 16:06:35 >
+# 09:56:30 >
+# 09:56:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31933" "--set"
"mapi_usock=/var/tmp/mtest-28297/.s.monetdb.31933" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 09:56:30 >
# MonetDB 5 server v11.24.0
# This is an unreleased version
@@ -13,20 +13,22 @@ stdout of test 'bug02` in directory 'sql
# 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:36465/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21122/.s.monetdb.36465
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:31933/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28297/.s.monetdb.31933
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
# MonetDB/iot loaded
Ready.
-# 16:06:35 >
-# 16:06:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21122" "--port=36465"
-# 16:06:35 >
+# 09:56:30 >
+# 09:56:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28297" "--port=31933"
+# 09:56:30 >
+#set schema iot;
+#set optimizer='iot_pipe';
-# 16:06:35 >
-# 16:06:35 > "Done."
-# 16:06:35 >
+# 09:56:30 >
+# 09:56:30 > "Done."
+# 09:56:30 >
diff --git a/sql/backends/monet5/iot/Tests/iot03.stable.err
b/sql/backends/monet5/iot/Tests/iot03.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/iot/Tests/iot03.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'iot03` in directory 'sql/backends/monet5/iot` itself:
+
+
+# 08:44:01 >
+# 08:44:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34418" "--set"
"mapi_usock=/var/tmp/mtest-31022/.s.monetdb.34418" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 08:44:01 >
+
+# 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 = 34418
+# cmdline opt mapi_usock = /var/tmp/mtest-31022/.s.monetdb.34418
+# 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
+
+# 08:44:01 >
+# 08:44:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31022" "--port=34418"
+# 08:44:01 >
+
+
+# 08:44:01 >
+# 08:44:01 > "Done."
+# 08:44:01 >
+
diff --git a/sql/backends/monet5/iot/Tests/iot03.stable.out
b/sql/backends/monet5/iot/Tests/iot03.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/iot/Tests/iot03.stable.out
@@ -0,0 +1,69 @@
+stdout of test 'iot03` in directory 'sql/backends/monet5/iot` itself:
+
+
+# 08:44:01 >
+# 08:44:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34418" "--set"
"mapi_usock=/var/tmp/mtest-31022/.s.monetdb.34418" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 08:44:01 >
+
+# 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:34418/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31022/.s.monetdb.34418
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/iot loaded
+
+Ready.
+
+# 08:44:01 >
+# 08:44:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31022" "--port=34418"
+# 08:44:01 >
+
+#set schema iot;
+#set optimizer='iot_pipe';
+#create stream table stmp3 (t timestamp, sensor integer, val decimal(8,2)) ;
+#create table result3(like stmp3);
+#create procedure cq03()
+#begin
+# call iot.window('iot','stmp3',2);
+# insert into result3 select min(t), count(*), avg(val) from stmp3;
+#end;
+#insert into stmp3 values('2005-09-23 12:34:26.000',1,9.0);
+[ 1 ]
+#insert into stmp3 values('2005-09-23 12:34:27.000',1,11.0);
+[ 1 ]
+#insert into stmp3 values('2005-09-23 12:34:28.000',1,13.0);
+[ 1 ]
+#insert into stmp3 values('2005-09-23 12:34:28.000',1,15.0);
+[ 1 ]
+#select * from stmp3;
+% iot.stmp3, iot.stmp3, iot.stmp3 # table_name
+% t, sensor, val # name
+% timestamp, int, decimal # type
+% 26, 1, 10 # length
+#select * from result3;
+% iot.result3, iot.result3, iot.result3 # table_name
+% t, sensor, val # name
+% timestamp, int, decimal # type
+% 26, 1, 10 # length
+[ 2005-09-23 12:34:26.000000, 2, 10.00 ]
+[ 2005-09-23 12:34:28.000000, 2, 14.00 ]
+#select * from iot.errors();
+% ., . # table_name
+% table, error # name
+% clob, clob # type
+% 0, 0 # length
+#drop procedure cq03;
+#drop table stmp3;
+#drop table result3;
+
+# 08:44:01 >
+# 08:44:01 > "Done."
+# 08:44:01 >
+
diff --git a/sql/backends/monet5/iot/Tests/iot04.sql
b/sql/backends/monet5/iot/Tests/iot04.sql
--- a/sql/backends/monet5/iot/Tests/iot04.sql
+++ b/sql/backends/monet5/iot/Tests/iot04.sql
@@ -25,16 +25,16 @@ insert into stmp values('2005-09-23 12:3
select * from stmp;
-- let the cq run only wanse
-call iot.cycles('iot','cq00',2);
+call iot.cycles('iot','cq00',1);
call iot.resume();
-- wait for 1 cycle in the scheduler
-call iot.wait(3);
+call iot.wait(10);
select 'RESULT';
select * from result;
--select * from iot.baskets();
---select * from iot.queries();
+select * from iot.queries();
select * from iot.errors();
call iot.stop();
drop procedure cq00;
diff --git a/sql/backends/monet5/iot/Tests/iot04.stable.err
b/sql/backends/monet5/iot/Tests/iot04.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/iot/Tests/iot04.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'iot04` in directory 'sql/backends/monet5/iot` itself:
+
+
+# 09:56:32 >
+# 09:56:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31933" "--set"
"mapi_usock=/var/tmp/mtest-28297/.s.monetdb.31933" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 09:56:32 >
+
+# 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 = 31933
+# cmdline opt mapi_usock = /var/tmp/mtest-28297/.s.monetdb.31933
+# 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
+
+# 09:56:32 >
+# 09:56:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28297" "--port=31933"
+# 09:56:32 >
+
+
+# 09:56:32 >
+# 09:56:32 > "Done."
+# 09:56:32 >
+
diff --git a/sql/backends/monet5/iot/Tests/iot04.stable.out
b/sql/backends/monet5/iot/Tests/iot04.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/iot/Tests/iot04.stable.out
@@ -0,0 +1,73 @@
+stdout of test 'iot04` in directory 'sql/backends/monet5/iot` itself:
+
+
+# 09:56:32 >
+# 09:56:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31933" "--set"
"mapi_usock=/var/tmp/mtest-28297/.s.monetdb.31933" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 09:56:32 >
+
+# 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:31933/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28297/.s.monetdb.31933
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/iot loaded
+
+Ready.
+
+# 09:56:32 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
