Changeset: e0163d1455fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0163d1455fc
Added Files:
sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.sql
sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.err
sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2015/Tests/All
Branch: Oct2014
Log Message:
fixed bug 3725, ie don't push projections up through outer joins
diffs (123 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -4732,6 +4732,9 @@ rel_push_project_up(int *changes, mvc *s
if (!l || rel_is_ref(l) ||
(is_join(rel->op) && (!r || rel_is_ref(r))) ||
(is_select(rel->op) && l->op != op_project) ||
+ /* we cannot rewrite projection from outer joins */
+ ((is_left(rel->op) || is_full(rel->op)) && r->op ==
op_project) ||
+ ((is_right(rel->op) || is_full(rel->op)) && l->op ==
op_project) ||
(is_join(rel->op) && l->op != op_project && r->op !=
op_project) ||
((l->op == op_project && (!l->l || l->r ||
project_unsafe(l))) ||
(is_join(rel->op) && (is_subquery(r) ||
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -30,3 +30,4 @@ convert-to-bit.Bug-3719
union_project.Bug-3723
leftjoin.Bug-3720
adddrop_unknown_table.Bug-3718
+outerjoin_project.Bug-3725
diff --git a/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.sql
b/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.sql
@@ -0,0 +1,6 @@
+start transaction;
+create table a (a integer);
+create table b (a integer);
+insert into a values (1);
+select * from a left join (select a, 20 from b) as x using (a);
+rollback;
diff --git
a/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.err
b/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'outerjoin_project.Bug-3725` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 10:41:42 >
+# 10:41:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30127" "--set"
"mapi_usock=/var/tmp/mtest-5429/.s.monetdb.30127" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:41:42 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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 = 30127
+# cmdline opt mapi_usock = /var/tmp/mtest-5429/.s.monetdb.30127
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 10:41:42 >
+# 10:41:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5429" "--port=30127"
+# 10:41:42 >
+
+
+# 10:41:42 >
+# 10:41:42 > "Done."
+# 10:41:42 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.out
b/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.out
@@ -0,0 +1,44 @@
+stdout of test 'outerjoin_project.Bug-3725` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 10:41:42 >
+# 10:41:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30127" "--set"
"mapi_usock=/var/tmp/mtest-5429/.s.monetdb.30127" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:41:42 >
+
+# MonetDB 5 server v11.19.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.333 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://localhost.nes.nl:30127/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5429/.s.monetdb.30127
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 10:41:42 >
+# 10:41:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5429" "--port=30127"
+# 10:41:42 >
+
+#start transaction;
+#create table a (a integer);
+#create table b (a integer);
+#insert into a values (1);
+[ 1 ]
+#select * from a left join (select a, 20 from b) as x using (a);
+% .L1, .L2 # table_name
+% a, L2 # name
+% int, tinyint # type
+% 1, 1 # length
+[ 1, NULL ]
+#rollback;
+
+# 10:41:42 >
+# 10:41:42 > "Done."
+# 10:41:42 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
