Changeset: 29a1e6a1478d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29a1e6a1478d Added Files: monetdb5/mal/Tests/tst110.malC monetdb5/mal/Tests/tst115.malC monetdb5/mal/Tests/tst120.malC monetdb5/mal/Tests/tst130.malC monetdb5/mal/Tests/tst150.malC monetdb5/mal/Tests/tst161.malC monetdb5/mal/Tests/tst163.malC monetdb5/mal/Tests/tst171.malC monetdb5/mal/Tests/tst200.malC monetdb5/mal/Tests/tst201.malC monetdb5/mal/Tests/tst202.malC monetdb5/mal/Tests/tst210.malC monetdb5/mal/Tests/tst220.malC monetdb5/mal/Tests/tst230.malC monetdb5/mal/Tests/tst231.malC monetdb5/mal/Tests/tst232.malC monetdb5/mal/Tests/tst233.malC monetdb5/mal/Tests/tst234.malC monetdb5/mal/Tests/tst235.malC monetdb5/mal/Tests/tst250.malC monetdb5/mal/Tests/tst251.malC monetdb5/mal/Tests/tst252.malC monetdb5/mal/Tests/tst255.malC monetdb5/mal/Tests/tst256.malC monetdb5/mal/Tests/tst272.malC monetdb5/mal/Tests/tst275.malC monetdb5/mal/Tests/tst280.malC monetdb5/mal/Tests/tst281.malC monetdb5/mal/Tests/tst285.malC monetdb5/mal/Tests/tst292.malC Removed Files: monetdb5/mal/Tests/tst110.mal monetdb5/mal/Tests/tst115.mal monetdb5/mal/Tests/tst116.mal monetdb5/mal/Tests/tst120.mal monetdb5/mal/Tests/tst130.mal monetdb5/mal/Tests/tst150.mal monetdb5/mal/Tests/tst161.mal monetdb5/mal/Tests/tst162.mal monetdb5/mal/Tests/tst162.stable.err monetdb5/mal/Tests/tst162.stable.out monetdb5/mal/Tests/tst163.mal monetdb5/mal/Tests/tst171.mal monetdb5/mal/Tests/tst200.mal monetdb5/mal/Tests/tst201.mal monetdb5/mal/Tests/tst202.mal monetdb5/mal/Tests/tst210.mal monetdb5/mal/Tests/tst220.mal monetdb5/mal/Tests/tst230.mal monetdb5/mal/Tests/tst231.mal monetdb5/mal/Tests/tst232.mal monetdb5/mal/Tests/tst233.mal monetdb5/mal/Tests/tst234.mal monetdb5/mal/Tests/tst235.mal monetdb5/mal/Tests/tst237.mal monetdb5/mal/Tests/tst250.mal monetdb5/mal/Tests/tst251.mal monetdb5/mal/Tests/tst252.mal monetdb5/mal/Tests/tst255.mal monetdb5/mal/Tests/tst256.mal monetdb5/mal/Tests/tst265.mal monetdb5/mal/Tests/tst265.stable.err monetdb5/mal/Tests/tst265.stable.out monetdb5/mal/Tests/tst272.mal monetdb5/mal/Tests/tst273.mal monetdb5/mal/Tests/tst274.mal monetdb5/mal/Tests/tst274.stable.err monetdb5/mal/Tests/tst274.stable.out monetdb5/mal/Tests/tst275.mal monetdb5/mal/Tests/tst280.mal monetdb5/mal/Tests/tst281.mal monetdb5/mal/Tests/tst285.mal monetdb5/mal/Tests/tst292.mal Modified Files: monetdb5/mal/Tests/All monetdb5/mal/Tests/tst110.stable.out monetdb5/mal/Tests/tst115.stable.err monetdb5/mal/Tests/tst115.stable.out monetdb5/mal/Tests/tst120.stable.err monetdb5/mal/Tests/tst120.stable.out monetdb5/mal/Tests/tst130.stable.out monetdb5/mal/Tests/tst161.stable.err monetdb5/mal/Tests/tst161.stable.out monetdb5/mal/Tests/tst171.stable.out monetdb5/mal/Tests/tst200.stable.out monetdb5/mal/Tests/tst201.stable.out monetdb5/mal/Tests/tst202.stable.out monetdb5/mal/Tests/tst210.stable.out monetdb5/mal/Tests/tst220.stable.out monetdb5/mal/Tests/tst230.stable.out monetdb5/mal/Tests/tst231.stable.out monetdb5/mal/Tests/tst232.stable.out monetdb5/mal/Tests/tst233.stable.out monetdb5/mal/Tests/tst234.stable.out monetdb5/mal/Tests/tst235.stable.out monetdb5/mal/Tests/tst250.stable.out monetdb5/mal/Tests/tst251.stable.out monetdb5/mal/Tests/tst252.stable.out monetdb5/mal/Tests/tst255.stable.out monetdb5/mal/Tests/tst256.stable.out monetdb5/mal/Tests/tst272.stable.out monetdb5/mal/Tests/tst273.stable.err monetdb5/mal/Tests/tst273.stable.out monetdb5/mal/Tests/tst275.stable.out monetdb5/mal/Tests/tst280.stable.out monetdb5/mal/Tests/tst281.stable.out monetdb5/mal/Tests/tst285.stable.out monetdb5/mal/Tests/tst292.stable.out Branch: default Log Message:
MAL test revamping diffs (truncated from 2952 to 300 lines): diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -100,7 +100,6 @@ tst1504 tst1505 tst1506 tst161 -tst162 tst163 tst1602 tst1604 @@ -130,11 +129,7 @@ tst255 tst2550 tst256 tst2570 -# tst265 -- windowsum and slidingsum have been removed -# opens /tmp/MonetEvents, i.e. not on Windows: tst272 -#tst273 -#tst274 # opens /tmp/MonetEvents, i.e. not on Windows: NOT_WIN32?tst275 tst280 diff --git a/monetdb5/mal/Tests/tst110.mal b/monetdb5/mal/Tests/tst110.malC rename from monetdb5/mal/Tests/tst110.mal rename to monetdb5/mal/Tests/tst110.malC diff --git a/monetdb5/mal/Tests/tst110.stable.out b/monetdb5/mal/Tests/tst110.stable.out --- a/monetdb5/mal/Tests/tst110.stable.out +++ b/monetdb5/mal/Tests/tst110.stable.out @@ -5,37 +5,32 @@ stdout of test 'tst110` in directory 'mo # 07:58:59 > 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 tst110.mal </dev/null # 07:58:59 > -# 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. -## Simply skip the barred block -## analyse the basic interpreter loop -# -# i:=0; -# v:= false; -#barrier v:=v; -# i:= 1; -# j:= 2; -#exit v; -# k:= 3; -# -function user.main():void; -# Simply skip the barred block -# analyse the basic interpreter loop - i := 0; - v := false; -barrier v := v; - i := 1; - j := 2; -exit v; - k := 3; -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:31077/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-28113/.s.monetdb.31077 +# 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 -# 07:58:59 > -# 07:58:59 > Done. -# 07:58:59 > +Ready. +# 13:35:19 > +# 13:35:19 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28113" "--port=31077" +# 13:35:19 > + + +# 13:35:19 > +# 13:35:19 > "Done." +# 13:35:19 > + diff --git a/monetdb5/mal/Tests/tst115.mal b/monetdb5/mal/Tests/tst115.malC rename from monetdb5/mal/Tests/tst115.mal rename to monetdb5/mal/Tests/tst115.malC --- a/monetdb5/mal/Tests/tst115.mal +++ b/monetdb5/mal/Tests/tst115.malC @@ -1,7 +1,6 @@ # the next step is to trace the call of a mal function call -command + (L:any_1,R:any_1):any_1 -address addIntInt; +command + (L:any_1,R:any_1):any_1 address addIntInt; function doitOnce():int; z:= 12; diff --git a/monetdb5/mal/Tests/tst115.stable.err b/monetdb5/mal/Tests/tst115.stable.err --- a/monetdb5/mal/Tests/tst115.stable.err +++ b/monetdb5/mal/Tests/tst115.stable.err @@ -1,1 +1,40 @@ stderr of test 'tst115` in directory 'monetdb5/mal` itself: + + +# 14:57:19 > +# 14:57:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37326" "--set" "mapi_usock=/var/tmp/mtest-5138/.s.monetdb.37326" "--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" +# 14:57:19 > + +# 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 = 37326 +# cmdline opt mapi_usock = /var/tmp/mtest-5138/.s.monetdb.37326 +# 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 + +# 14:57:19 > +# 14:57:19 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-5138" "--port=37326" +# 14:57:19 > + +MAPI = (monetdb) /var/tmp/mtest-5138/.s.monetdb.37326 +QUERY = d:= user.doitTwice("wrong"); +ERROR = !TypeException:user.main[1]:'user.doitTwice' undefined in: d:int := user.doitTwice("wrong":str); + +# 14:57:19 > +# 14:57:19 > "Done." +# 14:57:19 > + diff --git a/monetdb5/mal/Tests/tst115.stable.out b/monetdb5/mal/Tests/tst115.stable.out --- a/monetdb5/mal/Tests/tst115.stable.out +++ b/monetdb5/mal/Tests/tst115.stable.out @@ -9,37 +9,26 @@ stdout of test 'tst115` in directory 'mo # Serving database 'mTests_src_mal', using 4 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008- MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/ -command user.+(L:any_1,R:any_1):any_1 address addIntInt; -# -#function doitOnce():int; -# z:= 12; -# return z; -#end doitOnce; -function user.doitOnce():int; - z := 12; - return doitOnce := z; -end user.doitOnce; -function user.doitTwice(i:int):int; - j := 2; - k := 11111; - i := calc.+(j,k); - return doitTwice := i; -end user.doitTwice; -!TypeException:user.main[7]:'user.doitTwice' undefined in: d:int := user.doitTwice("wrong":str); -function user.main():void; -# the next step is to trace the call of a mal function call - a := 1; - b := user.doitOnce(); - c := 2; - d := user.doitTwice(3); - c := 3; - d := user.doitTwice("wrong"); -end user.main; +# 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:37326/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-5138/.s.monetdb.37326 +# 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 -# 07:59:00 > -# 07:59:00 > Done. -# 07:59:00 > +Ready. +# 14:57:19 > +# 14:57:19 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-5138" "--port=37326" +# 14:57:19 > + + +# 14:57:19 > +# 14:57:19 > "Done." +# 14:57:19 > + diff --git a/monetdb5/mal/Tests/tst116.mal b/monetdb5/mal/Tests/tst116.mal deleted file mode 100644 --- a/monetdb5/mal/Tests/tst116.mal +++ /dev/null @@ -1,9 +0,0 @@ -# illustrate a short cut reference to the implementation - -function doit(s:str) -address CMDcallString; - io.print("unexpected call to default"); - mal.call(s); -end doit; - -Admin.doit("print(1);"); diff --git a/monetdb5/mal/Tests/tst120.mal b/monetdb5/mal/Tests/tst120.malC rename from monetdb5/mal/Tests/tst120.mal rename to monetdb5/mal/Tests/tst120.malC diff --git a/monetdb5/mal/Tests/tst120.stable.err b/monetdb5/mal/Tests/tst120.stable.err --- a/monetdb5/mal/Tests/tst120.stable.err +++ b/monetdb5/mal/Tests/tst120.stable.err @@ -1,1 +1,52 @@ stderr of test 'tst120` in directory 'monetdb5/mal` itself: + + +# 14:57:20 > +# 14:57:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37326" "--set" "mapi_usock=/var/tmp/mtest-5138/.s.monetdb.37326" "--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" +# 14:57:20 > + +# 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 = 37326 +# cmdline opt mapi_usock = /var/tmp/mtest-5138/.s.monetdb.37326 +# 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 + +# 14:57:20 > +# 14:57:20 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-5138" "--port=37326" +# 14:57:20 > + +MAPI = (monetdb) /var/tmp/mtest-5138/.s.monetdb.37326 +QUERY = a:= bottom.second("hh"); +ERROR = !TypeException:user.main[1]:'bottom.second' undefined in: a:any := bottom.second("hh":str); +MAPI = (monetdb) /var/tmp/mtest-5138/.s.monetdb.37326 +QUERY = b:= top.first(1); +ERROR = !TypeException:user.main[1]:'top.first' undefined in: b:any := top.first(1:int); +MAPI = (monetdb) /var/tmp/mtest-5138/.s.monetdb.37326 +QUERY = c:= top.first(1:sht); +ERROR = !TypeException:user.main[1]:'top.first' undefined in: c:any := top.first(1:sht); +MAPI = (monetdb) /var/tmp/mtest-5138/.s.monetdb.37326 +QUERY = d:= bottom.first("hello world"); +ERROR = !TypeException:user.main[1]:'bottom.first' undefined in: d:any := bottom.first("hello world":str); +MAPI = (monetdb) /var/tmp/mtest-5138/.s.monetdb.37326 +QUERY = e:= top.first(2:sht); +ERROR = !TypeException:user.main[1]:'top.first' undefined in: e:any := top.first(2:sht); + +# 14:57:20 > +# 14:57:20 > "Done." +# 14:57:20 > + diff --git a/monetdb5/mal/Tests/tst120.stable.out b/monetdb5/mal/Tests/tst120.stable.out --- a/monetdb5/mal/Tests/tst120.stable.out +++ b/monetdb5/mal/Tests/tst120.stable.out @@ -11,31 +11,25 @@ stdout of test 'tst120` in directory 'mo # Found 7.751 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37254/ -# MonetDB/SQL module v2.39.0 loaded -# MonetDB/GIS module v0.19.0 loaded -!TypeException:user.main[4]:'bottom.second' undefined in: a:any := bottom.second(_5:str) +# Visit http://www.monetdb.org/ for further information _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
