Changeset: 4a37b51cd098 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a37b51cd098 Added Files: monetdb5/mal/Tests/tst1000.malC monetdb5/mal/Tests/tst1002.malC monetdb5/mal/Tests/tst1004.malC monetdb5/mal/Tests/tst1012.malC monetdb5/mal/Tests/tst1020.malC monetdb5/mal/Tests/tst1022.malC monetdb5/mal/Tests/tst105a.malC monetdb5/mal/Tests/tst1150.malC monetdb5/mal/Tests/tst1200.malC monetdb5/mal/Tests/tst1201.malC monetdb5/mal/Tests/tst1202.malC monetdb5/mal/Tests/tst1203.malC monetdb5/mal/Tests/tst1204.malC monetdb5/mal/Tests/tst1205.malC monetdb5/mal/Tests/tst1206.malC monetdb5/mal/Tests/tst120a.malC monetdb5/mal/Tests/tst120b.malC monetdb5/mal/Tests/tst1225.malC monetdb5/mal/Tests/tst1500.malC monetdb5/mal/Tests/tst1502.malC monetdb5/mal/Tests/tst1503.malC monetdb5/mal/Tests/tst1504.malC monetdb5/mal/Tests/tst1505.malC monetdb5/mal/Tests/tst1506.malC monetdb5/mal/Tests/tst1602.malC monetdb5/mal/Tests/tst1604.malC Removed Files: monetdb5/mal/Tests/tst1000.mal monetdb5/mal/Tests/tst1002.mal monetdb5/mal/Tests/tst1004.mal monetdb5/mal/Tests/tst1012.mal monetdb5/mal/Tests/tst1012.stable.err monetdb5/mal/Tests/tst1020.mal monetdb5/mal/Tests/tst1021.mal monetdb5/mal/Tests/tst1022.mal monetdb5/mal/Tests/tst105a.mal monetdb5/mal/Tests/tst1150.mal monetdb5/mal/Tests/tst1200.mal monetdb5/mal/Tests/tst1201.mal monetdb5/mal/Tests/tst1202.mal monetdb5/mal/Tests/tst1203.mal monetdb5/mal/Tests/tst1204.mal monetdb5/mal/Tests/tst1205.mal monetdb5/mal/Tests/tst1206.mal monetdb5/mal/Tests/tst120a.mal monetdb5/mal/Tests/tst120b.mal monetdb5/mal/Tests/tst1225.mal monetdb5/mal/Tests/tst1500.mal monetdb5/mal/Tests/tst1502.mal monetdb5/mal/Tests/tst1503.mal monetdb5/mal/Tests/tst1504.mal monetdb5/mal/Tests/tst1505.mal monetdb5/mal/Tests/tst1506.mal monetdb5/mal/Tests/tst1602.mal monetdb5/mal/Tests/tst1604.mal Modified Files: monetdb5/mal/Tests/tst1000.stable.out monetdb5/mal/Tests/tst1002.stable.err monetdb5/mal/Tests/tst1002.stable.out monetdb5/mal/Tests/tst1004.stable.out monetdb5/mal/Tests/tst1012.stable.out monetdb5/mal/Tests/tst1200.stable.out monetdb5/mal/Tests/tst1201.stable.out monetdb5/mal/Tests/tst1202.stable.out monetdb5/mal/Tests/tst1203.stable.out monetdb5/mal/Tests/tst1204.stable.out monetdb5/mal/Tests/tst1205.stable.out Branch: default Log Message:
approve new output diffs (truncated from 2985 to 300 lines): diff --git a/monetdb5/mal/Tests/tst1000.mal b/monetdb5/mal/Tests/tst1000.malC rename from monetdb5/mal/Tests/tst1000.mal rename to monetdb5/mal/Tests/tst1000.malC diff --git a/monetdb5/mal/Tests/tst1000.stable.out b/monetdb5/mal/Tests/tst1000.stable.out --- a/monetdb5/mal/Tests/tst1000.stable.out +++ b/monetdb5/mal/Tests/tst1000.stable.out @@ -5,31 +5,29 @@ stdout of test 'tst1000` in directory 'm # 07:58:52 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst1000.mal </dev/null # 07:58:52 > -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -##Access BATs -# -#b:= new(:int,:int); -#insert(b,1,2); -#bat.setName(b,"mybat"); -#c:= bbp.bind("mybat"); -#print(c); -#x:= bbp.getNames(); -#print(x); -# -function user.main():void; -#Access BATs - b := bat.new(:oid,:int); - bat.append(b,2); - bat.setName(b,"mybat"); - c:bat[:oid,:int] := bbp.bind("mybat"); - io.print(c); -end user.main; +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_mal', 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-2015 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:33827/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-16148/.s.monetdb.33827 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 15:35:45 > +# 15:35:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" +# 15:35:45 > + +#io.print(c); #--------------------------# # h t # name # void int # type diff --git a/monetdb5/mal/Tests/tst1002.mal b/monetdb5/mal/Tests/tst1002.malC rename from monetdb5/mal/Tests/tst1002.mal rename to monetdb5/mal/Tests/tst1002.malC diff --git a/monetdb5/mal/Tests/tst1002.stable.err b/monetdb5/mal/Tests/tst1002.stable.err --- a/monetdb5/mal/Tests/tst1002.stable.err +++ b/monetdb5/mal/Tests/tst1002.stable.err @@ -1,1 +1,40 @@ stderr of test 'tst1002` in directory 'monetdb5/mal` itself: + + +# 15:35:45 > +# 15:35:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33827" "--set" "mapi_usock=/var/tmp/mtest-16148/.s.monetdb.33827" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 15:35:45 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/default//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 = 33827 +# cmdline opt mapi_usock = /var/tmp/mtest-16148/.s.monetdb.33827 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal +# cmdline opt mal_listing = 2 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 15:35:45 > +# 15:35:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" +# 15:35:45 > + +MAPI = (monetdb) /var/tmp/mtest-16148/.s.monetdb.33827 +QUERY = c:bat[:oid,:int]:= bbp.bind("myfirstbat"); +ERROR = !MALException:bbp.bind:Object not found + +# 15:35:45 > +# 15:35:45 > "Done." +# 15:35:45 > + diff --git a/monetdb5/mal/Tests/tst1002.stable.out b/monetdb5/mal/Tests/tst1002.stable.out --- a/monetdb5/mal/Tests/tst1002.stable.out +++ b/monetdb5/mal/Tests/tst1002.stable.out @@ -6,37 +6,16 @@ stdout of test 'tst1002` in directory 'm # 07:58:52 > +Ready. -# MonetDB Server v4.99.19 -# Copyright (c) 1993-2006 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# config:/ufs/fabian/scratch/monetdb/five/program-x86_64/etc/MonetDB5.conf -# dbfarm:/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-five-monetdb-pegasus.ins.cwi.nl/monetdb/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -## the first of a series of BBP test cases -## the temporary bat produced in tst1000 should not exist anymore -# -#bbp.open(); -#c:= bbp.take("myfirstbat"); -#print(c); -#bbp.close(); -#catch MALException; -# print(MALException); -#exit MALException; -# -function user.main():void; -# the first of a series of BBP test cases -# the temporary bat produced in tst1000 should not exist anymore - c:bat[:oid,:int] := bbp.bind("myfirstbat"); - io.print(c); -catch MALException:str; - io.printf("%s\n",MALException); -exit MALException:str; -end user.main; -MALException:bbp.bind:Object not found +# 15:35:45 > +# 15:35:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" +# 15:35:45 > -# 07:58:52 > -# 07:58:52 > Done. -# 07:58:52 > +#io.print(c); +[ nil ] +# 15:35:45 > +# 15:35:45 > "Done." +# 15:35:45 > + diff --git a/monetdb5/mal/Tests/tst1004.mal b/monetdb5/mal/Tests/tst1004.malC rename from monetdb5/mal/Tests/tst1004.mal rename to monetdb5/mal/Tests/tst1004.malC diff --git a/monetdb5/mal/Tests/tst1004.stable.out b/monetdb5/mal/Tests/tst1004.stable.out --- a/monetdb5/mal/Tests/tst1004.stable.out +++ b/monetdb5/mal/Tests/tst1004.stable.out @@ -5,56 +5,31 @@ stdout of test 'tst1004` in directory 'm # 07:58:53 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst1004.mal </dev/null # 07:58:53 > -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -## the first of a series of BBP test cases -# -#print("Start test"); -#bbp.open(); -#b:= new(:int,:int); -#insert(b,1,2); -#bbp.deposit("myfirstbat",b); -#c:= bbp.take("myfirstbat"); -#catch MALException; -# print(MALException); -#exit MALException; -#print("FIRST ROUND"); -#print(c); -#bbp.close(); -## at the end of the session, the BBP should have discarded -## the temporary bats of the user -#bbp.open(); -#print("SECOND ROUND"); -#y:=bbp.getObjects(); -#print(y); -#v:= bbp.take("myfirstbat"); -#catch MALException; -# print(MALException); -#exit MALException; -#print("got myfirstbat?"); -#print(v); -#x:= bbp.getNames(); -#print(x); -#bbp.close(); -# -function user.main():void; -# the first of a series of BBP test cases - io.print("Start test"); - b := bat.new(:oid,:int); - bat.setName(b,"myfirstbat"); - bat.append(b,2); - c:bat[:oid,:int] := bbp.bind("myfirstbat"); -catch MALException:str; - io.print(MALException); -exit MALException:str; - io.print("FIRST ROUND"); - io.print(c); -end user.main; +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_mal', 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-2015 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:33827/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-16148/.s.monetdb.33827 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.4' +# Finished reading the write-ahead log 'sql_logs/sql/log.4' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 15:35:46 > +# 15:35:46 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" +# 15:35:46 > + +#io.print("Start test"); [ "Start test" ] [ "FIRST ROUND" ] #--------------------------# diff --git a/monetdb5/mal/Tests/tst1012.mal b/monetdb5/mal/Tests/tst1012.malC rename from monetdb5/mal/Tests/tst1012.mal rename to monetdb5/mal/Tests/tst1012.malC diff --git a/monetdb5/mal/Tests/tst1012.stable.err b/monetdb5/mal/Tests/tst1012.stable.err deleted file mode 100644 --- a/monetdb5/mal/Tests/tst1012.stable.err +++ /dev/null @@ -1,1 +0,0 @@ -stderr of test 'tst1012` in directory 'monetdb5/mal` itself: diff --git a/monetdb5/mal/Tests/tst1012.stable.out b/monetdb5/mal/Tests/tst1012.stable.out --- a/monetdb5/mal/Tests/tst1012.stable.out +++ b/monetdb5/mal/Tests/tst1012.stable.out @@ -5,56 +5,31 @@ stdout of test 'tst1012` in directory 'm # 07:58:54 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst1012.mal </dev/null # 07:58:54 > -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -## the first of a series of BBP test cases -# -#bbp.open(); -#b:= new(:int,:int); -#insert(b,1,2); -#bbp.deposit("mysecondbat",b); -#c:= bbp.take("mysecondbat"); -#print(c); -#bat.setPersistent(b); -#x:= bat.isPersistent(b); -#z:= bat.isTransient(b); -#print(x); print(z); print(""); -#bat.setTransient(b); -#x:= bat.isPersistent(b); -#z:= bat.isTransient(b); -#print(x); print(z); print(""); -#bbp.close(); -## at the end of the session, the BBP should have discarded -## the temporary bats of the user -## aug 02 this does not work, because the transaction is -## not properly closed. This means that a temporary bat -##remains in store. -#bbp.open(); -#v:= bbp.take("mysecondbat"); -#print(v); -#bbp.close(); -# -function user.main():void; - b := bat.new_persistent(:oid,:int); - bat.append(b,2); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
