Changeset: 347d14bebba2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=347d14bebba2
Modified Files:
sql/backends/monet5/datacell/50_datacell.sql
sql/backends/monet5/datacell/Tests/datacell00.stable.err
sql/backends/monet5/datacell/Tests/datacell00.stable.out
sql/backends/monet5/datacell/Tests/dctemper00.stable.err
sql/backends/monet5/datacell/Tests/dctemper00.stable.out
sql/backends/monet5/datacell/Tests/scenario01.stable.out
sql/backends/monet5/datacell/Tests/scenario02.stable.out
sql/backends/monet5/datacell/Tests/scenario04.stable.out
sql/backends/monet5/datacell/Tests/scenario05.stable.out
sql/backends/monet5/datacell/Tests/scenario06.stable.err
sql/backends/monet5/datacell/Tests/scenario06.stable.out
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/datacell.h
sql/backends/monet5/datacell/datacell.mal
sql/backends/monet5/datacell/dcsocket.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/sql_scenario.c
Branch: Jan2014
Log Message:
Checkpoint commit of datacell
Fixed a number of errors in the code base related to thread handling
and made sure a number of tests now can be ran.
open issue:
- SQL compilation issues in dcload.sql
- SQL environment initialization in basket00.mal
diffs (truncated from 896 to 300 lines):
diff --git a/sql/backends/monet5/datacell/50_datacell.sql
b/sql/backends/monet5/datacell/50_datacell.sql
--- a/sql/backends/monet5/datacell/50_datacell.sql
+++ b/sql/backends/monet5/datacell/50_datacell.sql
@@ -69,18 +69,34 @@ create function datacell.threshold(bskt
returns boolean
external name datacell.threshold;
+create function datacell.window(bskt string, size tinyint, stride tinyint)
+returns boolean
+ external name datacell.window;
+
create function datacell.window(bskt string, size integer, stride integer)
returns boolean
external name datacell.window;
+create function datacell.window(bskt string, size bigint, stride bigint)
+returns boolean
+ external name datacell.window;
+
create function datacell.window(bskt string, size interval second, stride
interval second)
returns boolean
external name datacell.timewindow;
+create function datacell.beat(bskt string, t tinyint)
+returns boolean
+ external name datacell.beat;
+
create function datacell.beat(bskt string, t integer)
returns boolean
external name datacell.beat;
+create function datacell.beat(bskt string, t bigint)
+returns boolean
+ external name datacell.beat;
+
-- Inspection tables
create function datacell.baskets()
diff --git a/sql/backends/monet5/datacell/Tests/datacell00.stable.err
b/sql/backends/monet5/datacell/Tests/datacell00.stable.err
--- a/sql/backends/monet5/datacell/Tests/datacell00.stable.err
+++ b/sql/backends/monet5/datacell/Tests/datacell00.stable.err
@@ -1,15 +1,13 @@
stderr of test 'datacell00` in directory 'sql/backends/monet5/datacell` itself:
-# 16:53:52 >
-# 16:53:52 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/MonetDB"
--set mapi_open=true --set mapi_port=39463 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_datacell"
--set mal_listing=0 ; echo ; echo Over..
-# 16:53:52 >
+# 15:50:08 >
+# 15:50:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30649" "--set"
"mapi_usock=/var/tmp/mtest-26552/.s.monetdb.30649" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell"
"--set" "mal_listing=0"
+# 15:50:08 >
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/monetdb5/dbfarm
+# builtin opt gdk_dbpath =
/export/scratch1/mk/Jan2014//Linux/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
+# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
# builtin opt monet_daemon = no
# builtin opt mapi_port = 50000
@@ -18,20 +16,20 @@ stderr of test 'datacell00` in directory
# builtin opt sql_optimizer = default_pipe
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
-# cmdline opt gdk_dbfarm =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/MonetDB
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 39463
+# cmdline opt mapi_port = 30649
+# cmdline opt mapi_usock = /var/tmp/mtest-26552/.s.monetdb.30649
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_backends_monet5_datacell
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell
# cmdline opt mal_listing = 0
-# 16:53:52 >
-# 16:53:52 > mclient -lsql -ftest -i -e --host=rig --port=39463
-# 16:53:52 >
+# 15:50:09 >
+# 15:50:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26552" "--port=30649"
+# 15:50:09 >
-# 16:53:52 >
-# 16:53:52 > Done.
-# 16:53:52 >
+# 15:50:09 >
+# 15:50:09 > "Done."
+# 15:50:09 >
diff --git a/sql/backends/monet5/datacell/Tests/datacell00.stable.out
b/sql/backends/monet5/datacell/Tests/datacell00.stable.out
--- a/sql/backends/monet5/datacell/Tests/datacell00.stable.out
+++ b/sql/backends/monet5/datacell/Tests/datacell00.stable.out
@@ -1,34 +1,43 @@
stdout of test 'datacell00` in directory 'sql/backends/monet5/datacell` itself:
-# 16:53:52 >
-# 16:53:52 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/MonetDB"
--set mapi_open=true --set mapi_port=39463 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_datacell"
--set mal_listing=0 ; echo ; echo Over..
-# 16:53:52 >
+# 15:50:08 >
+# 15:50:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30649" "--set"
"mapi_usock=/var/tmp/mtest-26552/.s.monetdb.30649" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell"
"--set" "mal_listing=0"
+# 15:50:08 >
-# MonetDB 5 server v11.5.0
+# MonetDB 5 server v11.17.14
# This is an unreleased version
-# Serving database 'mTests_backends_monet5_datacell', using 4 threads
+# Serving database 'mTests_sql_backends_monet5_datacell', using 8 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.749 GiB available main-memory.
+# Found 15.591 GiB available main-memory.
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:39463/
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:30649/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26552/.s.monetdb.30649
# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-# MonetDB/DataCell module loaded
+# MonetDB/DataCell loaded
Ready.
-# SQL catalog created, loading sql scripts once
+# 15:50:09 >
+# 15:50:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26552" "--port=30649"
+# 15:50:09 >
-# 16:53:52 >
-# 16:53:52 > mclient -lsql -ftest -i -e --host=rig --port=39463
-# 16:53:52 >
+#create table datacell.X( id string, tag timestamp, payload int);
+#create table datacell.Y( id string, tag timestamp, payload int, msdelay int);
+#create procedure datacell.transport()
+#begin
+# -- insert into datacell.Y select *, cast(now() as milliseconds) -
cast(tag as milliseconds) from datacell.X;
+# insert into datacell.Y select *, 1 from datacell.X;
+#end;
+#drop procedure datacell.transport;
+#drop table datacell.X;
+#drop table datacell.Y;
-= to be checked / approved !
+# 15:50:09 >
+# 15:50:09 > "Done."
+# 15:50:09 >
-# 16:53:52 >
-# 16:53:52 > Done.
-# 16:53:52 >
-
diff --git a/sql/backends/monet5/datacell/Tests/dctemper00.stable.err
b/sql/backends/monet5/datacell/Tests/dctemper00.stable.err
--- a/sql/backends/monet5/datacell/Tests/dctemper00.stable.err
+++ b/sql/backends/monet5/datacell/Tests/dctemper00.stable.err
@@ -1,15 +1,13 @@
stderr of test 'dctemper00` in directory 'sql/backends/monet5/datacell` itself:
-# 16:57:24 >
-# 16:57:24 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/MonetDB"
--set mapi_open=true --set mapi_port=35323 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_datacell"
--set mal_listing=0 ; echo ; echo Over..
-# 16:57:24 >
+# 20:41:52 >
+# 20:41:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34596" "--set"
"mapi_usock=/var/tmp/mtest-31117/.s.monetdb.34596" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell"
"--set" "mal_listing=0"
+# 20:41:52 >
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/monetdb5/dbfarm
+# builtin opt gdk_dbpath =
/export/scratch1/mk/Jan2014//Linux/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
+# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
# builtin opt monet_daemon = no
# builtin opt mapi_port = 50000
@@ -18,20 +16,20 @@ stderr of test 'dctemper00` in directory
# builtin opt sql_optimizer = default_pipe
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
-# cmdline opt gdk_dbfarm =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/MonetDB
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35323
+# cmdline opt mapi_port = 34596
+# cmdline opt mapi_usock = /var/tmp/mtest-31117/.s.monetdb.34596
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_backends_monet5_datacell
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell
# cmdline opt mal_listing = 0
-# 16:57:24 >
-# 16:57:24 > mclient -lsql -ftest -i -e --host=rig --port=35323
-# 16:57:24 >
+# 20:41:53 >
+# 20:41:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31117" "--port=34596"
+# 20:41:53 >
-# 16:57:24 >
-# 16:57:24 > Done.
-# 16:57:24 >
+# 20:41:54 >
+# 20:41:54 > "Done."
+# 20:41:54 >
diff --git a/sql/backends/monet5/datacell/Tests/dctemper00.stable.out
b/sql/backends/monet5/datacell/Tests/dctemper00.stable.out
--- a/sql/backends/monet5/datacell/Tests/dctemper00.stable.out
+++ b/sql/backends/monet5/datacell/Tests/dctemper00.stable.out
@@ -1,34 +1,61 @@
stdout of test 'dctemper00` in directory 'sql/backends/monet5/datacell` itself:
-# 16:57:24 >
-# 16:57:24 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/MonetDB"
--set mapi_open=true --set mapi_port=35323 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_datacell"
--set mal_listing=0 ; echo ; echo Over..
-# 16:57:24 >
+# 20:41:52 >
+# 20:41:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34596" "--set"
"mapi_usock=/var/tmp/mtest-31117/.s.monetdb.34596" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell"
"--set" "mal_listing=0"
+# 20:41:52 >
-# MonetDB 5 server v11.5.0
+# MonetDB 5 server v11.17.14
# This is an unreleased version
-# Serving database 'mTests_backends_monet5_datacell', using 4 threads
+# Serving database 'mTests_sql_backends_monet5_datacell', using 8 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.749 GiB available main-memory.
+# Found 15.591 GiB available main-memory.
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:35323/
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:34596/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31117/.s.monetdb.34596
# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-# MonetDB/DataCell module loaded
+# MonetDB/DataCell loaded
Ready.
-# SQL catalog created, loading sql scripts once
+# 20:41:53 >
+# 20:41:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31117" "--port=34596"
+# 20:41:53 >
-# 16:57:24 >
-# 16:57:24 > mclient -lsql -ftest -i -e --host=rig --port=35323
-# 16:57:24 >
+#set optimizer='datacell_pipe';
+#create table datacell.temperature(
+# location string,
+# tag time with time zone,
+# tmp decimal(4,2)
+#);
+#create table datacell.warnings (msg string, ts time with time zone, loc
string);
+#create table datacell.templog( ts timestamp with time zone, cnt integer);
+#create procedure datacell.guardian()
+#begin
+# declare flg boolean;
+# set flg = datacell.window('datacell.temperature',interval '5' minute,
interval '1' minute);
+# insert into datacell.warnings
+# select 'WARNING', now(), location from datacell.temperature group by
location having avg(tmp) > 0.2;
+# insert into datacell.templog values (now(), (select count(*) from
datacell.temperature));
+#end;
+#call datacell.dump();
+#baskets[ 1] datacell.temperature columns 3 threshold 0 window=[0,0] time
window=[0,0] beat 0 milliseconds events 0
+#baskets[ 2] datacell.warnings columns 3 threshold 0 window=[0,0] time
window=[0,0] beat 0 milliseconds events 0
+#receptor datacell.temperature at localhost:50550 protocol=TCP mode=passive
status=running delay=1000
+#emitter datacell.warnings at localhost:50650 protocol=UDP mode=active
status=running delay=1000
+#scheduler status running
+#[0] datacell.guardian running delay 0 cycles 0 events 0 time 0 ms
+#<-- datacell.temperature basket[1] 0 0
+#drop procedure datacell.guardian;
+#drop table datacell.temperature;
+#drop table datacell.warnings;
+#drop table datacell.templog;
-= to be checked / approved !
+# 20:41:54 >
+# 20:41:54 > "Done."
+# 20:41:54 >
-# 16:57:24 >
-# 16:57:24 > Done.
-# 16:57:24 >
-
diff --git a/sql/backends/monet5/datacell/Tests/scenario01.stable.out
b/sql/backends/monet5/datacell/Tests/scenario01.stable.out
--- a/sql/backends/monet5/datacell/Tests/scenario01.stable.out
+++ b/sql/backends/monet5/datacell/Tests/scenario01.stable.out
@@ -21,14 +21,40 @@ stdout of test 'scenario01` in directory
Ready.
# SQL catalog created, loading sql scripts once
+# 15:50:02 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
