Changeset: 4b9ab1a18d0f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b9ab1a18d0f Added Files: monetdb5/mal/Tests/tst2500.malC monetdb5/mal/Tests/tst2501.malC monetdb5/mal/Tests/tst2502.malC monetdb5/mal/Tests/tst2503.malC monetdb5/mal/Tests/tst2504.malC monetdb5/mal/Tests/tst2505.malC monetdb5/mal/Tests/tst2506.malC monetdb5/mal/Tests/tst2510.malC monetdb5/mal/Tests/tst2550.malC monetdb5/mal/Tests/tst2570.malC monetdb5/mal/Tests/tst3000.malC monetdb5/mal/Tests/tst3010.malC monetdb5/mal/Tests/tst3030.malC monetdb5/mal/Tests/tst3050.malC monetdb5/mal/Tests/tst3060.malC monetdb5/mal/Tests/tst4003.malC monetdb5/mal/Tests/tst400a.malC monetdb5/mal/Tests/tst400d.malC monetdb5/mal/Tests/tst400e.malC monetdb5/mal/Tests/tst4701.malC monetdb5/mal/Tests/tst901a.malC monetdb5/mal/Tests/tst901b.malC Removed Files: monetdb5/mal/Tests/tst2500.mal monetdb5/mal/Tests/tst2501.mal monetdb5/mal/Tests/tst2502.mal monetdb5/mal/Tests/tst2503.mal monetdb5/mal/Tests/tst2504.mal monetdb5/mal/Tests/tst2505.mal monetdb5/mal/Tests/tst2506.mal monetdb5/mal/Tests/tst2510.mal monetdb5/mal/Tests/tst2550.mal monetdb5/mal/Tests/tst2570.mal monetdb5/mal/Tests/tst3000.mal monetdb5/mal/Tests/tst3010.mal monetdb5/mal/Tests/tst3030.mal monetdb5/mal/Tests/tst3050.mal monetdb5/mal/Tests/tst3060.mal monetdb5/mal/Tests/tst4003.mal monetdb5/mal/Tests/tst400a.mal monetdb5/mal/Tests/tst400d.mal monetdb5/mal/Tests/tst400e.mal monetdb5/mal/Tests/tst4300.mal monetdb5/mal/Tests/tst4701.mal monetdb5/mal/Tests/tst901a.mal monetdb5/mal/Tests/tst901b.mal Modified Files: monetdb5/mal/Tests/All monetdb5/mal/Tests/tst1602.stable.err monetdb5/mal/Tests/tst1602.stable.out monetdb5/mal/Tests/tst2500.stable.out monetdb5/mal/Tests/tst2501.stable.out monetdb5/mal/Tests/tst2502.stable.out monetdb5/mal/Tests/tst2503.stable.out monetdb5/mal/Tests/tst2504.stable.out monetdb5/mal/Tests/tst2505.stable.out monetdb5/mal/Tests/tst2510.stable.out monetdb5/mal/Tests/tst2550.stable.out monetdb5/mal/Tests/tst2570.stable.out monetdb5/mal/Tests/tst400a.stable.out monetdb5/mal/Tests/tst400d.stable.out monetdb5/mal/Tests/tst901a.stable.out monetdb5/mal/Tests/tst901b.stable.out Branch: default Log Message:
MAL test revamping diffs (truncated from 1271 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 @@ -101,7 +101,6 @@ tst1505 tst1506 tst161 tst163 -tst1602 tst1604 tst171 tst200 diff --git a/monetdb5/mal/Tests/tst1602.stable.err b/monetdb5/mal/Tests/tst1602.stable.err --- a/monetdb5/mal/Tests/tst1602.stable.err +++ b/monetdb5/mal/Tests/tst1602.stable.err @@ -1,1 +1,37 @@ stderr of test 'tst1602` in directory 'monetdb5/mal` itself: + + +# 16:12:05 > +# 16:12:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36897" "--set" "mapi_usock=/var/tmp/mtest-23788/.s.monetdb.36897" "--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" +# 16:12:05 > + +# 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 = 36897 +# cmdline opt mapi_usock = /var/tmp/mtest-23788/.s.monetdb.36897 +# 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 + +# 16:12:06 > +# 16:12:06 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23788" "--port=36897" +# 16:12:06 > + + +# 16:12:18 > +# 16:12:18 > "Done." +# 16:12:18 > + diff --git a/monetdb5/mal/Tests/tst1602.stable.out b/monetdb5/mal/Tests/tst1602.stable.out --- a/monetdb5/mal/Tests/tst1602.stable.out +++ b/monetdb5/mal/Tests/tst1602.stable.out @@ -1,9 +1,9 @@ stdout of test 'tst1602` in directory 'monetdb5/mal` itself: -# 07:59:09 > -# 07:59:09 > 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 tst1602.mal </dev/null -# 07:59:09 > +# 16:12:05 > +# 16:12:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36897" "--set" "mapi_usock=/var/tmp/mtest-23788/.s.monetdb.36897" "--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" +# 16:12:05 > # MonetDB 5 server v11.22.0 # This is an unreleased version @@ -13,8 +13,8 @@ stdout of test 'tst1602` in directory 'm # 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:33827/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-16148/.s.monetdb.33827 +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:36897/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23788/.s.monetdb.36897 # MonetDB/GIS module loaded # Start processing logs sql/sql_logs version 52200 # Start reading the write-ahead log 'sql_logs/sql/log.4' @@ -25,30 +25,30 @@ stdout of test 'tst1602` in directory 'm Ready. -# 15:36:17 > -# 15:36:17 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" -# 15:36:17 > +# 16:12:06 > +# 16:12:06 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23788" "--port=36897" +# 16:12:06 > # xg_a := io.printf("#count %d = ",wg_a); #count 1000000 = # ah_a := io.printf("%d ms\n",yg_a); -135 ms +133 ms # xg_a := io.printf("#count %d = ",wg_a); #count 1000000 = # ah_a := io.printf("%d ms\n",yg_a); -137 ms -# xg_a := io.printf("#count %d = ",wg_a); -#count 1000000 = -# ah_a := io.printf("%d ms\n",yg_a); -139 ms +135 ms # xg_a := io.printf("#count %d = ",wg_a); #count 1000000 = # ah_a := io.printf("%d ms\n",yg_a); 138 ms +# xg_a := io.printf("#count %d = ",wg_a); +#count 1000000 = +# ah_a := io.printf("%d ms\n",yg_a); +135 ms # xxx := io.printf("#count %d = ",wg_b); #count 1000000 = # ah_b := io.printf("%d ms\n",zzz); -132 ms +131 ms # xxx := io.printf("#count %d = ",wg_b); #count 1000000 = # ah_b := io.printf("%d ms\n",zzz); @@ -56,13 +56,13 @@ 138 ms # xxx := io.printf("#count %d = ",wg_b); #count 1000000 = # ah_b := io.printf("%d ms\n",zzz); -137 ms +136 ms # xxx := io.printf("#count %d = ",wg_b); #count 1000000 = # ah_b := io.printf("%d ms\n",zzz); -137 ms +136 ms -# 15:36:30 > -# 15:36:30 > "Done." -# 15:36:30 > +# 16:12:18 > +# 16:12:18 > "Done." +# 16:12:18 > diff --git a/monetdb5/mal/Tests/tst2500.mal b/monetdb5/mal/Tests/tst2500.malC rename from monetdb5/mal/Tests/tst2500.mal rename to monetdb5/mal/Tests/tst2500.malC diff --git a/monetdb5/mal/Tests/tst2500.stable.out b/monetdb5/mal/Tests/tst2500.stable.out --- a/monetdb5/mal/Tests/tst2500.stable.out +++ b/monetdb5/mal/Tests/tst2500.stable.out @@ -5,43 +5,31 @@ stdout of test 'tst2500` in directory 'm # 08:01:04 > 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 tst2500.mal </dev/null # 08:01:04 > -# 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. -## The prototypical factory construct -# -#factory random(seed:int):int; -# i:= seed; -#barrier always:= true; -# i:= 125 *i; -# i:= i % 32767; -# yield i; -# redo always; -#exit always; -# return random:= 0; -#end; -factory user.random(seed:int):int; - i := seed; -barrier always := true; - i := calc.*(125,i); - i := calc.%(i,32767); - yield random := i; - redo always; -exit always; - return random := 0; -end user.random; -function user.main():void; -# The prototypical factory construct - r1 := user.random(1); - io.print(r1); - r2 := user.random(1); - io.print(r2); - factories.shutdown("user","random"); -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:36897/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23788/.s.monetdb.36897 +# 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. + +# 16:12:24 > +# 16:12:24 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23788" "--port=36897" +# 16:12:24 > + +#io.print(r1); [ 125 ] [ 15625 ] diff --git a/monetdb5/mal/Tests/tst2501.mal b/monetdb5/mal/Tests/tst2501.malC rename from monetdb5/mal/Tests/tst2501.mal rename to monetdb5/mal/Tests/tst2501.malC diff --git a/monetdb5/mal/Tests/tst2501.stable.out b/monetdb5/mal/Tests/tst2501.stable.out --- a/monetdb5/mal/Tests/tst2501.stable.out +++ b/monetdb5/mal/Tests/tst2501.stable.out @@ -5,40 +5,31 @@ stdout of test 'tst2501` in directory 'm # 08:01:04 > 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 tst2501.mal </dev/null # 08:01:04 > -# 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. -## The prototypical factory construct -# -#factory random(seed:int):int; -# i:= seed; -#barrier always:= true; -# i:= 125 *i; -# yield i:= i % 32767; -# redo always; -#exit always; -#end; -factory user.random(seed:int):int; - i := seed; -barrier always := true; - i := calc.*(125,i); - yield i := calc.%(i,32767); - redo always; -exit always; - return random := 0; -end user.random; -function user.main():void; -# The prototypical factory construct - r1 := user.random(1); - io.print(r1); - r2 := user.random(1); - io.print(r2); - factories.shutdown("user","random"); -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:36897/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23788/.s.monetdb.36897 +# 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. + +# 16:12:24 > +# 16:12:24 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23788" "--port=36897" +# 16:12:24 > + +#io.print(r1); [ 125 ] [ 15625 ] diff --git a/monetdb5/mal/Tests/tst2502.mal b/monetdb5/mal/Tests/tst2502.malC rename from monetdb5/mal/Tests/tst2502.mal rename to monetdb5/mal/Tests/tst2502.malC diff --git a/monetdb5/mal/Tests/tst2502.stable.out b/monetdb5/mal/Tests/tst2502.stable.out --- a/monetdb5/mal/Tests/tst2502.stable.out +++ b/monetdb5/mal/Tests/tst2502.stable.out @@ -5,43 +5,31 @@ stdout of test 'tst2502` in directory 'm # 08:01:05 > 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 tst2502.mal </dev/null # 08:01:05 > -# 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 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
