Changeset: eaf1c8c65072 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eaf1c8c65072
Added Files:
sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2017/Tests/All
Branch: Dec2016
Log Message:
fixed problem with complicated (or) expressions.
diffs (130 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
@@ -3961,7 +3961,7 @@ rel_push_select_down(int *changes, mvc *
pl = r->l;
/* introduce selects under the project (if needed) */
set_processed(pl);
- if (!is_select(pl->op))
+ if (!is_select(pl->op) || rel_is_ref(pl))
r->l = pl = rel_select(sql->sa, pl, NULL);
/* for each exp check if we can rename it */
@@ -4586,7 +4586,7 @@ rel_push_select_down_union(int *changes,
if (u->op == op_project)
u = u->l;
- if (!u || !is_union(u->op) || !u->exps || rel_is_ref(u))
+ if (!u || !is_union(u->op) || need_distinct(u) || !u->exps ||
rel_is_ref(u))
return rel;
ul = u->l;
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -9,3 +9,4 @@ round-or-truncate.Bug-6193
splitpart.Bug-6194
HAVE_HGE?cast-with-many-decimals.Bug-6195
union_func_crash.Bug-6196
+complicated_logic.Bug-105
diff --git a/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
@@ -0,0 +1,5 @@
+CREATE TABLE test (id INT, a INT, b INT);
+INSERT INTO test VALUES (0, 1, 2);
+SELECT COUNT(*) FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <>
1) AND a = 1;
+SELECT * FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <> 1) AND
a = 1;
+drop table test;
diff --git
a/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'complicated_logic.Bug-105` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 17:52:48 >
+# 17:52:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38831" "--set"
"mapi_usock=/var/tmp/mtest-13806/.s.monetdb.38831" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 17:52:48 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/home/niels/scratch/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 = 38831
+# cmdline opt mapi_usock = /var/tmp/mtest-13806/.s.monetdb.38831
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 17:52:50 >
+# 17:52:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13806" "--port=38831"
+# 17:52:50 >
+
+
+# 17:52:56 >
+# 17:52:56 > "Done."
+# 17:52:56 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
@@ -0,0 +1,47 @@
+stdout of test 'complicated_logic.Bug-105` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 17:52:48 >
+# 17:52:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38831" "--set"
"mapi_usock=/var/tmp/mtest-13806/.s.monetdb.38831" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 17:52:48 >
+
+# MonetDB 5 server v11.25.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.584 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://rocks073.scilens.private:38831/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-13806/.s.monetdb.38831
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:52:50 >
+# 17:52:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13806" "--port=38831"
+# 17:52:50 >
+
+#CREATE TABLE test (id INT, a INT, b INT);
+#INSERT INTO test VALUES (0, 1, 2);
+[ 1 ]
+#SELECT COUNT(*) FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <>
1) AND a = 1;
+% sys.L13 # table_name
+% L12 # name
+% bigint # type
+% 1 # length
+[ 1 ]
+#SELECT * FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <> 1) AND
a = 1;
+% sys.test, sys.test, sys.test # table_name
+% id, a, b # name
+% int, int, int # type
+% 1, 1, 1 # length
+[ 0, 1, 2 ]
+#drop table test;
+
+# 17:52:56 >
+# 17:52:56 > "Done."
+# 17:52:56 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
