Changeset: abd5ee94a0ba for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abd5ee94a0ba Added Files: monetdb5/mal/Tests/tst080.malC monetdb5/mal/Tests/tst100.malC monetdb5/mal/Tests/tst101.malC monetdb5/mal/Tests/tst102.malC monetdb5/mal/Tests/tst103.malC monetdb5/mal/Tests/tst104.malC monetdb5/mal/Tests/tst105.malC monetdb5/mal/Tests/tst106.malC monetdb5/mal/Tests/tst107.malC monetdb5/mal/Tests/tst108.malC monetdb5/mal/Tests/tst109.malC Removed Files: monetdb5/mal/Tests/tst080.mal monetdb5/mal/Tests/tst100.mal monetdb5/mal/Tests/tst101.mal monetdb5/mal/Tests/tst102.mal monetdb5/mal/Tests/tst103.mal monetdb5/mal/Tests/tst104.mal monetdb5/mal/Tests/tst105.mal monetdb5/mal/Tests/tst106.mal monetdb5/mal/Tests/tst107.mal monetdb5/mal/Tests/tst108.mal monetdb5/mal/Tests/tst109.mal Modified Files: monetdb5/mal/Tests/tst080.stable.err monetdb5/mal/Tests/tst080.stable.out monetdb5/mal/Tests/tst100.stable.out monetdb5/mal/Tests/tst101.stable.out monetdb5/mal/Tests/tst102.stable.err monetdb5/mal/Tests/tst102.stable.out monetdb5/mal/Tests/tst103.stable.out monetdb5/mal/Tests/tst104.stable.err monetdb5/mal/Tests/tst104.stable.out monetdb5/mal/Tests/tst105.stable.err monetdb5/mal/Tests/tst105.stable.out monetdb5/mal/Tests/tst106.stable.err monetdb5/mal/Tests/tst106.stable.out monetdb5/mal/Tests/tst107.stable.out monetdb5/mal/Tests/tst108.stable.err monetdb5/mal/Tests/tst108.stable.out monetdb5/mal/Tests/tst109.stable.err monetdb5/mal/Tests/tst109.stable.out Branch: default Log Message:
MAL revamp tests diffs (truncated from 984 to 300 lines): diff --git a/monetdb5/mal/Tests/tst080.mal b/monetdb5/mal/Tests/tst080.malC rename from monetdb5/mal/Tests/tst080.mal rename to monetdb5/mal/Tests/tst080.malC diff --git a/monetdb5/mal/Tests/tst080.stable.err b/monetdb5/mal/Tests/tst080.stable.err --- a/monetdb5/mal/Tests/tst080.stable.err +++ b/monetdb5/mal/Tests/tst080.stable.err @@ -6,7 +6,23 @@ stderr of test 'tst080` in directory 'mo # 10:04:59 > -# 10:04:59 > -# 10:04:59 > Done. -# 10:04:59 > +# 13:15:57 > +# 13:15:57 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25262" "--port=33842" +# 13:15:57 > +MAPI = (monetdb) /var/tmp/mtest-25262/.s.monetdb.33842 +QUERY = io.print(dummy); #error +ERROR = !TypeException:user.main[1]:'dummy' may not be used before being initialized +MAPI = (monetdb) /var/tmp/mtest-25262/.s.monetdb.33842 +QUERY = exit two; +ERROR = !TypeException:user.main[2]:'i' may not be used before being initialized + !TypeException:user.main[9]:'j' may not be used before being initialized + !TypeException:user.main[12]:'j' may not be used before being initialized +MAPI = (monetdb) /var/tmp/mtest-25262/.s.monetdb.33842 +QUERY = c:= z; #error +ERROR = !TypeException:user.main[1]:'z' may not be used before being initialized + +# 13:15:57 > +# 13:15:57 > "Done." +# 13:15:57 > + diff --git a/monetdb5/mal/Tests/tst080.stable.out b/monetdb5/mal/Tests/tst080.stable.out --- a/monetdb5/mal/Tests/tst080.stable.out +++ b/monetdb5/mal/Tests/tst080.stable.out @@ -5,58 +5,30 @@ stdout of test 'tst080` in directory 'mo # 10:04:59 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.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/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=40800 --set sql_port=57169 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst080.mal </dev/null # 10:04:59 > -# Monet Database Server V4.7.0 -# Copyright (c) 1993-2005, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/src/mal/Tests/All.conf -# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -##variable lifespan fits a block -##some illegal variable declarations -# print(dummy); #error -#barrier allways:=true; -# i:= 1; -#exit allways; -#barrier two:=true; -# z:= i; # error -#barrier three:=true; -# z:=2; #ok -# j:=3; -#exit three; -# a:= j; #error -#barrier three:=true; -# z:=j; #error -#exit three; -#exit two; -# c:= z; #error -# -# -!ERROR: 'dummy' may not be used before being set in main[1] -!ERROR: 'i' may not be used before being set in main[6] -!ERROR: 'j' may not be used before being set in main[11] -!ERROR: 'j' may not be used before being set in main[13] -!ERROR: 'z' may not be used before being set in main[16] -function user.main():int; # 0 (main:int) - io.print(dummy); # 1 IOprint_val ($1:int)<-(dummy:any) -barrier allways := true; # 2 (allways:bit)<-($4:bit) jump 4 - i := 1; # 3 (i:int)<-($6:int) -exit allways; # 4 (allways:bit) -barrier two := true; # 5 (two:bit)<-($4:bit) jump 15 - z := i; # 6 (z:int)<-(i:int) -barrier three := true; # 7 (three:bit)<-($4:bit) jump 10 - z := 2; # 8 (z:int)<-($10:int) - j := 3; # 9 (j:int)<-($12:int) -exit three; # 10 (three:bit) - a := j; # 11 (a:int)<-(j:int) -barrier three := true; # 12 (three:bit)<-($4:bit) jump 14 - z := j; # 13 (z:int)<-(j:int) -exit three; # 14 (three:bit) -exit two; # 15 (two:bit) - c := z; # 16 (c:int)<-(z:int) -end main; # 17 +# 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:33842/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25262/.s.monetdb.33842 +# 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 -# 10:04:59 > -# 10:04:59 > Done. -# 10:04:59 > +Ready. +# 13:15:57 > +# 13:15:57 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25262" "--port=33842" +# 13:15:57 > + + +# 13:15:57 > +# 13:15:57 > "Done." +# 13:15:57 > + diff --git a/monetdb5/mal/Tests/tst100.mal b/monetdb5/mal/Tests/tst100.malC rename from monetdb5/mal/Tests/tst100.mal rename to monetdb5/mal/Tests/tst100.malC diff --git a/monetdb5/mal/Tests/tst100.stable.out b/monetdb5/mal/Tests/tst100.stable.out --- a/monetdb5/mal/Tests/tst100.stable.out +++ b/monetdb5/mal/Tests/tst100.stable.out @@ -5,31 +5,30 @@ stdout of test 'tst100` in directory 'mo # 07:58:51 > 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 tst100.mal </dev/null # 07:58:51 > -# 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. -## complex first test, can we gain access to the calculator function -#a:=3+1; -#c:= 7+8; -#b:=3.5+2.7; -#s:= "hello world"; -#d:= +(3,1); -# -# -function user.main():void; -# complex first test, can we gain access to the calculator function - a := calc.+(3,1); - c := calc.+(7,8); - b := calc.+(3.5,2.7); - s := "hello world"; - d := calc.+(3,1); -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:33511/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25752/.s.monetdb.33511 +# 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 -# 07:58:51 > -# 07:58:51 > Done. -# 07:58:51 > +Ready. +# 13:17:59 > +# 13:17:59 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25752" "--port=33511" +# 13:17:59 > + + +# 13:17:59 > +# 13:17:59 > "Done." +# 13:17:59 > + diff --git a/monetdb5/mal/Tests/tst101.mal b/monetdb5/mal/Tests/tst101.malC rename from monetdb5/mal/Tests/tst101.mal rename to monetdb5/mal/Tests/tst101.malC diff --git a/monetdb5/mal/Tests/tst101.stable.out b/monetdb5/mal/Tests/tst101.stable.out --- a/monetdb5/mal/Tests/tst101.stable.out +++ b/monetdb5/mal/Tests/tst101.stable.out @@ -5,29 +5,32 @@ stdout of test 'tst101` in directory 'mo # 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 tst101.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. -##define the generic addition operator -## this should be sufficient to determine outcome -# -#function + (L:any_1, R:any_1):int ; return s:=1; end +; -function user.+(L:any_1,R:any_1):int; - return s := 1; -end user.+; -function user.main():void; -#define the generic addition operator -# this should be sufficient to determine outcome - a := calc.+(3,1); - b := calc.+(3.5,2.7); - c := calc.+(7,8); -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:33511/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25752/.s.monetdb.33511 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.3' +# Finished reading the write-ahead log 'sql_logs/sql/log.3' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded -# 07:58:54 > -# 07:58:54 > Done. -# 07:58:54 > +Ready. +# 13:17:59 > +# 13:17:59 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25752" "--port=33511" +# 13:17:59 > + + +# 13:17:59 > +# 13:17:59 > "Done." +# 13:17:59 > + diff --git a/monetdb5/mal/Tests/tst102.mal b/monetdb5/mal/Tests/tst102.malC rename from monetdb5/mal/Tests/tst102.mal rename to monetdb5/mal/Tests/tst102.malC --- a/monetdb5/mal/Tests/tst102.mal +++ b/monetdb5/mal/Tests/tst102.malC @@ -1,7 +1,5 @@ # the calls are wrong, they violate the type constraint -command + (L:any_1, R:any_1):any_1 -address addIntInt -comment "unknown function"; +command + (L:any_1, R:any_1):any_1 address addIntInt comment "unknown function"; a:=1+"hello"; b:=3.5+1; diff --git a/monetdb5/mal/Tests/tst102.stable.err b/monetdb5/mal/Tests/tst102.stable.err --- a/monetdb5/mal/Tests/tst102.stable.err +++ b/monetdb5/mal/Tests/tst102.stable.err @@ -1,1 +1,40 @@ stderr of test 'tst102` in directory 'monetdb5/mal` itself: + + +# 13:25:17 > +# 13:25:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30954" "--set" "mapi_usock=/var/tmp/mtest-26037/.s.monetdb.30954" "--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" +# 13:25:17 > + +# 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 = 30954 +# cmdline opt mapi_usock = /var/tmp/mtest-26037/.s.monetdb.30954 +# 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 + +# 13:25:17 > +# 13:25:17 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-26037" "--port=30954" +# 13:25:17 > + +MAPI = (monetdb) /var/tmp/mtest-26037/.s.monetdb.30954 +QUERY = a:=1+"hello"; +ERROR = !TypeException:user.main[1]:'calc.+' undefined in: a:any := calc.+(1:int,"hello":str); + _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
