Changeset: 4d9b69cdf41d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d9b69cdf41d
Added Files:
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/server/rel_select.c
Branch: Jul2017
Log Message:
fixes for bug 6526, handle combination of aggregation in a case statement (in
the having part).
diffs (189 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
@@ -5807,6 +5807,18 @@ static void
exps_mark_used(sql_allocator *sa, sql_rel *rel, sql_rel *subrel)
{
int nr = 0;
+
+ if (rel->r && (rel->op == op_project || rel->op == op_groupby)) {
+ list *l = rel->r;
+ node *n;
+
+ for (n=l->h; n; n = n->next) {
+ sql_exp *e = n->data;
+
+ exp_mark_used(rel, e);
+ }
+ }
+
if (rel->exps) {
node *n;
int len = list_length(rel->exps), i;
@@ -5843,7 +5855,7 @@ exps_mark_used(sql_allocator *sa, sql_re
for (n=l->h; n; n = n->next) {
sql_exp *e = n->data;
- exp_mark_used(rel, e);
+ // exp_mark_used(rel, e);
/* possibly project/groupby uses columns from the inner
*/
exp_mark_used(subrel, e);
}
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
@@ -3835,7 +3835,7 @@ rel_case(mvc *sql, sql_rel **rel, int to
return NULL;
cond = rel_binop_(sql, l, r, NULL, "=",
card_value);
} else {
- cond = rel_logical_value_exp(sql, rel,
when->h->data.sym, sql_sel);
+ cond = rel_logical_value_exp(sql, rel,
when->h->data.sym, f);
}
result = rel_value_exp(sql, rel,
when->h->next->data.sym, f, ek);
}
@@ -3874,9 +3874,9 @@ rel_case(mvc *sql, sql_rel **rel, int to
return NULL;
cond = rel_binop_(sql, l, r, NULL, "=",
card_value);
} else {
- cond = rel_logical_value_exp(sql, rel,
when->h->data.sym, sql_sel);
+ cond = rel_logical_value_exp(sql, rel,
when->h->data.sym, f);
}
- result = rel_value_exp(sql, rel,
when->h->next->data.sym, sql_sel, ek);
+ result = rel_value_exp(sql, rel,
when->h->next->data.sym, f, ek);
}
if (!cond || !result)
return NULL;
diff --git a/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err
b/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'aggr-in-case.Bug-6526` in directory 'sql/test/BugTracker-2018`
itself:
+
+
+# 18:07:27 >
+# 18:07:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35745" "--set"
"mapi_usock=/var/tmp/mtest-17690/.s.monetdb.35745" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 18:07:27 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-old/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 = 35745
+# cmdline opt mapi_usock = /var/tmp/mtest-17690/.s.monetdb.35745
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt gdk_debug = 553648138
+
+# 18:07:27 >
+# 18:07:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17690" "--port=35745"
+# 18:07:27 >
+
+
+# 18:07:27 >
+# 18:07:27 > "Done."
+# 18:07:27 >
+
diff --git a/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out
b/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out
@@ -0,0 +1,90 @@
+stdout of test 'aggr-in-case.Bug-6526` in directory 'sql/test/BugTracker-2018`
itself:
+
+
+# 18:07:27 >
+# 18:07:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35745" "--set"
"mapi_usock=/var/tmp/mtest-17690/.s.monetdb.35745" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 18:07:27 >
+
+# MonetDB 5 server v11.27.14
+# 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:35745/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17690/.s.monetdb.35745
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 18:07:27 >
+# 18:07:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17690" "--port=35745"
+# 18:07:27 >
+
+#start transaction;
+#create table "t1" (
+# "id" int,
+# "c1" varchar(100),
+# "d1" int,
+# "d2" int
+#);
+#insert into "t1" values
+#(1, 'A', 50, 80),
+#(2, 'A', 200, 350),
+#(3, 'A', 89, 125),
+#(4, 'B', 4845, 13),
+#(5, 'B', 194, 597),
+#(6, 'C', 5636, 5802),
+#(7, 'C', 375, 3405),
+#(7, 'D', 365, 0),
+#(7, 'D', 87, 0);
+[ 9 ]
+#select
+# "c1",
+# sum("d1") as "d1",
+# sum("d2") as "d2"
+#from "t1"
+#group by "c1"
+#having sum("d1") < case when 5 > 10 then 500 else 400 end;
+% sys.t1, sys.L4, sys.L7 # table_name
+% c1, d1, d2 # name
+% varchar, hugeint, hugeint # type
+% 1, 3, 3 # length
+[ "A", 339, 555 ]
+#select
+# "c1",
+# sum("d1")as "d1",
+# sum("d2") as "d2",
+# 1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else null
end) as "formula"
+#from "t1"
+#group by "c1";
+% sys.t1, sys.L4, sys.L7, sys.L14 # table_name
+% c1, d1, d2, formula # name
+% varchar, hugeint, hugeint, decimal # type
+% 1, 4, 4, 40 # length
+[ "A", 339, 555, 0.610 ]
+[ "B", 5039, 610, 8.260 ]
+[ "C", 6011, 9207, 0.652 ]
+[ "D", 452, 0, NULL ]
+#select
+# "c1",
+# sum("d1")as "d1",
+# sum("d2") as "d2",
+# 1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else null
end) as "formula"
+#from "t1"
+#group by "c1"
+#having (1.0 * sum("d1") / (1.0 * case when sum("d2") > 0 then sum("d2") else
null end)) > 1;
+% sys.t1, sys.L4, sys.L7, sys.L14 # table_name
+% c1, d1, d2, formula # name
+% varchar, hugeint, hugeint, decimal # type
+% 1, 4, 3, 40 # length
+[ "B", 5039, 610, 8.260 ]
+#rollback;
+
+# 18:07:27 >
+# 18:07:27 > "Done."
+# 18:07:27 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
