Changeset: db5456d5e2e7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db5456d5e2e7
Added Files:
sql/backends/monet5/iot/Tests/iot16.sql
sql/backends/monet5/iot/Tests/iot16.stable.err
sql/backends/monet5/iot/Tests/iot16.stable.out
Modified Files:
sql/backends/monet5/iot/Tests/bug02.sql
sql/backends/monet5/iot/basket.c
Branch: iot
Log Message:
Minor improvements
diffs (138 lines):
diff --git a/sql/backends/monet5/iot/Tests/bug02.sql
b/sql/backends/monet5/iot/Tests/bug02.sql
--- a/sql/backends/monet5/iot/Tests/bug02.sql
+++ b/sql/backends/monet5/iot/Tests/bug02.sql
@@ -1,1 +1,3 @@
+set schema iot;
+set optimizer='iot_pipe';
call iot.show('sys','test');
diff --git a/sql/backends/monet5/iot/Tests/iot16.sql
b/sql/backends/monet5/iot/Tests/iot16.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/iot/Tests/iot16.sql
@@ -0,0 +1,14 @@
+-- introduce a heartbeat and windo directly on a stream
+set schema iot;
+set optimizer='iot_pipe';
+
+create stream table winheart(cnt integer,clk1 integer);
+
+call iot.window('iot','winheart',2);
+call iot.heartbeat('iot','winheart',75);
+
+select * from iot.baskets();
+select * from iot.queries();
+
+drop table winheart;
+
diff --git a/sql/backends/monet5/iot/Tests/iot16.stable.err
b/sql/backends/monet5/iot/Tests/iot16.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/iot/Tests/iot16.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'iot16` in directory 'sql/backends/monet5/iot` itself:
+
+
+# 23:23:10 >
+# 23:23:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38906" "--set"
"mapi_usock=/var/tmp/mtest-19543/.s.monetdb.38906" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 23:23:10 >
+
+# 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 = 38906
+# cmdline opt mapi_usock = /var/tmp/mtest-19543/.s.monetdb.38906
+# 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
+
+# 23:23:11 >
+# 23:23:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19543" "--port=38906"
+# 23:23:11 >
+
+
+# 23:23:11 >
+# 23:23:11 > "Done."
+# 23:23:11 >
+
diff --git a/sql/backends/monet5/iot/Tests/iot16.stable.out
b/sql/backends/monet5/iot/Tests/iot16.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/iot/Tests/iot16.stable.out
@@ -0,0 +1,47 @@
+stdout of test 'iot16` in directory 'sql/backends/monet5/iot` itself:
+
+
+# 23:23:10 >
+# 23:23:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38906" "--set"
"mapi_usock=/var/tmp/mtest-19543/.s.monetdb.38906" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/iot//Linux/var/MonetDB/mTests_sql_backends_monet5_iot"
+# 23:23:10 >
+
+# 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:38906/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-19543/.s.monetdb.38906
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/iot loaded
+
+Ready.
+
+# 23:23:11 >
+# 23:23:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19543" "--port=38906"
+# 23:23:11 >
+
+#set schema iot;
+#set optimizer='iot_pipe';
+#create stream table winheart(cnt integer,clk1 integer);
+#select * from iot.baskets();
+% ., ., ., ., ., ., ., ., ., .,
. # table_name
+% schema, table, status, threshold, winsize, winstride,
timeslice, timestride, heartbeat, seen, events # name
+% clob, clob, clob, int, int, int, int, int, int,
timestamp, int # type
+% 3, 8, 7, 1, 1, 1, 1, 1, 2, 26,
1 # length
+[ "iot", "winheart", "waiting", 0, 2, 2, 0,
0, 75, 2016-07-12 21:23:11.000000, 0 ]
+#select * from iot.queries();
+% ., ., ., ., ., ., ., . # table_name
+% schema, function, status, lastrun, cycles, events, time,
error # name
+% clob, clob, clob, timestamp, int, int, bigint, clob #
type
+% 0, 0, 0, 26, 1, 1, 1, 0 # length
+#drop table winheart;
+
+# 23:23:11 >
+# 23:23:11 > "Done."
+# 23:23:11 >
+
diff --git a/sql/backends/monet5/iot/basket.c b/sql/backends/monet5/iot/basket.c
--- a/sql/backends/monet5/iot/basket.c
+++ b/sql/backends/monet5/iot/basket.c
@@ -291,7 +291,7 @@ BSKTwindow(Client cntxt, MalBlkPtr mb, M
BSKTregisterInternal(cntxt, mb, sch, tbl);
idx = BSKTlocate(sch, tbl);
if( idx ==0)
- throw(SQL,"basket.window","Stream table %s.%s not
accessible to deactivate\n",sch,tbl);
+ throw(SQL,"basket.window","Stream table %s.%s not
accessible\n",sch,tbl);
}
baskets[idx].winsize = elm;
baskets[idx].winstride = elm;
@@ -310,7 +310,7 @@ BSKTgetwindow(Client cntxt, MalBlkPtr mb
(void) mb;
idx = BSKTlocate(sch, tbl);
if( idx == 0)
- throw(SQL,"basket.window","Stream table %s.%s not accessible to
deactivate\n",sch,tbl);
+ throw(SQL,"basket.window","Stream table %s.%s not
accessible\n",sch,tbl);
*ret = baskets[idx].winsize;
return MAL_SUCCEED;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
