Changeset: 9375b0bf8da3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9375b0bf8da3
Modified Files:
monetdb5/mal/Tests/tst008.stable.err
monetdb5/mal/Tests/tst010.stable.err
monetdb5/mal/Tests/tst035.stable.out
monetdb5/mal/Tests/tst150.stable.err
monetdb5/mal/Tests/tst150.stable.out
monetdb5/mal/Tests/tst163.stable.err
monetdb5/mal/Tests/tst163.stable.out
monetdb5/mal/Tests/tst200.stable.err
monetdb5/mal/Tests/tst200.stable.out
monetdb5/mal/Tests/tst272.stable.err
monetdb5/mal/Tests/tst272.stable.out
monetdb5/mal/Tests/tst275.stable.err
monetdb5/mal/Tests/tst275.stable.out
Branch: default
Log Message:
Approved output
diffs (truncated from 950 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst008.stable.err
b/monetdb5/mal/Tests/tst008.stable.err
--- a/monetdb5/mal/Tests/tst008.stable.err
+++ b/monetdb5/mal/Tests/tst008.stable.err
@@ -30,12 +30,13 @@ stderr of test 'tst008` in directory 'mo
# 10:46:01 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7848" "--port=36068"
# 10:46:01 >
-MAPI = (monetdb) /var/tmp/mtest-7848/.s.monetdb.36068
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = io.printi;
-
+ERROR = !SyntaxException:parseError:io.printi;
!SyntaxException:parseError: ^'(' expected
-MAPI = (monetdb) /var/tmp/mtest-7848/.s.monetdb.36068
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = end foo;
+ERROR = !TypeException:user.foo[1]:'i' may not be used before being initialized
# 10:46:01 >
diff --git a/monetdb5/mal/Tests/tst010.stable.err
b/monetdb5/mal/Tests/tst010.stable.err
--- a/monetdb5/mal/Tests/tst010.stable.err
+++ b/monetdb5/mal/Tests/tst010.stable.err
@@ -30,37 +30,37 @@ stderr of test 'tst010` in directory 'mo
# 10:57:16 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8357" "--port=35088"
# 10:57:16 >
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = exit L;
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[3]:label 'Z' not in guarded block
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = redo L; # outside block
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[1]:label 'L' not in guarded block
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = leave X; # outside block
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[1]:label 'X' not in guarded block
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = redo A; # outside block
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[1]:label 'A' not in guarded block
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = exit X;
-
+ERROR = !SyntaxException:user.main[2]:label 'L' not in guarded block
!SyntaxException:user.main[5]:label 'L' not in guarded block
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = exit B; # out of order
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[8]:exit-label 'B' doesnot match 'A'
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = exit F; # unknown
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[1]:exit-label 'F' without begin-label
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = exit A;
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[1]:exit-label 'A' without begin-label
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = end;
-
-MAPI = (monetdb) /var/tmp/mtest-8357/.s.monetdb.35088
+ERROR = !SyntaxException:user.main[3]:barrier 'unfinished' without exit in
main[4]
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
QUERY = end foo;
-
+ERROR = !SyntaxException:parseError:end foo;
!SyntaxException:parseError: ^non matching end label
# 10:57:17 >
diff --git a/monetdb5/mal/Tests/tst035.stable.out
b/monetdb5/mal/Tests/tst035.stable.out
--- a/monetdb5/mal/Tests/tst035.stable.out
+++ b/monetdb5/mal/Tests/tst035.stable.out
@@ -5,44 +5,31 @@ stdout of test 'tst035` in directory 'mo
# 07:58:42 > 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
tst035.mal </dev/null
# 07:58:42 >
-# 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 MAL interpreter should initiate garbage collection correctly
-## early version was too early
-#z:= "hello world"; print(z);
-#z:=z; print(z);
-#print("done");
-#
-#b:=new(:int,:int);
-#i:= getLRefCount(b); print(i);
-#b:=b;
-#i:= getLRefCount(b); print(i);
-#b:=b;
-#i:= getLRefCount(b); print(i);
-#
-function user.main():void;
-#The MAL interpreter should initiate garbage collection correctly
-# early version was too early
- z := "hello world";
- io.print(z);
- z := z;
- io.print(z);
- io.print("done");
- b := bat.new(:oid,:int);
- i := bbp.getLRefCount(b);
- io.print(i);
- b := b;
- i := bbp.getLRefCount(b);
- io.print(i);
- b := b;
- i := bbp.getLRefCount(b);
- io.print(i);
-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:39876/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9433/.s.monetdb.39876
+# 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:19:31 >
+# 15:19:31 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9433" "--port=39876"
+# 15:19:31 >
+
+#z:= "hello world"; io.print(z);
[ "hello world" ]
[ "hello world" ]
[ "done" ]
diff --git a/monetdb5/mal/Tests/tst150.stable.err
b/monetdb5/mal/Tests/tst150.stable.err
--- a/monetdb5/mal/Tests/tst150.stable.err
+++ b/monetdb5/mal/Tests/tst150.stable.err
@@ -1,1 +1,46 @@
stderr of test 'tst150` in directory 'monetdb5/mal` itself:
+
+
+# 15:19:53 >
+# 15:19:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39876" "--set"
"mapi_usock=/var/tmp/mtest-9433/.s.monetdb.39876" "--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:19:53 >
+
+# 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 = 39876
+# cmdline opt mapi_usock = /var/tmp/mtest-9433/.s.monetdb.39876
+# 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:19:53 >
+# 15:19:53 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9433" "--port=39876"
+# 15:19:53 >
+
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
+QUERY = end sample;
+ERROR = !TypeException:user.sample[1]:object code for command user.lookup
missing
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
+QUERY = user.sample("hello","world");
+ERROR = !TypeException:user.main[1]:'user.sample' undefined in: X_0:any :=
user.sample("hello":str,"world":str);
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
+QUERY = user.sample("hello",1);
+ERROR = !TypeException:user.main[1]:'user.sample' undefined in:
user.sample("hello":str,1:int);
+
+# 15:19:53 >
+# 15:19:53 > "Done."
+# 15:19:53 >
+
diff --git a/monetdb5/mal/Tests/tst150.stable.out
b/monetdb5/mal/Tests/tst150.stable.out
--- a/monetdb5/mal/Tests/tst150.stable.out
+++ b/monetdb5/mal/Tests/tst150.stable.out
@@ -19,24 +19,16 @@ stdout of test 'tst150` in directory 'mo
# Finished reading the write-ahead log 'sql_logs/sql/log.4'
# Finished processing logs sql/sql_logs
# MonetDB/SQL module loaded
-command user.lookup(nme:str):bat[:oid,:str] address CMDlookup;
-!TypeException:user.sample[1]:object code for command user.lookup missing
-function user.sample(nme:str,val:any_1):bit;
- b := user.lookup(nme);
-#find a bat
- h := algebra.select(b,val,val);
- t := aggr.count(h);
- x := io.print(t);
- y := io.print(val);
- return sample := true;
-end user.sample;
-!TypeException:user.main[1]:'user.sample' undefined in:
user.sample("hello":str,"world":str);
-function user.main():void;
- user.sample("hello","world");
- user.sample("hello",1);
-end user.main;
+# MonetDB/R module loaded
-# 07:59:05 >
-# 07:59:05 > Done.
-# 07:59:05 >
+Ready.
+# 15:19:53 >
+# 15:19:53 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9433" "--port=39876"
+# 15:19:53 >
+
+
+# 15:19:53 >
+# 15:19:53 > "Done."
+# 15:19:53 >
+
diff --git a/monetdb5/mal/Tests/tst163.stable.err
b/monetdb5/mal/Tests/tst163.stable.err
--- a/monetdb5/mal/Tests/tst163.stable.err
+++ b/monetdb5/mal/Tests/tst163.stable.err
@@ -8,7 +8,21 @@ stderr of test 'tst163` in directory 'mo
#warning: please don't forget to set your vault key!
#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-# 20:46:32 >
-# 20:46:32 > Done.
-# 20:46:32 >
+# 15:19:56 >
+# 15:19:56 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9433" "--port=39876"
+# 15:19:56 >
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
+QUERY = atom myint:int;
+ERROR = !TypeException:atomDefinition:Redefinition of atom 'myint'
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
+QUERY = j:= i+3;
+ERROR = !TypeException:user.main[1]:'calc.+' undefined in: j:any :=
calc.+(i:myint,3:int);
+MAPI = (monetdb) /var/tmp/mtest-9433/.s.monetdb.39876
+QUERY = io.print(j);
+ERROR = !TypeException:user.main[1]:'j' may not be used before being
initialized
+
+# 15:19:56 >
+# 15:19:56 > "Done."
+# 15:19:56 >
+
diff --git a/monetdb5/mal/Tests/tst163.stable.out
b/monetdb5/mal/Tests/tst163.stable.out
--- a/monetdb5/mal/Tests/tst163.stable.out
+++ b/monetdb5/mal/Tests/tst163.stable.out
@@ -5,25 +5,34 @@ stdout of test 'tst163` in directory 'mo
# 20:46:32 > 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//dbfarm" --set
"sql_logdir=/ufs/mk/monet5//dblogs/logs/sql" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=39710 --set xrpc_port=45580 --set monet_prompt= --trace
--dbname=mTests_src_mal tst163.mal
# 20:46:32 >
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-##multiple atomary types
-#atom myint:int;
-#atom myint:int;
-!TypeException:atomDefinition:Redefinition of atom 'myint'
-!TypeException:user.main[3]:'calc.+' undefined in: j:any :=
calc.+(i:myint,3:int);
-function user.main():void;
-#multiple atomary types
- i := "1":myint;
- j := calc.+(i,3);
- io.print(i);
- io.print(j);
-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.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
