Changeset: b7cd6576ef00 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7cd6576ef00 Added Files: sql/backends/monet5/datacell/Tests/datacell99.sql sql/backends/monet5/datacell/Tests/datacell99.stable.err sql/backends/monet5/datacell/Tests/datacell99.stable.out sql/backends/monet5/datacell/Tests/emili.sql sql/backends/monet5/datacell/Tests/emili.txt Removed Files: sql/backends/monet5/datacell/Tests/emili/README sql/backends/monet5/datacell/Tests/emili/emili.sql sql/backends/monet5/datacell/Tests/pair00.mal sql/backends/monet5/datacell/Tests/pair00.stable.err sql/backends/monet5/datacell/Tests/pair00.stable.out sql/backends/monet5/datacell/Tests/petrinet00.mal sql/backends/monet5/datacell/Tests/petrinet00.stable.err sql/backends/monet5/datacell/Tests/petrinet00.stable.out Modified Files: sql/backends/monet5/datacell/Tests/All sql/backends/monet5/datacell/Tests/basket00.stable.err sql/backends/monet5/datacell/Tests/basket00.stable.out sql/backends/monet5/datacell/Tests/datacell00.sql sql/backends/monet5/datacell/Tests/dcload.sql sql/backends/monet5/datacell/Tests/dcload.stable.err sql/backends/monet5/datacell/Tests/emitter00.stable.err sql/backends/monet5/datacell/Tests/emitter00.stable.out sql/backends/monet5/datacell/Tests/receptor00.stable.err sql/backends/monet5/datacell/Tests/receptor00.stable.out sql/backends/monet5/datacell/datacell.c sql/backends/monet5/datacell/receptor.mal Branch: default Log Message:
Cleaning up datacell tests and code The remaining issue is to properly compile the datacell procedures. diffs (truncated from 805 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 @@ -12,13 +12,15 @@ ENABLE_DATACELL?scenario03 ENABLE_DATACELL?scenario04 ENABLE_DATACELL?scenario05 ENABLE_DATACELL?scenario06 -ENABLE_DATACELL?datacell00 ENABLE_DATACELL?dctemper00 ENABLE_DATACELL?dcload -ENABLE_DATACELL?linearroad +#ENABLE_DATACELL?linearroad # MAL +ENABLE_DATACELL?datacell00 ENABLE_DATACELL?basket00 ENABLE_DATACELL?receptor00 ENABLE_DATACELL?emitter00 -ENABLE_DATACELL?pair00 -ENABLE_DATACELL?petrinet00 +ENABLE_DATACELL?datacell99 + +ENABLE_DATACELL?emili + diff --git a/sql/backends/monet5/datacell/Tests/basket00.stable.err b/sql/backends/monet5/datacell/Tests/basket00.stable.err --- a/sql/backends/monet5/datacell/Tests/basket00.stable.err +++ b/sql/backends/monet5/datacell/Tests/basket00.stable.err @@ -1,15 +1,13 @@ stderr of test 'basket00` in directory 'sql/backends/monet5/datacell` itself: -# 10:10:33 > -# 10:10:33 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/_/var/MonetDB" --set mapi_open=true --set mapi_port=35652 --set monet_prompt= --trace --forcemito --set mal_listing=2 --dbname=mTests_backends_monet5_datacell basket00.mal -# 10:10:33 > +# 20:52:54 > +# 20:52:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32249" "--set" "mapi_usock=/var/tmp/mtest-7430/.s.monetdb.32249" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell" "basket00.mal" +# 20:52:54 > -# builtin opt gdk_dbname = demo -# builtin opt gdk_dbfarm = /net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/_/var/monetdb5/dbfarm +# builtin opt gdk_dbpath = /export/scratch1/mk/current//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,14 +16,15 @@ stderr of test 'basket00` 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/_/var/MonetDB # cmdline opt mapi_open = true -# cmdline opt mapi_port = 35652 +# cmdline opt mapi_port = 32249 +# cmdline opt mapi_usock = /var/tmp/mtest-7430/.s.monetdb.32249 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 -# cmdline opt gdk_dbname = mTests_backends_monet5_datacell +# cmdline opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell +# cmdline opt gdk_debug = 536870922 -# 10:10:33 > -# 10:10:33 > Done. -# 10:10:33 > +# 20:52:54 > +# 20:52:54 > "Done." +# 20:52:54 > diff --git a/sql/backends/monet5/datacell/Tests/basket00.stable.out b/sql/backends/monet5/datacell/Tests/basket00.stable.out --- a/sql/backends/monet5/datacell/Tests/basket00.stable.out +++ b/sql/backends/monet5/datacell/Tests/basket00.stable.out @@ -1,25 +1,41 @@ stdout of test 'basket00` in directory 'sql/backends/monet5/datacell` itself: -# 10:10:33 > -# 10:10:33 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/_/var/MonetDB" --set mapi_open=true --set mapi_port=35652 --set monet_prompt= --trace --forcemito --set mal_listing=2 --dbname=mTests_backends_monet5_datacell basket00.mal -# 10:10:33 > +# 20:52:54 > +# 20:52:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32249" "--set" "mapi_usock=/var/tmp/mtest-7430/.s.monetdb.32249" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell" "basket00.mal" +# 20:52:54 > -# MonetDB 5 server v11.5.0 +# MonetDB 5 server v11.18.0 # 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://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:35652/ +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:32249/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-7430/.s.monetdb.32249 # MonetDB/GIS module loaded +# MonetDB/JAQL module loaded # MonetDB/SQL module loaded +# MonetDB/DataCell loaded +function user.main():void; +#Testing the basket functionality +# this assumes you have ran first datacell00.sql + sql.init(); + basket.register("x"); + basket.lock("x"); + io.print("x locked"); + basket.unlock("x"); + io.print("x unlocked"); + basket.drop("x"); + io.print("x dropped"); +end main; +[ "x locked" ] +[ "x unlocked" ] +[ "x dropped" ] -= to be checked / approved ! +# 20:52:54 > +# 20:52:54 > "Done." +# 20:52:54 > -# 10:10:33 > -# 10:10:33 > Done. -# 10:10:33 > - diff --git a/sql/backends/monet5/datacell/Tests/datacell00.sql b/sql/backends/monet5/datacell/Tests/datacell00.sql --- a/sql/backends/monet5/datacell/Tests/datacell00.sql +++ b/sql/backends/monet5/datacell/Tests/datacell00.sql @@ -9,6 +9,6 @@ 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; +--drop procedure datacell.transport; +--drop table datacell.X; +--drop table datacell.Y; diff --git a/sql/backends/monet5/datacell/Tests/datacell99.sql b/sql/backends/monet5/datacell/Tests/datacell99.sql new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/datacell99.sql @@ -0,0 +1,5 @@ +#set up the minimal test environment for datacell + +drop procedure datacell.transport; +drop table datacell.X; +drop table datacell.Y; diff --git a/sql/backends/monet5/datacell/Tests/datacell99.stable.err b/sql/backends/monet5/datacell/Tests/datacell99.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/datacell99.stable.err @@ -0,0 +1,36 @@ +stderr of test 'datacell99` in directory 'sql/backends/monet5/datacell` itself: + + +# 20:48:37 > +# 20:48:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31907" "--set" "mapi_usock=/var/tmp/mtest-7013/.s.monetdb.31907" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell" "--set" "mal_listing=0" +# 20:48:37 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//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 = 31907 +# cmdline opt mapi_usock = /var/tmp/mtest-7013/.s.monetdb.31907 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell +# cmdline opt mal_listing = 0 +# cmdline opt gdk_debug = 536870922 + +# 20:48:37 > +# 20:48:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-7013" "--port=31907" +# 20:48:37 > + + +# 20:48:37 > +# 20:48:37 > "Done." +# 20:48:37 > + diff --git a/sql/backends/monet5/datacell/Tests/datacell99.stable.out b/sql/backends/monet5/datacell/Tests/datacell99.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/datacell99.stable.out @@ -0,0 +1,36 @@ +stdout of test 'datacell99` in directory 'sql/backends/monet5/datacell` itself: + + +# 20:48:37 > +# 20:48:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31907" "--set" "mapi_usock=/var/tmp/mtest-7013/.s.monetdb.31907" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell" "--set" "mal_listing=0" +# 20:48:37 > + +# MonetDB 5 server v11.18.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5_datacell', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# 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://vienna.ins.cwi.nl:31907/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-7013/.s.monetdb.31907 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded +# MonetDB/DataCell loaded + +Ready. + +# 20:48:37 > +# 20:48:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-7013" "--port=31907" +# 20:48:37 > + +#drop procedure datacell.transport; +#drop table datacell.X; +#drop table datacell.Y; + +# 20:48:37 > +# 20:48:37 > "Done." +# 20:48:37 > + diff --git a/sql/backends/monet5/datacell/Tests/dcload.sql b/sql/backends/monet5/datacell/Tests/dcload.sql --- a/sql/backends/monet5/datacell/Tests/dcload.sql +++ b/sql/backends/monet5/datacell/Tests/dcload.sql @@ -23,13 +23,13 @@ CREATE TABLE "datacell"."alarm_hot" ( "temperature" DOUBLE ); -CALL datacell.receptor('datacell.sensors', 'localhost', 50500); +--CALL datacell.receptor('datacell.sensors', 'localhost', 50500); -CALL datacell.emitter('datacell.alarm_warm', 'localhost', 50601); -CALL datacell.emitter('datacell.alarm_hot', 'localhost', 50602); +--CALL datacell.emitter('datacell.alarm_warm', 'localhost', 50601); +--CALL datacell.emitter('datacell.alarm_hot', 'localhost', 50602); -CALL datacell.basket('datacell.warm'); -CALL datacell.basket('datacell.hot'); +--CALL datacell.basket('datacell.warm'); +--CALL datacell.basket('datacell.hot'); CREATE PROCEDURE datacell.warm() BEGIN @@ -38,7 +38,8 @@ BEGIN FROM datacell.warm WHERE "type" LIKE 'temperature' AND value BETWEEN 21 AND 24; END; -CALL datacell.query('datacell.warm'); +call datacell.warm(); +--CALL datacell.query('datacell.warm'); CREATE PROCEDURE datacell.hot() BEGIN @@ -47,14 +48,16 @@ BEGIN FROM datacell.hot WHERE type LIKE 'temperature' AND value > 24; END; -CALL datacell.query('datacell.hot'); +call datacell.hot(); +--CALL datacell.query('datacell.hot'); CREATE PROCEDURE datacell.splitter() BEGIN INSERT INTO datacell.warm SELECT * FROM datacell.sensors; INSERT INTO datacell.hot SELECT * FROM datacell.sensors; END; -CALL datacell.query('datacell.splitter'); +call datacell.splitter(); +--CALL datacell.query('datacell.splitter'); CALL datacell.resume(); SELECT * FROM datacell.receptors(); SELECT * FROM datacell.emitters(); SELECT * FROM datacell.queries(); SELECT * FROM datacell.baskets(); diff --git a/sql/backends/monet5/datacell/Tests/dcload.stable.err b/sql/backends/monet5/datacell/Tests/dcload.stable.err --- a/sql/backends/monet5/datacell/Tests/dcload.stable.err +++ b/sql/backends/monet5/datacell/Tests/dcload.stable.err @@ -30,6 +30,50 @@ stderr of test 'dcload` in directory 'sq # 12:45:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=vienna" "--port=38236" # 12:45:12 > +MAPI = (monetdb) /var/tmp/mtest-32181/.s.monetdb.37111 +QUERY = CALL datacell.query('datacell.warm'); + + !TypeException:datacell.warm[18]:'algebra.leftfetchjoin' undefined in: _33:bat[:oid,:inet] := algebra.leftfetchjoin(_23:bat[:oid,:oid], _136:BAT) + !TypeException:datacell.warm[23]:'algebra.leftfetchjoin' undefined in: _45:bat[:oid,:timestamp] := algebra.leftfetchjoin(_23:bat[:oid,:oid], _136:BAT) + !TypeException:datacell.warm[27]:'algebra.leftfetchjoin' undefined in: _53:bat[:oid,:str] := algebra.leftfetchjoin(_23:bat[:oid,:oid], _136:BAT) + !TypeException:datacell.warm[28]:'algebra.leftfetchjoin' undefined in: _57:bat[:oid,:dbl] := algebra.leftfetchjoin(_23:bat[:oid,:oid], _136:BAT) + !TypeException:datacell.warm[14]:'algebra.subselect' undefined in: _23:bat[:oid,:oid] := algebra.subselect(_136:BAT, _22:str, _22:str, _24:bit, _24:bit, _15:bit) + !TypeException:datacell.warm[18]:'algebra.leftfetchjoin' undefined in: _33:bat[:oid,:inet] := algebra.leftfetchjoin(_23:bat[:oid,:oid], _136:BAT) + !TypeException:datacell.warm[23]:'algebra.leftfetchjoin' undefined in: _45:bat[:oid,:timestamp] := algebra.leftfetchjoin(_23:bat[:oid,:oid], _136:BAT) _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
