Changeset: 9d23281d86b4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d23281d86b4 Added Files: monetdb5/mal/Tests/tst041.malC monetdb5/mal/Tests/tst042.malC monetdb5/mal/Tests/tst043.malC monetdb5/mal/Tests/tst044.malC monetdb5/mal/Tests/tst045.malC monetdb5/mal/Tests/tst046.malC monetdb5/mal/Tests/tst047.malC monetdb5/mal/Tests/tst048.malC monetdb5/mal/Tests/tst049.malC Removed Files: monetdb5/mal/Tests/tst041.mal monetdb5/mal/Tests/tst042.mal monetdb5/mal/Tests/tst043.mal monetdb5/mal/Tests/tst044.mal monetdb5/mal/Tests/tst045.mal monetdb5/mal/Tests/tst046.mal monetdb5/mal/Tests/tst047.mal monetdb5/mal/Tests/tst048.mal monetdb5/mal/Tests/tst049.mal Modified Files: monetdb5/mal/Tests/tst041.stable.out monetdb5/mal/Tests/tst042.stable.out monetdb5/mal/Tests/tst043.stable.out monetdb5/mal/Tests/tst044.stable.out monetdb5/mal/Tests/tst045.stable.out monetdb5/mal/Tests/tst046.stable.out monetdb5/mal/Tests/tst047.stable.out monetdb5/mal/Tests/tst048.stable.out monetdb5/mal/Tests/tst049.stable.out Branch: default Log Message:
Revamp MAL tests diffs (truncated from 883 to 300 lines): diff --git a/monetdb5/mal/Tests/tst041.mal b/monetdb5/mal/Tests/tst041.malC rename from monetdb5/mal/Tests/tst041.mal rename to monetdb5/mal/Tests/tst041.malC diff --git a/monetdb5/mal/Tests/tst041.stable.out b/monetdb5/mal/Tests/tst041.stable.out --- a/monetdb5/mal/Tests/tst041.stable.out +++ b/monetdb5/mal/Tests/tst041.stable.out @@ -5,131 +5,31 @@ stdout of test 'tst041` in directory 'mo # 07:58:44 > 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 tst041.mal </dev/null # 07:58:44 > -# 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. -## this sequence tests nil type management -#b:=nil; print(b); -# -#a:=23; io.print(a); -#a:= calc.int(nil); io.print(a); -#a:= calc.int(nil:int); io.print(a); -#a:= calc.int(13); io.print(a); -#a:= calc.int("23"); io.print(a); -#a:= calc.int(43.0:flt); io.print(a); -#a:= calc.int(63.0:dbl); io.print(a); -#a:= nil:int; io.print(a); -# -#c:= true; io.print(c); -#c:= calc.bit(nil); io.print(c); -#c:= calc.bit(nil:bit); io.print(c); -#c:= calc.bit(false); io.print(c); -#c:= calc.bit(1); io.print(c); -#c:= calc.bit("true"); io.print(c); -#c:= calc.bit(1.0:flt); io.print(c); -#c:= calc.bit(0.0:dbl); io.print(c); -#c:= nil:bit; io.print(c); -# -#d:= 3.14:flt; io.print(d); -#d:= calc.flt(nil); io.print(d); -#d:= calc.flt(nil:flt); io.print(c); -#d:= calc.flt(5); io.print(d); -#d:= calc.flt("7.14"); io.print(d); -#d:= nil:flt; io.print(d); -# -#e:= "hello"; io.print(e); -#e:= calc.str(nil); io.print(e); -#e:= calc.str("nil"); io.print(e); -#e:= nil:str; io.print(e); -#io.print(nil:str); -# -#f:= 'Z'; io.print(f); -#f:= calc.chr(nil); io.print(f); -#f:= calc.chr("X"); io.print(f); -# -#o:= nil:blob; -#io.print(o); -#o:= calc.blob(nil:blob); -#io.print(o); -# -#w:= nil:wrd; -#io.print(w); -# -#B:= nil:bte; -#io.print(B); -# -function user.main():void; -# this sequence tests nil type management - b := nil; - io.print(b); - a := 23; - io.print(a); - a := calc.int(nil); - io.print(a); - a := calc.int(nil:int); - io.print(a); - a := calc.int(13); - io.print(a); - a := calc.int("23"); - io.print(a); - a := calc.int(43:flt); - io.print(a); - a := calc.int(63:dbl); - io.print(a); - a := nil:int; - io.print(a); - c := true; - io.print(c); - c := calc.bit(nil); - io.print(c); - c := calc.bit(nil:bit); - io.print(c); - c := calc.bit(false); - io.print(c); - c := calc.bit(1); - io.print(c); - c := calc.bit("true"); - io.print(c); - c := calc.bit(1:flt); - io.print(c); - c := calc.bit(0:dbl); - io.print(c); - c := nil:bit; - io.print(c); - d := 3.14:flt; - io.print(d); - d := calc.flt(nil); - io.print(d); - d := calc.flt(nil:flt); - io.print(c); - d := calc.flt(5); - io.print(d); - d := calc.flt("7.14"); - io.print(d); - d := nil:flt; - io.print(d); - e := "hello"; - io.print(e); - e := calc.str(nil); - io.print(e); - e := calc.str("nil"); - io.print(e); - e := nil:str; - io.print(e); - io.print(nil:str); - o := nil:blob; - io.print(o); - o := calc.blob(nil:blob); - io.print(o); - w := nil:wrd; - io.print(w); - B := nil:bte; - io.print(B); -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:34313/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-19070/.s.monetdb.34313 +# 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. + +# 12:35:43 > +# 12:35:43 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19070" "--port=34313" +# 12:35:43 > + +#b:=nil; io.print(b); [ nil ] [ 23 ] [ nil ] diff --git a/monetdb5/mal/Tests/tst042.mal b/monetdb5/mal/Tests/tst042.malC rename from monetdb5/mal/Tests/tst042.mal rename to monetdb5/mal/Tests/tst042.malC diff --git a/monetdb5/mal/Tests/tst042.stable.out b/monetdb5/mal/Tests/tst042.stable.out --- a/monetdb5/mal/Tests/tst042.stable.out +++ b/monetdb5/mal/Tests/tst042.stable.out @@ -5,60 +5,31 @@ stdout of test 'tst042` in directory 'mo # 07:58:44 > 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 tst042.mal </dev/null # 07:58:44 > -# 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. -#s := "hello"; -#i := 1; -#f := 3.14; -#c := 'a'; -#b:= true; -#bb:= new(:void,:str); -# -#st:= getType(s); printf("string %d\n",st); -#it:= getType(i); printf("int %d\n",it); -#ft:= getType(f); printf("flt %d\n",ft); -#ct:= getType(c); printf("chr %d\n",ct); -#bt:= getType(b); printf("bit %d\n",bt); -#bbt:= getType(bb); printf("bat %d\n",bbt); -# -## get them as strings -#v:= ""; -#v:= getTypeName(st); printf("string %s\n",v); -#v:= getTypeName(it); printf("int %s\n",v); -#v:= getTypeName(ft); printf("flt %s\n",v); -#v:= getTypeName(ct); printf("chr %s\n",v); -#v:= getTypeName(bt); printf("bit %s\n",v); -#v:= getTypeName(bbt); printf("bat %s\n",v); -# -# -function user.main():void; - s := "hello"; - i := 1; - f := 3.14; - b := true; - w := 1:wrd; - B := 2:bte; - bb := bat.new(:oid,:str); - st := inspect.getType(s); - io.printf("%s\n",st); - it := inspect.getType(i); - io.printf("%s\n",it); - ft := inspect.getType(f); - io.printf("%s\n",ft); - bt := inspect.getType(b); - io.printf("%s\n",bt); - wt := inspect.getType(w); - io.printf("%s\n",wt); - Bt := inspect.getType(B); - io.printf("%s\n",Bt); - tt := inspect.getType(bb); - io.printf("bat head %s\n",tt); -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:34313/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-19070/.s.monetdb.34313 +# 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. + +# 12:35:43 > +# 12:35:43 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19070" "--port=34313" +# 12:35:43 > + +#st:= inspect.getType(s); io.printf("%s\n",st); str int flt diff --git a/monetdb5/mal/Tests/tst043.mal b/monetdb5/mal/Tests/tst043.malC rename from monetdb5/mal/Tests/tst043.mal rename to monetdb5/mal/Tests/tst043.malC diff --git a/monetdb5/mal/Tests/tst043.stable.out b/monetdb5/mal/Tests/tst043.stable.out --- a/monetdb5/mal/Tests/tst043.stable.out +++ b/monetdb5/mal/Tests/tst043.stable.out @@ -1,9 +1,33 @@ stdout of test 'tst043` in directory 'monetdb5/mal` itself: -# 23:37:31 > -# 23:37:31 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=4 --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 mapi_open=true --set xrpc_open=true --set mapi_port=36797 --set xrpc_port=46057 --set monet_prompt= --trace --dbname=mTests_src_mal tst043.mal -# 23:37:31 > +# 12:35:43 > +# 12:35:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34313" "--set" "mapi_usock=/var/tmp/mtest-19070/.s.monetdb.34313" "--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" +# 12:35:43 > + +# 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:34313/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-19070/.s.monetdb.34313 +# 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. + +# 12:35:44 > +# 12:35:44 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19070" "--port=34313" +# 12:35:44 > # MonetDB server v5.7.0, based on kernel v1.25.0 # Serving database 'mTests_src_mal', using 4 threads @@ -14,37 +38,6 @@ stdout of test 'tst043` in directory 'mo ## this sequence tests nil type management _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
