Changeset: 29cf3d733b14 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29cf3d733b14
Added Files:
sql/backends/monet5/datacell/Tests/dcload.stable.err
sql/backends/monet5/datacell/Tests/dcload.stable.out
Modified Files:
sql/backends/monet5/datacell/Tests/All
sql/backends/monet5/datacell/Tests/basket00.mal
sql/backends/monet5/datacell/Tests/emitter00.mal
sql/backends/monet5/datacell/Tests/receptor00.mal
sql/backends/monet5/datacell/Tests/scenario00.stable.out
sql/backends/monet5/datacell/Tests/scenario03.stable.out
sql/backends/monet5/datacell/actuator.c
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/sensor.c
Branch: default
Log Message:
Missing files
diffs (truncated from 619 to 300 lines):
diff --git a/sql/backends/monet5/datacell/Tests/All
b/sql/backends/monet5/datacell/Tests/All
--- a/sql/backends/monet5/datacell/Tests/All
+++ b/sql/backends/monet5/datacell/Tests/All
@@ -2,6 +2,9 @@
# (Must be first as otherwise creation of schema datacell via
# 50_datacell.sql is not triggered, as first SQL-clients does not connect
# on "virgin" database!???)
+#
+# beware, the scenario testing calls for manual interaction to start/stop
+# sensors and actuators. The test web merely shows basic functionality.
ENABLE_DATACELL?scenario00
ENABLE_DATACELL?scenario01
ENABLE_DATACELL?scenario02
@@ -11,6 +14,7 @@ ENABLE_DATACELL?scenario05
ENABLE_DATACELL?scenario06
ENABLE_DATACELL?datacell00
ENABLE_DATACELL?dctemper00
+ENABLE_DATACELL?dcload
ENABLE_DATACELL?linearroad
# MAL
ENABLE_DATACELL?basket00
diff --git a/sql/backends/monet5/datacell/Tests/basket00.mal
b/sql/backends/monet5/datacell/Tests/basket00.mal
--- a/sql/backends/monet5/datacell/Tests/basket00.mal
+++ b/sql/backends/monet5/datacell/Tests/basket00.mal
@@ -1,11 +1,14 @@
#Testing the basket functionality
# this assumes you have ran first datacell00.sql
-basket.register("datacell","x");
+sql.init();
+basket.register("x");
-basket.lock("datacell","x");
+basket.lock("x");
io.print("x locked");
-basket.unlock("datacell","x");
+basket.unlock("x");
+io.print("x unlocked");
-basket.drop("datacell","x");
+basket.drop("x");
+io.print("x dropped");
diff --git a/sql/backends/monet5/datacell/Tests/dcload.stable.err
b/sql/backends/monet5/datacell/Tests/dcload.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/datacell/Tests/dcload.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'dcload` in directory 'backends/monet5/datacell` itself:
+
+
+# 12:45:12 >
+# 12:45:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/export/scratch1/mk/current//Linux/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=38236" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_backends_monet5_datacell" "--set" "mal_listing=0"
+# 12:45:12 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 gdk_dbfarm = /export/scratch1/mk/current//Linux/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 38236
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_backends_monet5_datacell
+# cmdline opt mal_listing = 0
+
+# 12:45:12 >
+# 12:45:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=vienna"
"--port=38236"
+# 12:45:12 >
+
+
+# 12:45:12 >
+# 12:45:12 > "Done."
+# 12:45:12 >
+
diff --git a/sql/backends/monet5/datacell/Tests/dcload.stable.out
b/sql/backends/monet5/datacell/Tests/dcload.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/datacell/Tests/dcload.stable.out
@@ -0,0 +1,104 @@
+stdout of test 'dcload` in directory 'backends/monet5/datacell` itself:
+
+
+# 12:45:12 >
+# 12:45:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/export/scratch1/mk/current//Linux/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=38236" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_backends_monet5_datacell" "--set" "mal_listing=0"
+# 12:45:12 >
+
+# MonetDB 5 server v11.14.0
+# This is an unreleased version
+# Serving database 'mTests_backends_monet5_datacell', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:38236/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+# MonetDB/DataCell loaded
+
+Ready.
+
+# 12:45:12 >
+# 12:45:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=vienna"
"--port=38236"
+# 12:45:12 >
+
+#CREATE TABLE "datacell"."sensors" (
+# "ip" INET,
+# "emit_time" TIMESTAMP,
+# "recv_time" TIMESTAMP,
+# "location" VARCHAR(20),
+# "type" VARCHAR(50),
+# "value" DOUBLE
+#);
+#create table datacell.warm(like datacell.sensors);
+#create table datacell.hot(like datacell.sensors);
+#CREATE TABLE "datacell"."alarm_warm" (
+# "ip" INET,
+# "emit_time" TIMESTAMP,
+# "location" VARCHAR(20),
+# "temperature" DOUBLE
+#);
+#CREATE TABLE "datacell"."alarm_hot" (
+# "ip" INET,
+# "emit_time" TIMESTAMP,
+# "location" VARCHAR(20),
+# "temperature" DOUBLE
+#);
+#CREATE PROCEDURE datacell.warm()
+#BEGIN
+# INSERT INTO datacell.alarm_warm
+# SELECT ip, emit_time, location, value
+# FROM datacell.warm
+# WHERE "type" LIKE 'temperature' AND value BETWEEN 21 AND 24;
+#END;
+#CREATE PROCEDURE datacell.hot()
+#BEGIN
+# INSERT INTO datacell.alarm_hot
+# SELECT ip, emit_time, location, value
+# FROM datacell.hot
+# WHERE type LIKE 'temperature' AND value > 24;
+#END;
+#CREATE PROCEDURE datacell.splitter()
+#BEGIN
+# INSERT INTO datacell.warm SELECT * FROM datacell.sensors;
+# INSERT INTO datacell.hot SELECT * FROM datacell.sensors;
+#END;
+#SELECT * FROM datacell.receptors(); SELECT * FROM datacell.emitters(); SELECT
* FROM datacell.queries(); SELECT * FROM datacell.baskets();
+% ., ., ., ., ., ., ., ., ., . #
table_name
+% nme, host, port, protocol, mode, status, lastseen, cycles,
received, pending # name
+% clob, clob, int, clob, clob, clob, timestamp, int,
int, int # type
+% 16, 9, 5, 3, 7, 7, 26, 1, 1, 1 #
length
+[ "datacell.sensors", "localhost", 50500, "TCP", "passive",
"running", NULL, 0, 0, 0 ]
+#SELECT * FROM datacell.receptors(); SELECT * FROM datacell.emitters(); SELECT
* FROM datacell.queries(); SELECT * FROM datacell.baskets();
+% ., ., ., ., ., ., ., ., ., . #
table_name
+% nme, host, port, protocol, mode, status, lastsent, cycles,
sent, pending # name
+% clob, clob, int, clob, clob, clob, timestamp, int,
int, int # type
+% 19, 9, 5, 3, 6, 7, 26, 1, 1, 1 #
length
+[ "datacell.alarm_hot", "localhost", 50602, "UDP", "active",
"running", NULL, 0, 0, 0 ]
+[ "datacell.alarm_warm", "localhost", 50601, "UDP", "active",
"running", NULL, 0, 0, 0 ]
+#SELECT * FROM datacell.receptors(); SELECT * FROM datacell.emitters(); SELECT
* FROM datacell.queries(); SELECT * FROM datacell.baskets();
+% ., ., ., ., ., ., ., . # table_name
+% nme, status, lastrun, cycles, events, time, error, def # name
+% clob, clob, timestamp, int, int, bigint, clob, clob #
type
+% 17, 7, 26, 1, 1, 1, 0, 24 # length
+[ "datacell.warm", "running", NULL, 0, 0, 0, "",
"see procedure definition" ]
+[ "datacell.hot", "running", NULL, 0, 0, 0, "",
"see procedure definition" ]
+[ "datacell.splitter", "running", NULL, 0, 0, 0, "",
"see procedure definition" ]
+#SELECT * FROM datacell.receptors(); SELECT * FROM datacell.emitters(); SELECT
* FROM datacell.queries(); SELECT * FROM datacell.baskets();
+% ., ., ., ., ., ., ., ., . # table_name
+% nme, threshold, winsize, winstride, timeslice,
timestride, beat, seen, events # name
+% clob, int, int, int, int, int, int, timestamp,
int # type
+% 19, 1, 1, 1, 1, 1, 1, 26, 1 # length
+[ "datacell.sensors", 0, 0, 0, 0, 0, 0, NULL,
0 ]
+[ "datacell.alarm_warm", 0, 0, 0, 0, 0, 0,
NULL, 0 ]
+[ "datacell.alarm_hot", 0, 0, 0, 0, 0, 0,
NULL, 0 ]
+[ "datacell.warm", 0, 0, 0, 0, 0, 0, NULL,
0 ]
+[ "datacell.hot", 0, 0, 0, 0, 0, 0, NULL,
0 ]
+
+# 12:45:12 >
+# 12:45:12 > "Done."
+# 12:45:12 >
+
diff --git a/sql/backends/monet5/datacell/Tests/emitter00.mal
b/sql/backends/monet5/datacell/Tests/emitter00.mal
--- a/sql/backends/monet5/datacell/Tests/emitter00.mal
+++ b/sql/backends/monet5/datacell/Tests/emitter00.mal
@@ -5,20 +5,20 @@
sql.init();
-basket.register("datacell","y");
-emitter.start("datacell","y","localhost",50502,"active");
+basket.register("y");
+emitter.start("y","localhost",50502);
io.print("emitter working");
alarm.sleep(5);
-emitter.pause("datacell","y");
+emitter.pause("y");
io.print("emitter paused");
alarm.sleep(5);
-emitter.resume("datacell","y");
+emitter.resume("y");
io.print("emitter restarted");
alarm.sleep(5);
-emitter.pause("datacell","y");
+emitter.pause("y");
io.print("emitter stopped");
emitter.dump();
-emitter.drop("datacell","y");
+emitter.stop("y");
# The SQL equivalents
# call datacell.basket('datacell','y);
diff --git a/sql/backends/monet5/datacell/Tests/receptor00.mal
b/sql/backends/monet5/datacell/Tests/receptor00.mal
--- a/sql/backends/monet5/datacell/Tests/receptor00.mal
+++ b/sql/backends/monet5/datacell/Tests/receptor00.mal
@@ -5,19 +5,19 @@
sql.init();
-basket.register("datacell","x");
-receptor.start("datacell","x","localhost",50501,"passive");
+basket.register("x");
+receptor.start("x","localhost",50501);
io.print("receptor working");
alarm.sleep(5);
-receptor.pause("datacell","x");
+receptor.pause("x");
io.print("receptor paused");
alarm.sleep(5);
-receptor.resume("datacell","x");
+receptor.resume("x");
io.print("receptor restarted");
alarm.sleep(5);
-receptor.pause("datacell","x");
+receptor.pause("x");
io.print("receptor stopped");
-receptor.drop("datacell","x");
+receptor.stop("x");
# The SQL equivalents
# call datacell.basket('datacell','x);
diff --git a/sql/backends/monet5/datacell/Tests/scenario00.stable.out
b/sql/backends/monet5/datacell/Tests/scenario00.stable.out
--- a/sql/backends/monet5/datacell/Tests/scenario00.stable.out
+++ b/sql/backends/monet5/datacell/Tests/scenario00.stable.out
@@ -20,15 +20,78 @@ stdout of test 'scenario00` in directory
Ready.
# SQL catalog created, loading sql scripts once
+# loading sql script: 00_catalog.sql
+# 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_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.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: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 50_datacell.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+# 12:44:16 >
+# 12:44:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=vienna"
"--port=30375"
+# 12:44:16 >
-# 16:43:47 >
-# 16:43:47 > mclient -lsql -ftest -i -e --host=rig --port=38529
-# 16:43:47 >
+#set optimizer='datacell_pipe';
+#create table datacell.bsktin(
+# id integer,
+# tag integer,
+# payload integer
+#);
+#create table datacell.bsktout (like datacell.bsktin);
+#select * from datacell.receptors(); select * from datacell.emitters(); select
* from datacell.queries(); select * from datacell.baskets();
+% ., ., ., ., ., ., ., ., ., . #
table_name
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
