Changeset: 08e5359c1ae6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08e5359c1ae6 Added Files: monetdb5/mal/Tests/tst050.malC monetdb5/mal/Tests/tst051.malC monetdb5/mal/Tests/tst052.malC monetdb5/mal/Tests/tst053.malC monetdb5/mal/Tests/tst054.malC monetdb5/mal/Tests/tst055.malC monetdb5/mal/Tests/tst056.malC monetdb5/mal/Tests/tst057.malC monetdb5/mal/Tests/tst058.malC monetdb5/mal/Tests/tst059.malC Removed Files: monetdb5/mal/Tests/tst050.mal monetdb5/mal/Tests/tst051.mal monetdb5/mal/Tests/tst052.mal monetdb5/mal/Tests/tst053.mal monetdb5/mal/Tests/tst054.mal monetdb5/mal/Tests/tst055.mal monetdb5/mal/Tests/tst056.mal monetdb5/mal/Tests/tst057.mal monetdb5/mal/Tests/tst058.mal monetdb5/mal/Tests/tst059.mal Modified Files: monetdb5/mal/Tests/tst050.stable.err monetdb5/mal/Tests/tst050.stable.out monetdb5/mal/Tests/tst051.stable.out monetdb5/mal/Tests/tst052.stable.out monetdb5/mal/Tests/tst053.stable.out monetdb5/mal/Tests/tst054.stable.err monetdb5/mal/Tests/tst054.stable.out monetdb5/mal/Tests/tst055.stable.out monetdb5/mal/Tests/tst056.stable.out monetdb5/mal/Tests/tst057.stable.out monetdb5/mal/Tests/tst058.stable.err monetdb5/mal/Tests/tst058.stable.out monetdb5/mal/Tests/tst059.stable.out Branch: default Log Message:
MAL test revamping diffs (truncated from 793 to 300 lines): diff --git a/monetdb5/mal/Tests/tst050.mal b/monetdb5/mal/Tests/tst050.malC rename from monetdb5/mal/Tests/tst050.mal rename to monetdb5/mal/Tests/tst050.malC diff --git a/monetdb5/mal/Tests/tst050.stable.err b/monetdb5/mal/Tests/tst050.stable.err --- a/monetdb5/mal/Tests/tst050.stable.err +++ b/monetdb5/mal/Tests/tst050.stable.err @@ -1,1 +1,49 @@ stderr of test 'tst050` in directory 'monetdb5/mal` itself: + + +# 12:43:25 > +# 12:43:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35231" "--set" "mapi_usock=/var/tmp/mtest-19653/.s.monetdb.35231" "--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:43:25 > + +# 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 = 35231 +# cmdline opt mapi_usock = /var/tmp/mtest-19653/.s.monetdb.35231 +# 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 + +# 12:43:25 > +# 12:43:25 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19653" "--port=35231" +# 12:43:25 > + +MAPI = (monetdb) /var/tmp/mtest-19653/.s.monetdb.35231 +QUERY = j:sht := 1:lng; +ERROR = !TypeException:user.main[1]:type mismatch sht := lng +MAPI = (monetdb) /var/tmp/mtest-19653/.s.monetdb.35231 +QUERY = k:lng := 1:sht; +ERROR = !TypeException:user.main[1]:type mismatch lng := sht +MAPI = (monetdb) /var/tmp/mtest-19653/.s.monetdb.35231 +QUERY = y:bat[:oid,:str]:= bat.new(:oid,:int); +ERROR = !TypeException:user.main[1]:'bat.new' undefined in: y:bat[:oid,:str] := bat.new(:oid,:int); +MAPI = (monetdb) /var/tmp/mtest-19653/.s.monetdb.35231 +QUERY = f:flt := "wrong"; +ERROR = !TypeException:user.main[1]:type mismatch flt := str + +# 12:43:25 > +# 12:43:25 > "Done." +# 12:43:25 > + diff --git a/monetdb5/mal/Tests/tst050.stable.out b/monetdb5/mal/Tests/tst050.stable.out --- a/monetdb5/mal/Tests/tst050.stable.out +++ b/monetdb5/mal/Tests/tst050.stable.out @@ -5,45 +5,30 @@ stdout of test 'tst050` in directory 'mo # 07:58:46 > 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 tst050.mal </dev/null # 07:58:46 > -# 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. -## Variables names may be tagged with a type upfront. -## They may be initialized with a lexical constant using -## either their stored type syntax or with a string literal -# -#s:str := "hello"; -#i:sht := 1:sht; -#b:bit := true; -#z:bat[:int,:int]:= new(:int,:int); -# -## type resolver should complain on the rest -#j:sht := 1:lng; -#k:lng := 1:sht; -#y:bat[:str,:int]:= new(:int,:int); -#f:flt := "wrong"; -# -!TypeException:user.main[9]:type mismatch sht := lng -function user.main():void; -# Variables names may be tagged with a type upfront. -# They may be initialized with a lexical constant using -# either their stored type syntax or with a string literal - s:str := "hello"; - i:sht := 1:sht; - b:bit := true; - z:bat[:oid,:int] := bat.new(:oid,:int); -# type resolver should complain on the rest - j:sht := 1:lng; - k:lng := 1:sht; - y:bat[:oid,:str] := bat.new(:oid,:int); - f:flt := "wrong"; -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:35231/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-19653/.s.monetdb.35231 +# 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 -# 19:43:03 > -# 19:43:03 > Done. -# 19:43:03 > +Ready. +# 12:43:25 > +# 12:43:25 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19653" "--port=35231" +# 12:43:25 > + + +# 12:43:25 > +# 12:43:25 > "Done." +# 12:43:25 > + diff --git a/monetdb5/mal/Tests/tst051.mal b/monetdb5/mal/Tests/tst051.malC rename from monetdb5/mal/Tests/tst051.mal rename to monetdb5/mal/Tests/tst051.malC diff --git a/monetdb5/mal/Tests/tst051.stable.out b/monetdb5/mal/Tests/tst051.stable.out --- a/monetdb5/mal/Tests/tst051.stable.out +++ b/monetdb5/mal/Tests/tst051.stable.out @@ -1,9 +1,33 @@ stdout of test 'tst051` in directory 'monetdb5/mal` itself: -# 22:29:41 > -# 22:29:41 > 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=34113 --set sql_port=49714 --set xquery_port=50869 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst051.mal < /dev/null -# 22:29:41 > +# 12:43:25 > +# 12:43:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35231" "--set" "mapi_usock=/var/tmp/mtest-19653/.s.monetdb.35231" "--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:43:25 > + +# 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:35231/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-19653/.s.monetdb.35231 +# 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:43:25 > +# 12:43:25 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19653" "--port=35231" +# 12:43:25 > # Monet Database Server V4.99.19 # Copyright (c) 1993-2005, CWI. All rights reserved. @@ -16,85 +40,6 @@ stdout of test 'tst051` in directory 'mo #s:= "hello world"; # #t:= str.string(s,0,2); io.print(t); -#t:= str.string(s,-4,2); io.print(t); -#t:= str.string(s,0,15); io.print(t); -#t:= str.string(nil:str,0,15); io.print(t); -# -#t:= str.string(s,5); io.print(t); -#t:= str.prefix(s,4); io.print(t); -#t:= str.suffix(s,4); io.print(t); -# -#i:= str.locate(s,"hello"); io.print(i); -#i:= str.locate(s,"xyz"); io.print(i); -#i:= str.locate(s,nil:str); io.print(i); -#i:= str.locate(nil:str,"hello"); io.print(i); -#i:= str.locate(nil:str,"xyz"); io.print(i); -#i:= str.locate(nil:str,nil:str); io.print(i); -# -#t:= str.repeat("abc",3); io.print(t); -#t:= str.repeat(nil:str,3); io.print(t); -# -#t:= str.insert("hello world",5,1,"brave new "); io.print(t); -#t:= str.insert("",5,1,"brave new "); io.print(t); -#t:= str.insert(nil:str,5,1,"brave new "); io.print(t); -#t:= str.insert("",5,1,"brave new "); io.print(t); -#t:= str.insert("",0,1,"brave new "); io.print(t); -#t:= str.insert("hello world",5,1,""); io.print(t); -#t:= str.insert("hello world",5,1,nil:str); io.print(t); -# -#t:= str.replace("hello world","world","brave new world"); io.print(t); -# -# -function user.main():void; -# testing string stuff - s := "hello world"; - t := str.string(s,0,2); - io.print(t); - t := str.string(s,-4,2); - io.print(t); - t := str.string(s,0,15); - io.print(t); - t := str.string(nil:str,0,15); - io.print(t); - t := str.string(s,5); - io.print(t); - t := str.prefix(s,4); - io.print(t); - t := str.suffix(s,4); - io.print(t); - i := str.locate(s,"hello"); - io.print(i); - i := str.locate(s,"xyz"); - io.print(i); - i := str.locate(s,nil:str); - io.print(i); - i := str.locate(nil:str,"hello"); - io.print(i); - i := str.locate(nil:str,"xyz"); - io.print(i); - i := str.locate(nil:str,nil:str); - io.print(i); - t := str.repeat("abc",3); - io.print(t); - t := str.repeat(nil:str,3); - io.print(t); - t := str.insert("hello world",5,1,"brave new "); - io.print(t); - t := str.insert("",5,1,"brave new "); - io.print(t); - t := str.insert(nil:str,5,1,"brave new "); - io.print(t); - t := str.insert("",5,1,"brave new "); - io.print(t); - t := str.insert("",0,1,"brave new "); - io.print(t); - t := str.insert("hello world",5,1,""); - io.print(t); - t := str.insert("hello world",5,1,nil:str); - io.print(t); - t := str.replace("hello world","world","brave new world"); - io.print(t); -end user.main; [ "he" ] [ "or" ] [ "hello world" ] diff --git a/monetdb5/mal/Tests/tst052.mal b/monetdb5/mal/Tests/tst052.malC rename from monetdb5/mal/Tests/tst052.mal rename to monetdb5/mal/Tests/tst052.malC diff --git a/monetdb5/mal/Tests/tst052.stable.out b/monetdb5/mal/Tests/tst052.stable.out --- a/monetdb5/mal/Tests/tst052.stable.out +++ b/monetdb5/mal/Tests/tst052.stable.out @@ -1,9 +1,33 @@ stdout of test 'tst052` in directory 'monetdb5/mal` itself: -# 08:54:36 > -# 08:54:36 > 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=32545 --set xrpc_port=44251 --set monet_prompt= --trace --dbname=mTests_src_mal tst052.mal -# 08:54:36 > +# 12:43:26 > +# 12:43:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35231" "--set" "mapi_usock=/var/tmp/mtest-19653/.s.monetdb.35231" "--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:43:26 > + +# 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:35231/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-19653/.s.monetdb.35231 +# 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:43:26 > +# 12:43:26 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19653" "--port=35231" +# 12:43:26 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
