Changeset: 7deff4c1f339 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7deff4c1f339 Modified Files: Branch: default Log Message:
Merge with Aug2011 branch. diffs (truncated from 1051 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 @@ -1,4 +1,20 @@ +# SQL +# (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!???) +ENABLE_DATACELL?scenario00.sql +ENABLE_DATACELL?scenario01.sql +ENABLE_DATACELL?scenario02.sql +ENABLE_DATACELL?scenario03.sql +ENABLE_DATACELL?scenario04.sql +ENABLE_DATACELL?scenario05.sql +ENABLE_DATACELL?scenario06.sql +ENABLE_DATACELL?datacell00.sql +ENABLE_DATACELL?dctemper00.sql +ENABLE_DATACELL?linearroad.sql +# MAL ENABLE_DATACELL?basket00 ENABLE_DATACELL?receptor00 ENABLE_DATACELL?emitter00 ENABLE_DATACELL?pair00 +ENABLE_DATACELL?petrinet00 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 @@ -17,7 +17,7 @@ # MonetDB/GIS module loaded # MonetDB/SQL module loaded -! to be checked / approved ! += to be checked / approved ! # 10:10:33 > # 10:10:33 > Done. 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 @@ -1,6 +1,5 @@ #set up the minimal test environment for datacell -create schema datacell; create table datacell.X( id string, tag timestamp, payload int); create table datacell.Y( id string, tag timestamp, payload int, msdelay int); diff --git a/sql/backends/monet5/datacell/Tests/datacell00.stable.err b/sql/backends/monet5/datacell/Tests/datacell00.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/datacell00.stable.err @@ -0,0 +1,37 @@ +stderr of test 'datacell00` in directory '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 > + +# 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_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 = /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 monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_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 > + + +# 16:53:52 > +# 16:53:52 > Done. +# 16:53:52 > + diff --git a/sql/backends/monet5/datacell/Tests/datacell00.stable.out b/sql/backends/monet5/datacell/Tests/datacell00.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/datacell00.stable.out @@ -0,0 +1,35 @@ +stdout of test 'datacell00` in directory '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 > + +# MonetDB 5 server v11.5.0 +# This is an unreleased version +# Serving database 'mTests_backends_monet5_datacell', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 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/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/DataCell module loaded + +Ready. +# SQL catalog created, loading sql scripts once + +Over.. + +# 16:53:52 > +# 16:53:52 > mclient -lsql -ftest -i -e --host=rig --port=39463 +# 16:53:52 > + += to be checked / approved ! + +# 16:53:52 > +# 16:53:52 > Done. +# 16:53:52 > + diff --git a/sql/backends/monet5/datacell/Tests/dctemper00.sql b/sql/backends/monet5/datacell/Tests/dctemper00.sql --- a/sql/backends/monet5/datacell/Tests/dctemper00.sql +++ b/sql/backends/monet5/datacell/Tests/dctemper00.sql @@ -4,7 +4,6 @@ -- a warning is issued if the temperature in any of the -- rooms fluctuates more then a predefined thresshold within a few minutes/ -create schema datacell; set optimizer='datacell_pipe'; create table datacell.temperature( @@ -39,6 +38,7 @@ -- wrapup call datacell.postlude(); +drop procedure datacell.guardian; drop table datacell.temperature; drop table datacell.warnings; drop table datacell.templog; diff --git a/sql/backends/monet5/datacell/Tests/dctemper00.stable.err b/sql/backends/monet5/datacell/Tests/dctemper00.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/dctemper00.stable.err @@ -0,0 +1,37 @@ +stderr of test 'dctemper00` in directory '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 > + +# 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_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 = /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 monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_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 > + + +# 16:57:24 > +# 16:57:24 > Done. +# 16:57:24 > + diff --git a/sql/backends/monet5/datacell/Tests/dctemper00.stable.out b/sql/backends/monet5/datacell/Tests/dctemper00.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/dctemper00.stable.out @@ -0,0 +1,35 @@ +stdout of test 'dctemper00` in directory '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 > + +# MonetDB 5 server v11.5.0 +# This is an unreleased version +# Serving database 'mTests_backends_monet5_datacell', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 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/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/DataCell module loaded + +Ready. +# SQL catalog created, loading sql scripts once + +Over.. + +# 16:57:24 > +# 16:57:24 > mclient -lsql -ftest -i -e --host=rig --port=35323 +# 16:57:24 > + += to be checked / approved ! + +# 16:57:24 > +# 16:57:24 > Done. +# 16:57:24 > + diff --git a/sql/backends/monet5/datacell/Tests/emitter00.stable.out b/sql/backends/monet5/datacell/Tests/emitter00.stable.out --- a/sql/backends/monet5/datacell/Tests/emitter00.stable.out +++ b/sql/backends/monet5/datacell/Tests/emitter00.stable.out @@ -17,7 +17,7 @@ # MonetDB/GIS module loaded # MonetDB/SQL module loaded -! to be checked / approved ! += to be checked / approved ! # 10:10:34 > # 10:10:34 > Done. diff --git a/sql/backends/monet5/datacell/Tests/linearroad.stable.err b/sql/backends/monet5/datacell/Tests/linearroad.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/linearroad.stable.err @@ -0,0 +1,37 @@ +stderr of test 'linearroad` in directory 'backends/monet5/datacell` itself: + + +# 16:58:42 > +# 16:58:42 > 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=31723 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_datacell" --set mal_listing=0 ; echo ; echo Over.. +# 16:58:42 > + +# 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_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 = /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 = 31723 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_backends_monet5_datacell +# cmdline opt mal_listing = 0 + +# 16:58:42 > +# 16:58:42 > mclient -lsql -ftest -i -e --host=rig --port=31723 +# 16:58:42 > + + +# 16:58:42 > +# 16:58:42 > Done. +# 16:58:42 > + diff --git a/sql/backends/monet5/datacell/Tests/linearroad.stable.out b/sql/backends/monet5/datacell/Tests/linearroad.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/datacell/Tests/linearroad.stable.out @@ -0,0 +1,35 @@ +stdout of test 'linearroad` in directory 'backends/monet5/datacell` itself: + + +# 16:58:42 > +# 16:58:42 > 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=31723 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_datacell" --set mal_listing=0 ; echo ; echo Over.. +# 16:58:42 > + +# MonetDB 5 server v11.5.0 +# This is an unreleased version +# Serving database 'mTests_backends_monet5_datacell', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
