Changeset: cbeaa3fe098d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbeaa3fe098d Added Files: monetdb5/mal/Tests/tst060.malC monetdb5/mal/Tests/tst061.malC monetdb5/mal/Tests/tst070.malC monetdb5/mal/Tests/tst071.malC monetdb5/mal/Tests/tst072.malC monetdb5/mal/Tests/tst074.malC monetdb5/mal/Tests/tst075.malC monetdb5/mal/Tests/tst077.malC Removed Files: monetdb5/mal/Tests/tst060.mal monetdb5/mal/Tests/tst061.mal monetdb5/mal/Tests/tst070.mal monetdb5/mal/Tests/tst071.mal monetdb5/mal/Tests/tst072.mal monetdb5/mal/Tests/tst074.mal monetdb5/mal/Tests/tst075.mal monetdb5/mal/Tests/tst077.mal Modified Files: monetdb5/mal/Tests/tst060.stable.out monetdb5/mal/Tests/tst061.stable.out monetdb5/mal/Tests/tst070.stable.err monetdb5/mal/Tests/tst070.stable.out monetdb5/mal/Tests/tst071.stable.err monetdb5/mal/Tests/tst071.stable.out monetdb5/mal/Tests/tst072.stable.out monetdb5/mal/Tests/tst074.stable.out monetdb5/mal/Tests/tst075.stable.out monetdb5/mal/Tests/tst077.stable.out Branch: default Log Message:
MAL test revamp diffs (truncated from 575 to 300 lines): diff --git a/monetdb5/mal/Tests/tst060.mal b/monetdb5/mal/Tests/tst060.malC rename from monetdb5/mal/Tests/tst060.mal rename to monetdb5/mal/Tests/tst060.malC diff --git a/monetdb5/mal/Tests/tst060.stable.out b/monetdb5/mal/Tests/tst060.stable.out --- a/monetdb5/mal/Tests/tst060.stable.out +++ b/monetdb5/mal/Tests/tst060.stable.out @@ -5,37 +5,29 @@ stdout of test 'tst060` in directory 'mo # 07:58:48 > 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 tst060.mal </dev/null # 07:58:48 > -# 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. -## garbage collection strins -# -# s0:= "hello"; -# s0:= "world"; -# b1:= s0 == "world"; -# s1:= s0; -#barrier b1; -# s2:= s1; -# s1:= "bye"; -#exit b1; -# print(s1); -# -function user.main():void; -# garbage collection strins - s0 := "hello"; - s0 := "world"; - b1 := calc.==(s0,"world"); - s1 := s0; -barrier b1; - s2 := s1; - s1 := "bye"; -exit b1; - io.print(s1); -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:34822/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23427/.s.monetdb.34822 +# 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. + +# 13:02:33 > +# 13:02:33 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23427" "--port=34822" +# 13:02:33 > + +# io.print(s1); [ "bye" ] # 07:58:48 > diff --git a/monetdb5/mal/Tests/tst061.mal b/monetdb5/mal/Tests/tst061.malC rename from monetdb5/mal/Tests/tst061.mal rename to monetdb5/mal/Tests/tst061.malC diff --git a/monetdb5/mal/Tests/tst061.stable.out b/monetdb5/mal/Tests/tst061.stable.out --- a/monetdb5/mal/Tests/tst061.stable.out +++ b/monetdb5/mal/Tests/tst061.stable.out @@ -5,44 +5,31 @@ stdout of test 'tst061` in directory 'mo # 07:58:48 > 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 tst061.mal </dev/null # 07:58:48 > -# 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. -## type coercion and creation -# -#o := oid("999@0"); -#os := str(o); -#i := sht(1); -#l := lng(2); -#f := flt(3.4); -#j := sht("1"); -# -#d0 := dbl(1.0); -#d1 := dbl(2.0); -#z:= <(d0,2.0:dbl); -#print(z); -#z:= <(d1,2.0:dbl); -#print(z); -# -function user.main():void; -# type coercion and creation - o := calc.oid("999@0"); - os := calc.str(o); - i := calc.sht(1); - l := calc.lng(2); - f := calc.flt(3.4); - j := calc.sht("1"); - d0 := calc.dbl(1); - d1 := calc.dbl(2); - z := calc.<(d0,2:dbl); - io.print(z); - z := calc.<(d1,2:dbl); - io.print(z); -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:34822/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23427/.s.monetdb.34822 +# 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 + +Ready. + +# 13:02:33 > +# 13:02:33 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23427" "--port=34822" +# 13:02:33 > + +#io.print(z); [ true ] [ false ] diff --git a/monetdb5/mal/Tests/tst070.mal b/monetdb5/mal/Tests/tst070.malC rename from monetdb5/mal/Tests/tst070.mal rename to monetdb5/mal/Tests/tst070.malC diff --git a/monetdb5/mal/Tests/tst070.stable.err b/monetdb5/mal/Tests/tst070.stable.err --- a/monetdb5/mal/Tests/tst070.stable.err +++ b/monetdb5/mal/Tests/tst070.stable.err @@ -1,1 +1,40 @@ stderr of test 'tst070` in directory 'monetdb5/mal` itself: + + +# 13:02:33 > +# 13:02:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34822" "--set" "mapi_usock=/var/tmp/mtest-23427/.s.monetdb.34822" "--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:02:33 > + +# 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 = 34822 +# cmdline opt mapi_usock = /var/tmp/mtest-23427/.s.monetdb.34822 +# 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:02:34 > +# 13:02:34 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23427" "--port=34822" +# 13:02:34 > + +MAPI = (monetdb) /var/tmp/mtest-23427/.s.monetdb.34822 +QUERY = end foo; +ERROR = !TypeException:user.foo[1]:'user.point' undefined in: (x:any,y:any) := user.point(1:int); + +# 13:02:34 > +# 13:02:34 > "Done." +# 13:02:34 > + diff --git a/monetdb5/mal/Tests/tst070.stable.out b/monetdb5/mal/Tests/tst070.stable.out --- a/monetdb5/mal/Tests/tst070.stable.out +++ b/monetdb5/mal/Tests/tst070.stable.out @@ -17,16 +17,16 @@ stdout of test 'tst070` in directory 'mo # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12850/.s.monetdb.31390 # MonetDB/GIS module loaded # MonetDB/SQL module loaded -!TypeException:user.foo[1]:'user.point' undefined in: (x:any,y:any) := user.point(1:int); -function user.foo():void; - (x,y) := user.point(1); - (initial:str,surname:str) := user.getName(); -end user.foo; -function user.main():void; -# parsing operations with multi-assignments -end user.main; +# MonetDB/R module loaded -# 07:58:49 > -# 07:58:49 > Done. -# 07:58:49 > +Ready. +# 13:02:34 > +# 13:02:34 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23427" "--port=34822" +# 13:02:34 > + + +# 13:02:34 > +# 13:02:34 > "Done." +# 13:02:34 > + diff --git a/monetdb5/mal/Tests/tst071.mal b/monetdb5/mal/Tests/tst071.malC rename from monetdb5/mal/Tests/tst071.mal rename to monetdb5/mal/Tests/tst071.malC diff --git a/monetdb5/mal/Tests/tst071.stable.err b/monetdb5/mal/Tests/tst071.stable.err --- a/monetdb5/mal/Tests/tst071.stable.err +++ b/monetdb5/mal/Tests/tst071.stable.err @@ -1,1 +1,43 @@ stderr of test 'tst071` in directory 'monetdb5/mal` itself: + + +# 13:02:34 > +# 13:02:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34822" "--set" "mapi_usock=/var/tmp/mtest-23427/.s.monetdb.34822" "--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:02:34 > + +# 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 = 34822 +# cmdline opt mapi_usock = /var/tmp/mtest-23427/.s.monetdb.34822 +# 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:02:34 > +# 13:02:34 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23427" "--port=34822" +# 13:02:34 > + +MAPI = (monetdb) /var/tmp/mtest-23427/.s.monetdb.34822 +QUERY = a:= user.swap(3,4); +ERROR = !TypeException:user.main[1]:'user.swap' undefined in: a:any := user.swap(3:int,4:int); +MAPI = (monetdb) /var/tmp/mtest-23427/.s.monetdb.34822 +QUERY = io.print(a); +ERROR = !TypeException:user.main[1]:'a' may not be used before being initialized + +# 13:02:34 > +# 13:02:34 > "Done." +# 13:02:34 > + diff --git a/monetdb5/mal/Tests/tst071.stable.out b/monetdb5/mal/Tests/tst071.stable.out --- a/monetdb5/mal/Tests/tst071.stable.out +++ b/monetdb5/mal/Tests/tst071.stable.out @@ -5,35 +5,36 @@ stdout of test 'tst071` in directory 'mo # 07:58:49 > 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 tst071.mal </dev/null # 07:58:49 > -# 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. -## parsing operations with multi-assignments -#function swap(x:int,y:int)(a:int,b:int); -# a:=y; b:=x; -# return(a,b); -# -#end swap; -function user.swap(x:int,y:int) (a:int,b:int); - a := y; - b := x; - return (a,b) := (a,b); -end user.swap; -!TypeException:user.main[5]:'user.swap' undefined in: a:any := user.swap(3:int,4:int); -function user.main():void; -# parsing operations with multi-assignments - (x,y) := user.swap(1,2); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
