Changeset: 29992a0b7990 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29992a0b7990
Added Files:
monetdb5/mal/Tests/tst802.malC
monetdb5/mal/Tests/tst804.malC
monetdb5/mal/Tests/tst810.malC
monetdb5/mal/Tests/tst819.malC
monetdb5/mal/Tests/tst820.malC
monetdb5/mal/Tests/tst830.malC
monetdb5/mal/Tests/tst840.malC
monetdb5/mal/Tests/tst850.malC
monetdb5/mal/Tests/tst866.malC
monetdb5/mal/Tests/tst870.malC
monetdb5/mal/Tests/tst880.malC
monetdb5/mal/Tests/tst890.malC
Removed Files:
monetdb5/mal/Tests/tst802.mal
monetdb5/mal/Tests/tst804.mal
monetdb5/mal/Tests/tst810.mal
monetdb5/mal/Tests/tst819.mal
monetdb5/mal/Tests/tst820.mal
monetdb5/mal/Tests/tst830.mal
monetdb5/mal/Tests/tst840.mal
monetdb5/mal/Tests/tst850.mal
monetdb5/mal/Tests/tst866.mal
monetdb5/mal/Tests/tst870.mal
monetdb5/mal/Tests/tst880.mal
monetdb5/mal/Tests/tst890.mal
monetdb5/mal/Tests/tst909.mal
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst802.stable.out
monetdb5/mal/Tests/tst804.stable.err
monetdb5/mal/Tests/tst804.stable.out
monetdb5/mal/Tests/tst810.stable.out
monetdb5/mal/Tests/tst819.stable.out
monetdb5/mal/Tests/tst820.stable.out
monetdb5/mal/Tests/tst830.stable.out
monetdb5/mal/Tests/tst840.stable.err
monetdb5/mal/Tests/tst840.stable.out
monetdb5/mal/Tests/tst850.stable.out
monetdb5/mal/Tests/tst866.stable.out
monetdb5/mal/Tests/tst870.stable.out
monetdb5/mal/Tests/tst880.stable.out
monetdb5/mal/Tests/tst890.stable.out
monetdb5/mal/Tests/tst900.stable.err
monetdb5/mal/Tests/tst900.stable.out
monetdb5/mal/Tests/tst901.stable.out
monetdb5/mal/Tests/tst902.stable.out
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst905.stable.out
monetdb5/mal/Tests/tst906.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/mal/Tests/tst911.stable.out
monetdb5/mal/Tests/tst912.stable.out
monetdb5/mal/Tests/tst913.stable.out
monetdb5/mal/Tests/tst920.stable.out
monetdb5/mal/Tests/tst960.stable.out
Branch: default
Log Message:
MAL test revamping (errors)
This sequence causes authentication errors, which should be looked into.
diffs (truncated from 1830 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
@@ -170,7 +170,6 @@ tst802
tst804
tst810
tst819
-tst820
tst830
tst840
tst850
diff --git a/monetdb5/mal/Tests/tst802.mal b/monetdb5/mal/Tests/tst802.malC
rename from monetdb5/mal/Tests/tst802.mal
rename to monetdb5/mal/Tests/tst802.malC
--- a/monetdb5/mal/Tests/tst802.mal
+++ b/monetdb5/mal/Tests/tst802.malC
@@ -3,9 +3,12 @@ function tst(b:bat[:oid,:any_2]):bat[:oi
return b;
end tst;
+function foo();
z:= bat.new(:oid,:int);
b:= nil:bat[:oid,:int];
b:= z;
#io.print(b);
c:= tst(b);
-#io.print(c);
+io.print(c);
+end;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst802.stable.out
b/monetdb5/mal/Tests/tst802.stable.out
--- a/monetdb5/mal/Tests/tst802.stable.out
+++ b/monetdb5/mal/Tests/tst802.stable.out
@@ -21,20 +21,16 @@ stdout of test 'tst802` in directory 'mo
# Finished reading the write-ahead log 'sql_logs/sql/log.4'
# Finished processing logs sql/sql_logs
# MonetDB/SQL module loaded
-function user.tst(b:bat[:oid,:any_2]):bat[:oid,:any_2];
- return tst := b;
-end user.tst;
-function user.main():void;
-#testing simple stuff around type BAT
- z := bat.new(:oid,:int);
- b := nil:bat[:oid,:int];
- b := z;
-#io.print(b);
- c := user.tst(b);
-#io.print(c);
-end user.main;
+# MonetDB/R module loaded
-# 14:58:46 >
-# 14:58:46 > Done.
-# 14:58:46 >
+Ready.
+# 10:38:21 >
+# 10:38:21 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-864" "--port=33541"
+# 10:38:21 >
+
+
+# 10:38:21 >
+# 10:38:21 > "Done."
+# 10:38:21 >
+
diff --git a/monetdb5/mal/Tests/tst804.mal b/monetdb5/mal/Tests/tst804.malC
rename from monetdb5/mal/Tests/tst804.mal
rename to monetdb5/mal/Tests/tst804.malC
--- a/monetdb5/mal/Tests/tst804.mal
+++ b/monetdb5/mal/Tests/tst804.malC
@@ -2,5 +2,8 @@
function wrong.message():void;
io.print("shouldn't come here");
end message;
-wrong.message();
-wrongTo.message();
+
+function foo();
+ wrong.message();
+ wrongTo.message();
+end foo;
diff --git a/monetdb5/mal/Tests/tst804.stable.err
b/monetdb5/mal/Tests/tst804.stable.err
--- a/monetdb5/mal/Tests/tst804.stable.err
+++ b/monetdb5/mal/Tests/tst804.stable.err
@@ -1,14 +1,50 @@
stderr of test 'tst804` in directory 'monetdb5/mal` itself:
-# 22:02:45 >
-# 22:02:45 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --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
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=35323 --set xrpc_port=49646 --set monet_prompt= --trace
--dbname=mTests_src_mal tst804.mal < /dev/null
-# 22:02:45 >
+# 15:26:52 >
+# 15:26:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34680" "--set"
"mapi_usock=/var/tmp/mtest-30489/.s.monetdb.34680" "--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"
+# 15:26:52 >
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
+# 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 = 34680
+# cmdline opt mapi_usock = /var/tmp/mtest-30489/.s.monetdb.34680
+# 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
-# 22:02:45 >
-# 22:02:45 > Done.
-# 22:02:45 >
+# 15:26:53 >
+# 15:26:53 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30489" "--port=34680"
+# 15:26:53 >
+MAPI = (monetdb) /var/tmp/mtest-30489/.s.monetdb.34680
+QUERY = function wrong.message():void;
+
+ !SyntaxException:parseError: ^<module> name not
defined
+ !SyntaxException:parseError:
+ !';' expected
+MAPI = (monetdb) /var/tmp/mtest-30489/.s.monetdb.34680
+QUERY = end message;
+
+ !SyntaxException:parseError: ^non matching end label
+MAPI = (monetdb) /var/tmp/mtest-30489/.s.monetdb.34680
+QUERY = end foo;
+
+
+# 15:26:53 >
+# 15:26:53 > "Done."
+# 15:26:53 >
+
diff --git a/monetdb5/mal/Tests/tst804.stable.out
b/monetdb5/mal/Tests/tst804.stable.out
--- a/monetdb5/mal/Tests/tst804.stable.out
+++ b/monetdb5/mal/Tests/tst804.stable.out
@@ -1,34 +1,36 @@
stdout of test 'tst804` in directory 'monetdb5/mal` itself:
-# 22:02:45 >
-# 22:02:45 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --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
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=35323 --set xrpc_port=49646 --set monet_prompt= --trace
--dbname=mTests_src_mal tst804.mal < /dev/null
-# 22:02:45 >
+# 15:26:52 >
+# 15:26:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34680" "--set"
"mapi_usock=/var/tmp/mtest-30489/.s.monetdb.34680" "--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"
+# 15:26:52 >
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-## test definiton of a function in a unknown module
-#function wrong.message():void;
-!SyntaxException:parseError:function wrong.message():void;
-!SyntaxException:parseError: ^<module> name not defined
-!SyntaxException:parseError: io.print("shouldn't come here");
-!SyntaxException:parseError:^';' expected
-!SyntaxException:parseError:end message;
-!SyntaxException:parseError: ^non matching end label
-function user.main():void;
-# test definiton of a function in a unknown module
-end user.main;
-function user.main():void;
-# test definiton of a function in a unknown module
-end user.main;
- wrong.message();
- wrongTo.message();
-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:34680/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30489/.s.monetdb.34680
+# 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
-# 22:02:45 >
-# 22:02:45 > Done.
-# 22:02:45 >
+Ready.
+# 15:26:53 >
+# 15:26:53 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30489" "--port=34680"
+# 15:26:53 >
+
+
+# 15:26:53 >
+# 15:26:53 > "Done."
+# 15:26:53 >
+
diff --git a/monetdb5/mal/Tests/tst810.mal b/monetdb5/mal/Tests/tst810.malC
rename from monetdb5/mal/Tests/tst810.mal
rename to monetdb5/mal/Tests/tst810.malC
--- a/monetdb5/mal/Tests/tst810.mal
+++ b/monetdb5/mal/Tests/tst810.malC
@@ -1,3 +1,4 @@
+function foo();
b:= bat.new(:oid,:int);
bat.append(b,1);
bat.append(b,2);
@@ -14,3 +15,5 @@ slice1 := algebra.slice(b,0@0,4@0);
io.print(slice1);
slice2 := algebra.slice(b,5@0,nil:oid);
io.print(slice2);
+end;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst810.stable.out
b/monetdb5/mal/Tests/tst810.stable.out
--- a/monetdb5/mal/Tests/tst810.stable.out
+++ b/monetdb5/mal/Tests/tst810.stable.out
@@ -17,23 +17,15 @@ stdout of test 'tst810` in directory 'mo
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-function user.main():void;
- b := bat.new(:oid,:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
- bat.append(b,4);
- bat.append(b,5);
- bat.append(b,6);
- bat.append(b,7);
- bat.append(b,8);
- bat.append(b,9);
- io.print(b);
- slice1 := algebra.slice(b,0@0,4@0);
- io.print(slice1);
- slice2 := algebra.slice(b,5@0,nil:oid);
- io.print(slice2);
-end user.main;
+# MonetDB/R module loaded
+
+Ready.
+
+# 10:38:22 >
+# 10:38:22 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-864" "--port=33541"
+# 10:38:22 >
+
+#io.print(b);
#--------------------------#
# h t # name
# void int # type
diff --git a/monetdb5/mal/Tests/tst819.mal b/monetdb5/mal/Tests/tst819.malC
rename from monetdb5/mal/Tests/tst819.mal
rename to monetdb5/mal/Tests/tst819.malC
--- a/monetdb5/mal/Tests/tst819.mal
+++ b/monetdb5/mal/Tests/tst819.malC
@@ -4,6 +4,9 @@ function extralongfunctionsignature(p1:b
return extralongfunctionsignature:= b;
end extralongfunctionsignature;
+function foo();
p1:= bat.new(:oid,:sht);
p2:= bat.new(:oid,:sht);
z:= extralongfunctionsignature(p1,p2);
+end foo;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst819.stable.out
b/monetdb5/mal/Tests/tst819.stable.out
--- a/monetdb5/mal/Tests/tst819.stable.out
+++ b/monetdb5/mal/Tests/tst819.stable.out
@@ -16,16 +16,19 @@ stdout of test 'tst819` in directory 'mo
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:39275/
# MonetDB/SQL module loaded
# MonetDB/GIS module loaded
-function
user.extralongfunctionsignature(p1:bat[:oid,:sht],p2:bat[:oid,:sht]):bat[:oid,:sht];
- b := bat.new(:oid,:sht);
- return extralongfunctionsignature := b;
-end user.extralongfunctionsignature;
-function user.main():void;
-#extra long signature
- p1 := bat.new(:oid,:sht);
- p2 := bat.new(:oid,:sht);
- z := user.extralongfunctionsignature(p1,p2);
-end user.main;
+# 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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
