Changeset: 25482eb36d0e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/25482eb36d0e
Added Files:
sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.sql
sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.err
sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.out
sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.sql
sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.err
sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.out
Removed Files:
sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.sql
sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2021/Tests/All
Branch: Oct2020
Log Message:
Test and fix for bug #7129 When optimizing range comparisons in projections to
between calls, don't forget to check the types
diffs (160 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
@@ -3962,17 +3962,19 @@ rel_merge_project_rse(visitor *v, sql_re
if (((strcmp(lf->func->base.name, ">=") == 0 ||
strcmp(lf->func->base.name, ">") == 0) && list_length(lfexps) == 2) &&
((strcmp(rf->func->base.name, "<=") == 0 ||
strcmp(rf->func->base.name, "<") == 0) && list_length(rfexps) == 2)
&& exp_equal(list_fetch(lfexps,0),
list_fetch(rfexps,0)) == 0) {
- sql_exp *ne = exp_compare2(v->sql->sa,
- list_fetch(lfexps, 0),
- list_fetch(lfexps, 1),
- list_fetch(rfexps, 1),
-
compare_funcs2range(lf->func->base.name, rf->func->base.name));
- if (ne) {
+ sql_exp *e1 = list_fetch(lfexps, 0),
*e2 = list_fetch(lfexps, 1), *e3 = list_fetch(rfexps, 1), *ne = NULL;
+ sql_subtype *t1 = exp_subtype(e1), *t3
= exp_subtype(e3), super;
+
+ supertype(&super, t1, t3); /* e1 and e2
must have the same type */
+ if ((e1 = exp_check_type(v->sql,
&super, rel, e1, type_equal)) &&
+ (e2 = exp_check_type(v->sql,
&super, rel, e2, type_equal)) &&
+ (e3 = exp_check_type(v->sql,
&super, rel, e3, type_equal)) &&
+ (ne = exp_compare2(v->sql->sa,
e1, e2, e3, compare_funcs2range(lf->func->base.name, rf->func->base.name)))) {
if (exp_name(e))
exp_prop_alias(v->sql->sa, ne, e);
e = ne;
+ v->changes++;
}
- v->changes++;
}
}
}
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
@@ -5,4 +5,5 @@ ntile-wrong-result.Bug-7104
union-groupby.Bug-7108
merge-stmt.wrong-error.Bug-7109
remote-table-groupby.Bug-7110
-lowercase-crylic.Bug-7126
+lowercase-cryllic.Bug-7126
+batcalc-between-undefined.Bug-7129
diff --git
a/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.sql
b/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.sql
@@ -0,0 +1,10 @@
+start transaction;
+
+create table t_qh ( c_f INTEGER , c_y2 INTEGER , primary key(c_f), unique(c_f)
);
+
+WITH cte_1 AS (select count( cast(87.53 as INTEGER)) as c0, avg( cast(abs(
cast(50.40 as INTEGER)) as INTEGER)) as c1, subq_0.c0 as c2 from
+(select distinct ref_5.c_f as c0, 75 as c1, ref_5.c_f as c2 from t_qh as ref_5
where ref_5.c_f is not NULL) as subq_0 group by subq_0.c0)
+select distinct cast(sum( cast((case when (ref_23.c0 > ref_23.c0) and
(ref_23.c0 < ref_23.c1) then ref_23.c1 else ref_23.c1 end & ref_23.c1) as
INTEGER)) as bigint)
+as c3, ref_23.c0 as c4 from cte_1 as ref_23 group by ref_23.c0;
+
+rollback;
diff --git
a/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.err
b/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'batcalc-between-undefined.Bug-7129` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 17:25:33 >
+# 17:25:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=39463" "--set"
"mapi_usock=/var/tmp/mtest-552279/.s.monetdb.39463" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_r=yes" "--set" "embedded_c=true"
+# 17:25:33 >
+
+# 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 = 39463
+# cmdline opt mapi_usock = /var/tmp/mtest-552279/.s.monetdb.39463
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_c = true
+
+# 17:25:33 >
+# 17:25:33 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-552279" "--port=39463"
+# 17:25:33 >
+
+
+# 17:25:34 >
+# 17:25:34 > "Done."
+# 17:25:34 >
+
diff --git
a/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.out
b/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2021/Tests/batcalc-between-undefined.Bug-7129.stable.out
@@ -0,0 +1,41 @@
+stdout of test 'batcalc-between-undefined.Bug-7129` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 17:25:33 >
+# 17:25:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=39463" "--set"
"mapi_usock=/var/tmp/mtest-552279/.s.monetdb.39463" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_r=yes" "--set" "embedded_c=true"
+# 17:25:33 >
+
+# 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:39463/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-552279/.s.monetdb.39463
+# MonetDB/GIS module loaded
+# MonetDB/R module loaded
+# MonetDB/SQL module loaded
+
+# 17:25:33 >
+# 17:25:33 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-552279" "--port=39463"
+# 17:25:33 >
+
+#start transaction;
+#create table t_qh ( c_f INTEGER , c_y2 INTEGER , primary key(c_f),
unique(c_f) );
+#WITH cte_1 AS (select count( cast(87.53 as INTEGER)) as c0, avg( cast(abs(
cast(50.40 as INTEGER)) as INTEGER)) as c1, subq_0.c0 as c2 from
+#(select distinct ref_5.c_f as c0, 75 as c1, ref_5.c_f as c2 from t_qh as
ref_5 where ref_5.c_f is not NULL) as subq_0 group by subq_0.c0)
+#select distinct cast(sum( cast((case when (ref_23.c0 > ref_23.c0) and
(ref_23.c0 < ref_23.c1) then ref_23.c1 else ref_23.c1 end & ref_23.c1) as
INTEGER)) as bigint)
+#as c3, ref_23.c0 as c4 from cte_1 as ref_23 group by ref_23.c0;
+% ., . # table_name
+% c3, c4 # name
+% bigint, bigint # type
+% 1, 1 # length
+#rollback;
+
+# 17:25:34 >
+# 17:25:34 > "Done."
+# 17:25:34 >
+
diff --git a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.sql
b/sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.sql
rename from sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.sql
rename to sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.sql
diff --git
a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
b/sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.err
rename from sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
rename to sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.err
--- a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
+++ b/sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'lowercase-crylic.Bug-7126` in directory
'sql/test/BugTracker-2021` itself:
+stderr of test 'lowercase-cryllic.Bug-7126` in directory
'sql/test/BugTracker-2021` itself:
# 15:33:54 >
diff --git
a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
b/sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.out
rename from sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
rename to sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.out
--- a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
+++ b/sql/test/BugTracker-2021/Tests/lowercase-cryllic.Bug-7126.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'lowercase-crylic.Bug-7126` in directory
'sql/test/BugTracker-2021` itself:
+stdout of test 'lowercase-cryllic.Bug-7126` in directory
'sql/test/BugTracker-2021` itself:
# 15:33:54 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
