Changeset: e69686af0fb1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e69686af0fb1
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
Branch: Jul2017
Log Message:
fixed bug 6522, ie handle constants before correlated in part
diffs (140 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2646,6 +2646,14 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
}
rel = left =
rel_dup(left);
roident = rident =
exp_column(sql->sa, exp_relname(lident), exp_name(lident), exp_subtype(lident),
lident->card, has_nil(lident), is_intern(lident));
+
+ if (!correlated &&
right) {
+ /* union of
values or single value project */
+ sql_rel *in =
rel_crossproduct(sql->sa, rel_dup(left), right, op_join);
+
+ right =
rel_project(sql->sa, in, rel_projections(sql, right, NULL, 1, 1));
+
rel_project_add_exp(sql, right, roident);
+ }
}
r = rel_value_exp(sql, &rel,
sval, f, ek);
if (r && !l_is_value) {
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
@@ -1,4 +1,8 @@
CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
INSERT INTO tab2 VALUES (64,77,40), (75,67,58), (46,51,23);
SELECT ALL * FROM tab2 WHERE + col0 IN ( - 12, col0, - col1, col1 / + col0,
col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( col0, - col1, col1 / + col0, col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( - col1, col1 / + col0, col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( col1 / + col0, col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( col1 );
DROP TABLE tab2;
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-in-single-column.Bug-6522` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 18:32:37 >
+# 18:32:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32244" "--set"
"mapi_usock=/var/tmp/mtest-26304/.s.monetdb.32244" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 18:32:37 >
+
+# 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 = 32244
+# cmdline opt mapi_usock = /var/tmp/mtest-26304/.s.monetdb.32244
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt gdk_debug = 553648138
+
+# 18:32:37 >
+# 18:32:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26304" "--port=32244"
+# 18:32:37 >
+
+
+# 18:32:37 >
+# 18:32:37 > "Done."
+# 18:32:37 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
@@ -0,0 +1,66 @@
+stdout of test 'sqlitelogictest-in-single-column.Bug-6522` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 18:32:37 >
+# 18:32:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32244" "--set"
"mapi_usock=/var/tmp/mtest-26304/.s.monetdb.32244" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 18:32:37 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.324 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32244/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26304/.s.monetdb.32244
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 18:32:37 >
+# 18:32:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26304" "--port=32244"
+# 18:32:37 >
+
+#CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#INSERT INTO tab2 VALUES (64,77,40), (75,67,58), (46,51,23);
+[ 3 ]
+#SELECT ALL * FROM tab2 WHERE + col0 IN ( - 12, col0, - col1, col1 / + col0,
col1 );
+% sys.tab2, sys.tab2, sys.tab2 # table_name
+% col0, col1, col2 # name
+% int, int, int # type
+% 2, 2, 2 # length
+[ 64, 77, 40 ]
+[ 75, 67, 58 ]
+[ 46, 51, 23 ]
+#SELECT ALL * FROM tab2 WHERE + col0 IN ( col0, - col1, col1 / + col0, col1 );
+% sys.tab2, sys.tab2, sys.tab2 # table_name
+% col0, col1, col2 # name
+% int, int, int # type
+% 2, 2, 2 # length
+[ 64, 77, 40 ]
+[ 75, 67, 58 ]
+[ 46, 51, 23 ]
+#SELECT ALL * FROM tab2 WHERE + col0 IN ( - col1, col1 / + col0, col1 );
+% sys.tab2, sys.tab2, sys.tab2 # table_name
+% col0, col1, col2 # name
+% int, int, int # type
+% 1, 1, 1 # length
+#SELECT ALL * FROM tab2 WHERE + col0 IN ( col1 / + col0, col1 );
+% sys.tab2, sys.tab2, sys.tab2 # table_name
+% col0, col1, col2 # name
+% int, int, int # type
+% 1, 1, 1 # length
+#SELECT ALL * FROM tab2 WHERE + col0 IN ( col1 );
+% sys.tab2, sys.tab2, sys.tab2 # table_name
+% col0, col1, col2 # name
+% int, int, int # type
+% 1, 1, 1 # length
+#DROP TABLE tab2;
+
+# 18:32:37 >
+# 18:32:37 > "Done."
+# 18:32:37 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
