Changeset: ea3d8f5830ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ea3d8f5830ae
Removed Files:
monetdb5/mal/Tests/tst104.malC
monetdb5/mal/Tests/tst104.stable.err
monetdb5/mal/Tests/tst104.stable.out
monetdb5/mal/Tests/tst105.malC
monetdb5/mal/Tests/tst105.stable.err
monetdb5/mal/Tests/tst105.stable.out
monetdb5/mal/Tests/tst105a.malC
monetdb5/mal/Tests/tst105a.stable.err
monetdb5/mal/Tests/tst105a.stable.out
monetdb5/mal/Tests/tst106.malC
monetdb5/mal/Tests/tst106.stable.err
monetdb5/mal/Tests/tst106.stable.out
monetdb5/mal/Tests/tst150.malC
monetdb5/mal/Tests/tst150.stable.err
monetdb5/mal/Tests/tst150.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/dynamicload.stable.err
monetdb5/mal/Tests/tst102.malC
monetdb5/mal/Tests/tst102.stable.err
monetdb5/mal/Tests/tst115.malC
monetdb5/mal/Tests/tst115.stable.err
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_scenario.c
Branch: default
Log Message:
Make signature address binding more strict
The original OO-language approach to leave
the implementation hanging is dropped.
diffs (truncated from 713 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
@@ -71,10 +71,6 @@ tst101
tst1012
tst102
tst103
-tst104
-tst105
-tst105a
-tst106
tst107
tst108
tst109
@@ -93,7 +89,6 @@ tst1225
tst120a
tst120b
tst130
-tst150
tst1500
tst1502
tst1503
diff --git a/monetdb5/mal/Tests/dynamicload.stable.err
b/monetdb5/mal/Tests/dynamicload.stable.err
--- a/monetdb5/mal/Tests/dynamicload.stable.err
+++ b/monetdb5/mal/Tests/dynamicload.stable.err
@@ -80,7 +80,19 @@ stderr of test 'dynamicload` in director
# 13:21:38 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-18020" "--port=37961"
# 13:21:38 >
-MAPI = (monetdb) /var/tmp/mtest-13954/.s.monetdb.38078
+MAPI = (monetdb) /var/tmp/mtest-21455/.s.monetdb.39502
+QUERY = # examples of non-bindable instructions
+
+ command wrong()
+ address UNKOWNaddress
+ comment "Should not be callable";
+
+ wrong();
+
+ #load unknown library
+ library UNKNOWlib;
+ERROR = !MALException:MAL.getAddress:address of 'user.UNKOWNaddress' not found
+MAPI = (monetdb) /var/tmp/mtest-21455/.s.monetdb.39502
QUERY = # examples of non-bindable instructions
command wrong()
diff --git a/monetdb5/mal/Tests/tst102.malC b/monetdb5/mal/Tests/tst102.malC
--- a/monetdb5/mal/Tests/tst102.malC
+++ b/monetdb5/mal/Tests/tst102.malC
@@ -1,5 +1,6 @@
# the calls are wrong, they violate the type constraint
-command + (L:any_1, R:any_1):any_1 address addIntInt comment "unknown
function";
+# use address of existing function
+command + (L:any_1, R:any_1):any_1 address MDBstart comment "unknown function";
a:=1+"hello";
b:=3.5+1;
diff --git a/monetdb5/mal/Tests/tst102.stable.err
b/monetdb5/mal/Tests/tst102.stable.err
--- a/monetdb5/mal/Tests/tst102.stable.err
+++ b/monetdb5/mal/Tests/tst102.stable.err
@@ -30,13 +30,15 @@ stderr of test 'tst102` in directory 'mo
# 20:43:12 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23471" "--port=34866"
# 20:43:12 >
-MAPI = (monetdb) /var/tmp/mtest-7831/.s.monetdb.38226
+MAPI = (monetdb) /var/tmp/mtest-21455/.s.monetdb.39502
QUERY = # the calls are wrong, they violate the type constraint
- command + (L:any_1, R:any_1):any_1 address addIntInt comment "unknown
function";
+ # use address of existing function
+ command + (L:any_1, R:any_1):any_1 address MDBstart comment "unknown
function";
a:=1+"hello";
b:=3.5+1;
-ERROR = !TypeException:user.main[2]:'calc.+' undefined in: a:any :=
calc.+(1:int,"hello":str);
+ERROR = !TypeException:user.main[3]:'calc.+' undefined in: a:any :=
calc.+(1:int,"hello":str);
+
# 20:43:12 >
# 20:43:12 > "Done."
diff --git a/monetdb5/mal/Tests/tst104.malC b/monetdb5/mal/Tests/tst104.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst104.malC
+++ /dev/null
@@ -1,7 +0,0 @@
-# check propagation of type variables over bats
-# can be checked after bat module has been added
-
-command f(a:any_1, b:bat[:any_2],c:any_2):any_2 address dummy;
-
-b:= bat.new(:str);
-a:= user.f(1@0,b,"hello");
diff --git a/monetdb5/mal/Tests/tst104.stable.err
b/monetdb5/mal/Tests/tst104.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst104.stable.err
+++ /dev/null
@@ -1,47 +0,0 @@
-stderr of test 'tst104` in directory 'monetdb5/mal` itself:
-
-
-# 13:25:18 >
-# 13:25:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30954" "--set"
"mapi_usock=/var/tmp/mtest-26037/.s.monetdb.30954" "--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"
-# 13:25:18 >
-
-# 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 = 30954
-# cmdline opt mapi_usock = /var/tmp/mtest-26037/.s.monetdb.30954
-# 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
-
-# 13:20:23 >
-# 13:20:23 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-18020" "--port=37961"
-# 13:20:23 >
-
-MAPI = (monetdb) /var/tmp/mtest-7831/.s.monetdb.38226
-QUERY = # check propagation of type variables over bats
- # can be checked after bat module has been added
-
- command f(a:any_1, b:bat[:any_2],c:any_2):any_2 address dummy;
-
- b:= bat.new(:str);
- a:= user.f(1@0,b,"hello");
-ERROR = !TypeException:user.main[4]:object code for command user.f missing
- !TypeException:user.main[4]:'user.f' undefined in: a:str :=
user.f(1@0:oid,b:bat[:str],"hello":str);
-
-# 13:20:23 >
-# 13:20:23 > "Done."
-# 13:20:23 >
-
diff --git a/monetdb5/mal/Tests/tst104.stable.out
b/monetdb5/mal/Tests/tst104.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst104.stable.out
+++ /dev/null
@@ -1,30 +0,0 @@
-stdout of test 'tst104` in directory 'monetdb5/mal` itself:
-
-
-# 07:58:56 >
-# 07:58:56 > 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
tst104.mal </dev/null
-# 07:58:56 >
-
-# MonetDB server v5.9.0, based on kernel v1.27.0
-# 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-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:36368/
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
-
-# 13:25:18 >
-# 13:25:18 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26037" "--port=30954"
-# 13:25:18 >
-
-
-# 13:25:18 >
-# 13:25:18 > "Done."
-# 13:25:18 >
-
diff --git a/monetdb5/mal/Tests/tst105.malC b/monetdb5/mal/Tests/tst105.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst105.malC
+++ /dev/null
@@ -1,9 +0,0 @@
-# check propagation of type variables over bats
-# can be checked after bat module has been added
-
-module bat2;
-command new(t:any_2) :bat[ :any_2] address GDKbatnew;
-
-a:= bat2.new(:int);
-b:= bat2.new(:int);
-c:= bat.new(:int);
diff --git a/monetdb5/mal/Tests/tst105.stable.err
b/monetdb5/mal/Tests/tst105.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst105.stable.err
+++ /dev/null
@@ -1,49 +0,0 @@
-stderr of test 'tst105` in directory 'monetdb5/mal` itself:
-
-
-# 13:25:18 >
-# 13:25:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30954" "--set"
"mapi_usock=/var/tmp/mtest-26037/.s.monetdb.30954" "--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"
-# 13:25:18 >
-
-# 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 = 30954
-# cmdline opt mapi_usock = /var/tmp/mtest-26037/.s.monetdb.30954
-# 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
-
-# 13:20:24 >
-# 13:20:24 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-18020" "--port=37961"
-# 13:20:24 >
-
-MAPI = (monetdb) /var/tmp/mtest-7831/.s.monetdb.38226
-QUERY = # check propagation of type variables over bats
- # can be checked after bat module has been added
-
- module bat2;
- command new(t:any_2) :bat[ :any_2] address GDKbatnew;
-
- a:= bat2.new(:int);
- b:= bat2.new(:int);
- c:= bat.new(:int);
-ERROR = !TypeException:user.main[3]:object code for command bat2.new missing
- !TypeException:user.main[3]:'bat2.new' undefined in: a:bat[:int]
:= bat2.new(:int);
-
-# 13:20:24 >
-# 13:20:24 > "Done."
-# 13:20:24 >
-
diff --git a/monetdb5/mal/Tests/tst105.stable.out
b/monetdb5/mal/Tests/tst105.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst105.stable.out
+++ /dev/null
@@ -1,34 +0,0 @@
-stdout of test 'tst105` in directory 'monetdb5/mal` itself:
-
-
-# 07:58:56 >
-# 07:58:56 > 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
tst105.mal </dev/null
-# 07:58:56 >
-
-# MonetDB server v5.9.0, based on kernel v1.27.0
-# 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-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:35645/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15498/.s.monetdb.35645
-# 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.
-
-# 13:25:18 >
-# 13:25:18 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26037" "--port=30954"
-# 13:25:18 >
-
-
-# 13:25:18 >
-# 13:25:18 > "Done."
-# 13:25:18 >
-
diff --git a/monetdb5/mal/Tests/tst105a.malC b/monetdb5/mal/Tests/tst105a.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst105a.malC
+++ /dev/null
@@ -1,6 +0,0 @@
-# check classification of functions in the proper module
-
-module bbp;
-command new(t:any_2):bat[:any_2] address GDKbatnew;
-
-b:= bbp.new(:int);
diff --git a/monetdb5/mal/Tests/tst105a.stable.err
b/monetdb5/mal/Tests/tst105a.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst105a.stable.err
+++ /dev/null
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
