Changeset: 8812b7ac9801 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8812b7ac9801
Added Files:
sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.sql
sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.err
sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2021/Tests/All
Branch: Oct2020
Log Message:
Added test and fix for bug #7128 Don't attempt to push down early trivial
between expressions
diffs (121 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
@@ -1548,7 +1548,7 @@ rel_filter_exp_(mvc *sql, sql_rel *rel,
list *r = sa_list(sql->sa);
list_append(l, ls);
- list_append(r, rs);
+ list_append(r, rs);
if (rs2)
list_append(r, rs2);
return rel_filter(sql, rel, l, r, "sys", filter_op, anti, f);
@@ -1562,7 +1562,7 @@ rel_select_push_exp_down(mvc *sql, sql_r
if ((rs->card <= CARD_ATOM || (rs2 && ls->card <= CARD_ATOM)) &&
(exp_is_atom(rs) || (rs2 && exp_is_atom(ls)) ||
exp_has_freevar(sql, rs) || exp_has_freevar(sql, ls)) &&
(!rs2 || (rs2->card <= CARD_ATOM && (exp_is_atom(rs2) ||
exp_has_freevar(sql, rs2))))) {
- if ((ls->card == rs->card && (!rs2 || ls->card == rs2->card ||
rs->card == rs2->card)) || rel->processed) /* bin compare op */
+ if (ls->card == rs->card || (rs2 && (ls->card == rs2->card ||
rs->card == rs2->card)) || rel->processed) /* bin compare op */
return rel_select(sql->sa, rel, e);
return push_select_exp(sql, rel, e, ls, L, f);
diff --git a/sql/test/BugTracker-2021/Tests/All
b/sql/test/BugTracker-2021/Tests/All
--- a/sql/test/BugTracker-2021/Tests/All
+++ b/sql/test/BugTracker-2021/Tests/All
@@ -6,4 +6,5 @@ union-groupby.Bug-7108
merge-stmt.wrong-error.Bug-7109
remote-table-groupby.Bug-7110
lowercase-cryllic.Bug-7126
+subquery-missing.Bug-7128
batcalc-between-undefined.Bug-7129
diff --git a/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.sql
b/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.sql
@@ -0,0 +1,9 @@
+start transaction;
+
+create table t_qh ( c_f INTEGER , c_y2 INTEGER , c_i768 INTEGER , c_tqx TEXT ,
primary key(c_f, c_y2), unique(c_y2) );
+
+select ref_1.c_i768 as c0 from t_qh as ref_1 cross join (select ref_2.c_i768
as c0 from t_qh as ref_2 inner join t_qh as
+ref_3 on (1=1) where ref_3.c_f <> ref_3.c_y2) as subq_0 where ref_1.c_y2 < (
select ref_1.c_f as c0 from t_qh as ref_4
+where (EXISTS ( select distinct ref_5.c_i768 as c0 from t_qh as ref_5)) and
(ref_1.c_i768 between ref_4.c_y2 and ref_1.c_y2));
+
+rollback;
diff --git
a/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.err
b/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.err
@@ -0,0 +1,28 @@
+stderr of test 'subquery-missing.Bug-7128` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 18:50:58 >
+# 18:50:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=35534" "--set"
"mapi_usock=/var/tmp/mtest-727849/.s.monetdb.35534" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_c=true"
+# 18:50:58 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_listenaddr = all
+# cmdline opt mapi_port = 35534
+# cmdline opt mapi_usock = /var/tmp/mtest-727849/.s.monetdb.35534
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021
+# cmdline opt embedded_c = true
+
+# 18:50:58 >
+# 18:50:58 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-727849" "--port=35534"
+# 18:50:58 >
+
+
+# 18:50:58 >
+# 18:50:58 > "Done."
+# 18:50:58 >
+
diff --git
a/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.out
b/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/subquery-missing.Bug-7128.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'subquery-missing.Bug-7128` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 18:50:58 >
+# 18:50:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=35534" "--set"
"mapi_usock=/var/tmp/mtest-727849/.s.monetdb.35534" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_c=true"
+# 18:50:58 >
+
+# MonetDB 5 server v11.39.18 (hg id: af88b10dddb7)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2021', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.343 GiB available main-memory of which we use 12.504 GiB
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2021 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://fedora:35534/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-727849/.s.monetdb.35534
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+# 18:50:58 >
+# 18:50:58 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-727849" "--port=35534"
+# 18:50:58 >
+
+#start transaction;
+#create table t_qh ( c_f INTEGER , c_y2 INTEGER , c_i768 INTEGER , c_tqx TEXT
, primary key(c_f, c_y2), unique(c_y2) );
+#select ref_1.c_i768 as c0 from t_qh as ref_1 cross join (select ref_2.c_i768
as c0 from t_qh as ref_2 inner join t_qh as
+#ref_3 on (1=1) where ref_3.c_f <> ref_3.c_y2) as subq_0 where ref_1.c_y2 < (
select ref_1.c_f as c0 from t_qh as ref_4
+#where (EXISTS ( select distinct ref_5.c_i768 as c0 from t_qh as ref_5)) and
(ref_1.c_i768 between ref_4.c_y2 and ref_1.c_y2));
+% sys. # table_name
+% c0 # name
+% int # type
+% 1 # length
+#rollback;
+
+# 18:50:58 >
+# 18:50:58 > "Done."
+# 18:50:58 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
