Changeset: 0481a6a7831d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0481a6a7831d
Added Files:
sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.sql
sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.err
sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2016/Tests/All
Branch: Jul2015
Log Message:
fixed bug 3981, ie only rewrite joins with constants into selects (ie not
outerjoins). Added a test for Bug 3981.
diffs (140 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
@@ -4740,7 +4740,7 @@ exps_remove_dictexps(mvc *sql, list *exp
static sql_rel *
rel_remove_join(int *changes, mvc *sql, sql_rel *rel)
{
- if (is_join(rel->op)) {
+ if (is_join(rel->op) && !is_outerjoin(rel->op)) {
sql_rel *l = rel->l;
sql_rel *r = rel->r;
int lconst = 0, rconst = 0;
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -16,4 +16,5 @@ decimal_vs_integer.Bug-3941
foreign_key.Bug-3938
rename_exps.Bug-3974
join-with-references-2sides-crashes.Bug-3980
-memory-consumption-query-PLAN-25joins.Bug-3972
+#memory-consumption-query-PLAN-25joins.Bug-3972
+leftjoin.Bug-3981
diff --git a/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.sql
b/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.sql
@@ -0,0 +1,12 @@
+SELECT *
+FROM (
+ SELECT 'apple' as fruit
+ UNION ALL SELECT 'banana'
+) a
+JOIN (
+ SELECT 'apple' as fruit
+ UNION ALL SELECT 'banana'
+) b ON a.fruit=b.fruit
+LEFT JOIN (
+ SELECT 1 as isyellow
+) c ON b.fruit='banana';
diff --git a/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.err
b/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'leftjoin.Bug-3981` in directory 'sql/test/BugTracker-2016`
itself:
+
+
+# 09:59:13 >
+# 09:59:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31439" "--set"
"mapi_usock=/var/tmp/mtest-9363/.s.monetdb.31439" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:59:13 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/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 = 31439
+# cmdline opt mapi_usock = /var/tmp/mtest-9363/.s.monetdb.31439
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 09:59:13 >
+# 09:59:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9363" "--port=31439"
+# 09:59:13 >
+
+
+# 09:59:13 >
+# 09:59:13 > "Done."
+# 09:59:13 >
+
diff --git a/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out
b/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out
@@ -0,0 +1,54 @@
+stdout of test 'leftjoin.Bug-3981` in directory 'sql/test/BugTracker-2016`
itself:
+
+
+# 09:59:13 >
+# 09:59:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31439" "--set"
"mapi_usock=/var/tmp/mtest-9363/.s.monetdb.31439" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:59:13 >
+
+# MonetDB 5 server v11.21.18
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.332 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:31439/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9363/.s.monetdb.31439
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.12'
+# Finished reading the write-ahead log 'sql_logs/sql/log.12'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 09:59:13 >
+# 09:59:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9363" "--port=31439"
+# 09:59:13 >
+
+#SELECT *
+#FROM (
+# SELECT 'apple' as fruit
+# UNION ALL SELECT 'banana'
+#) a
+#JOIN (
+# SELECT 'apple' as fruit
+# UNION ALL SELECT 'banana'
+#) b ON a.fruit=b.fruit
+#LEFT JOIN (
+# SELECT 1 as isyellow
+#) c ON b.fruit='banana';
+% .a, .b, .c # table_name
+% fruit, fruit, isyellow # name
+% char, char, tinyint # type
+% 6, 6, 1 # length
+[ "banana", "banana", 1 ]
+[ "apple", "apple", NULL ]
+
+# 09:59:13 >
+# 09:59:13 > "Done."
+# 09:59:13 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
