Changeset: 6c699953279b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c699953279b
Added Files:
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.err
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.out
Modified Files:
monetdb5/optimizer/opt_multiplex.mx
sql/test/BugTracker-2012/Tests/All
Branch: Apr2012
Log Message:
fixed bug 2949. Checking program (types/declaration/flow) with half complete
programs fails. So only check at the end of the optimizer.
diffs (140 lines):
diff --git a/monetdb5/optimizer/opt_multiplex.mx
b/monetdb5/optimizer/opt_multiplex.mx
--- a/monetdb5/optimizer/opt_multiplex.mx
+++ b/monetdb5/optimizer/opt_multiplex.mx
@@ -139,8 +139,7 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
fcn = VALget(&getVar(mb, getArg(pci, 2))->value);
fcn = putName(fcn,strlen(fcn));
- /* search the iterator bat after type checking first */
- chkProgram(cntxt->fdout, cntxt->nspace,mb);
+ /* search the iterator bat */
for (i = 3; i < pci->argc; i++)
if (isaBatType(getArgType(mb, pci, i))) {
iter = getArg(pci, i);
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -33,3 +33,4 @@ table_functions_fail_after_restart-1.Bug
user_defined_decimal_function.Bug-2992
non_keyword_no.Bug-3079
round-type-inference.Bug-2987
+mal_syntax_error.Bug-2949
diff --git a/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
@@ -0,0 +1,17 @@
+create table r (u varchar(32), v varchar(32), r varchar(5));
+CREATE FUNCTION refine ()
+RETURNS TABLE (u varchar(32), v varchar(32), r varchar(5))
+BEGIN
+ RETURN TABLE (
+
+ ( SELECT R.u, R.v, R.r FROM R
+
+ INTERSECT
+
+ SELECT R.u, R.v, R.r FROM R
+ )
+ );
+END;
+select * from refine();
+
+drop function refine;
diff --git
a/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.err
b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'mal_syntax_error.Bug-2949` in directory 'test/BugTracker-2012`
itself:
+
+
+# 20:26:50 >
+# 20:26:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=35517" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 20:26:50 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35517
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 20:26:50 >
+# 20:26:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35517"
+# 20:26:50 >
+
+
+# 20:26:50 >
+# 20:26:50 > "Done."
+# 20:26:50 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.out
b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'mal_syntax_error.Bug-2949` in directory 'test/BugTracker-2012`
itself:
+
+
+# 20:26:50 >
+# 20:26:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=35517" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 20:26:50 >
+
+# MonetDB 5 server v11.9.2
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:35517/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 20:26:50 >
+# 20:26:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35517"
+# 20:26:50 >
+
+#create table r (u varchar(32), v varchar(32), r varchar(5));
+#CREATE FUNCTION refine ()
+#RETURNS TABLE (u varchar(32), v varchar(32), r varchar(5))
+#BEGIN
+# RETURN TABLE (
+#
+# ( SELECT R.u, R.v, R.r FROM R
+#
+# INTERSECT
+#
+# SELECT R.u, R.v, R.r FROM R
+# )
+# );
+#END;
+#select * from refine();
+% ., ., . # table_name
+% u, v, r # name
+% varchar, varchar, varchar # type
+% 0, 0, 0 # length
+#drop function refine;
+
+# 20:26:50 >
+# 20:26:50 > "Done."
+# 20:26:50 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
