Changeset: 66325b2a7b74 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66325b2a7b74 Modified Files: monetdb5/mal/Tests/tst105a.malC monetdb5/mal/Tests/tst105a.stable.err monetdb5/mal/Tests/tst105a.stable.out monetdb5/mal/Tests/tst1150.stable.out monetdb5/mal/Tests/tst120a.stable.out monetdb5/mal/Tests/tst120b.stable.out monetdb5/mal/Tests/tst1225.stable.out monetdb5/mal/Tests/tst1500.stable.out monetdb5/mal/Tests/tst1502.stable.out monetdb5/mal/Tests/tst1503.stable.out monetdb5/mal/Tests/tst1504.stable.out monetdb5/mal/Tests/tst1505.stable.out monetdb5/mal/Tests/tst1506.stable.out monetdb5/mal/Tests/tst1602.stable.out monetdb5/mal/Tests/tst1604.stable.out Branch: default Log Message:
Approve output diffs (truncated from 1115 to 300 lines): diff --git a/monetdb5/mal/Tests/tst105a.malC b/monetdb5/mal/Tests/tst105a.malC --- a/monetdb5/mal/Tests/tst105a.malC +++ b/monetdb5/mal/Tests/tst105a.malC @@ -1,7 +1,6 @@ # check classification of functions in the proper module module bbp; -command new(t:any_2):bat[:oid,:any_2] -address GDKbatnew; +command new(t:any_2):bat[:oid,:any_2] address GDKbatnew; b:= bbp.new(:int); diff --git a/monetdb5/mal/Tests/tst105a.stable.err b/monetdb5/mal/Tests/tst105a.stable.err --- a/monetdb5/mal/Tests/tst105a.stable.err +++ b/monetdb5/mal/Tests/tst105a.stable.err @@ -1,1 +1,41 @@ stderr of test 'tst105a` in directory 'monetdb5/mal` itself: + + +# 15:56:09 > +# 15:56:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34844" "--set" "mapi_usock=/var/tmp/mtest-21504/.s.monetdb.34844" "--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:56:09 > + +# 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 = 34844 +# cmdline opt mapi_usock = /var/tmp/mtest-21504/.s.monetdb.34844 +# 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:56:09 > +# 15:56:09 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21504" "--port=34844" +# 15:56:09 > + +MAPI = (monetdb) /var/tmp/mtest-21504/.s.monetdb.34844 +QUERY = b:= bbp.new(:int); +ERROR = !TypeException:user.main[1]:object code for command bbp.new missing + !TypeException:user.main[1]:'bbp.new' undefined in: b:bat[:oid,:int] := bbp.new(:int); + +# 15:56:09 > +# 15:56:09 > "Done." +# 15:56:09 > + diff --git a/monetdb5/mal/Tests/tst105a.stable.out b/monetdb5/mal/Tests/tst105a.stable.out --- a/monetdb5/mal/Tests/tst105a.stable.out +++ b/monetdb5/mal/Tests/tst105a.stable.out @@ -19,15 +19,16 @@ stdout of test 'tst105a` in directory 'm # Finished reading the write-ahead log 'sql_logs/sql/log.4' # Finished processing logs sql/sql_logs # MonetDB/SQL module loaded -command bbp.new(t:any_2):bat[:oid,:any_2] address GDKbatnew; -!TypeException:user.main[2]:object code for command bbp.new missing -!TypeException:user.main[2]:'bbp.new' undefined in: b:bat[:oid,:int] := bbp.new(:int); -function user.main():void; -# check classification of functions in the proper module - b := bbp.new(:int); -end user.main; +# MonetDB/R module loaded -# 07:58:57 > -# 07:58:57 > Done. -# 07:58:57 > +Ready. +# 15:56:09 > +# 15:56:09 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21504" "--port=34844" +# 15:56:09 > + + +# 15:56:09 > +# 15:56:09 > "Done." +# 15:56:09 > + diff --git a/monetdb5/mal/Tests/tst1150.stable.out b/monetdb5/mal/Tests/tst1150.stable.out --- a/monetdb5/mal/Tests/tst1150.stable.out +++ b/monetdb5/mal/Tests/tst1150.stable.out @@ -5,48 +5,31 @@ stdout of test 'tst1150` in directory 'm # 07:59:00 > 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 tst1150.mal </dev/null # 07:59:00 > -# 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. -## simple stream test -# fp := stream.openWrite("tst1150garbage"); -# stream.writeStr(fp,"Dit is een test\n"); -# stream.flush(fp); -# stream.close(fp); -# fp := stream.openRead("tst1150garbage"); -# s := stream.readStr(fp); -# print(s); -# stream.close(fp); -# -# fp := stream.openWrite("tst1150garbage"); -# stream.writeInt(fp,1234); -# stream.close(fp); -# fp := stream.openRead("tst1150garbage"); -# i := stream.readInt(fp); -# print(i); -# -function user.main():void; -# simple stream test - fp := streams.openWrite("tst1150garbage"); - streams.writeStr(fp,"Dit is een test\n"); - streams.flush(fp); - streams.close(fp); - fp := streams.openRead("tst1150garbage"); - s := streams.readStr(fp); - io.print(s); - streams.close(fp); - fp := streams.openWrite("tst1150garbage"); - streams.writeInt(fp,1234); - streams.close(fp); - fp := streams.openRead("tst1150garbage"); - i := streams.readInt(fp); - io.print(i); - streams.close(fp); -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:35281/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-18416/.s.monetdb.35281 +# 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:48:27 > +# 15:48:27 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-18416" "--port=35281" +# 15:48:27 > + +# io.print(s); [ "Dit is een test\n" ] [ 1234 ] diff --git a/monetdb5/mal/Tests/tst120a.stable.out b/monetdb5/mal/Tests/tst120a.stable.out --- a/monetdb5/mal/Tests/tst120a.stable.out +++ b/monetdb5/mal/Tests/tst120a.stable.out @@ -5,20 +5,32 @@ stdout of test 'tst120a` in directory 'm # 07:59:03 > 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 tst120a.mal </dev/null # 07:59:03 > -# 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. -#module top; -#function first(i:sht):sht; return first:= 0:sht; end first; -function top.first(i:sht):sht; - return first := 0:sht; -end top.first; +# 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 -# 07:59:03 > -# 07:59:03 > Done. -# 07:59:03 > +Ready. +# 15:36:13 > +# 15:36:13 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" +# 15:36:13 > + + +# 15:36:13 > +# 15:36:13 > "Done." +# 15:36:13 > + diff --git a/monetdb5/mal/Tests/tst120b.stable.out b/monetdb5/mal/Tests/tst120b.stable.out --- a/monetdb5/mal/Tests/tst120b.stable.out +++ b/monetdb5/mal/Tests/tst120b.stable.out @@ -5,24 +5,32 @@ stdout of test 'tst120b` in directory 'm # 07:59:03 > 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 tst120b.mal </dev/null # 07:59:03 > -# 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. -#module bottom; -#function first(i:str):int; c:=1; return c; end first; -function bottom.first(i:str):int; - c := 1; - return first := c; -end bottom.first; -function bottom.second(i:str):int; - return second := 1; -end bottom.second; +# 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 -# 07:59:03 > -# 07:59:03 > Done. -# 07:59:03 > +Ready. +# 15:36:13 > +# 15:36:13 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" +# 15:36:13 > + + +# 15:36:14 > +# 15:36:14 > "Done." +# 15:36:14 > + diff --git a/monetdb5/mal/Tests/tst1225.stable.out b/monetdb5/mal/Tests/tst1225.stable.out --- a/monetdb5/mal/Tests/tst1225.stable.out +++ b/monetdb5/mal/Tests/tst1225.stable.out @@ -1,9 +1,33 @@ stdout of test 'tst1225` in directory 'monetdb5/mal` itself: -# 23:39:01 > -# 23:39:01 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set "xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set mapi_port=31765 --set xrpc_port=46302 --set monet_prompt= --trace --dbname=mTests_src_mal tst1225.mal -# 23:39:01 > +# 15:48:29 > +# 15:48:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35281" "--set" "mapi_usock=/var/tmp/mtest-18416/.s.monetdb.35281" "--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:48:29 > + +# 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:35281/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-18416/.s.monetdb.35281 +# 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 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
