Changeset: 9dbd05ca313b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9dbd05ca313b
Added Files:
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out
Modified Files:
sql/server/rel_select.c
Branch: Jul2017
Log Message:
fix bug 6416, make sure we handle a wrapping select and project in the
groupby/aggregate code.
diffs (129 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
@@ -3386,7 +3386,7 @@ static sql_exp *
exp_kind ek = {type_value, card_column, FALSE};
sql_subaggr *a = NULL;
int no_nil = 0;
- sql_rel *groupby = *rel, *gr;
+ sql_rel *groupby = *rel, *gr, *project = NULL;
list *exps = NULL;
if (!groupby) {
@@ -3403,6 +3403,8 @@ static sql_exp *
if (groupby->l && groupby->op == op_project) {
sql_rel *r = groupby->l;
+ if (f == sql_having)
+ project = groupby;
if (r->op == op_groupby) {
groupby = r;
} else if (r->op == op_select && r->l) {
@@ -3442,7 +3444,11 @@ static sql_exp *
e = exp_aggr(sql->sa, NULL, a, distinct, 0, groupby->card, 0);
if (*rel == groupby && f == sql_sel) /* selection */
return e;
- return rel_groupby_add_aggr(sql, groupby, e);
+ if (!project)
+ return rel_groupby_add_aggr(sql, groupby, e);
+ e = rel_groupby_add_aggr(sql, groupby, e);
+ rel_project_add_exp(sql, project, e);
+ return e;
}
exps = sa_list(sql->sa);
@@ -3562,8 +3568,11 @@ static sql_exp *
if (a && execute_priv(sql,a->aggr)) {
sql_exp *e = exp_aggr(sql->sa, exps, a, distinct, no_nil,
groupby->card, have_nil(exps));
- if (*rel != groupby || f != sql_sel) /* selection */
+ if (*rel != groupby || f != sql_sel) { /* selection */
e = rel_groupby_add_aggr(sql, groupby, e);
+ if (project)
+ rel_project_add_exp(sql, project, e);
+ }
return e;
} else {
sql_exp *e;
diff --git
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-aggregation-not-in.Bug-6416` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:27:45 >
+# 14:27:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37210" "--set"
"mapi_usock=/var/tmp/mtest-31983/.s.monetdb.37210" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:27:45 >
+
+# 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 = 37210
+# cmdline opt mapi_usock = /var/tmp/mtest-31983/.s.monetdb.37210
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 14:27:45 >
+# 14:27:45 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31983" "--port=37210"
+# 14:27:45 >
+
+
+# 14:27:45 >
+# 14:27:45 > "Done."
+# 14:27:45 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out
@@ -0,0 +1,38 @@
+stdout of test 'sqlitelogictest-aggregation-not-in.Bug-6416` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:27:45 >
+# 14:27:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37210" "--set"
"mapi_usock=/var/tmp/mtest-31983/.s.monetdb.37210" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:27:45 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.330 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:37210/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31983/.s.monetdb.37210
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:27:45 >
+# 14:27:45 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31983" "--port=37210"
+# 14:27:45 >
+
+#CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#SELECT ALL - 89 FROM tab2 GROUP BY col1, col1 HAVING - CAST ( NULL AS INTEGER
) * + - 17 + + - COUNT ( * ) NOT IN ( + MAX ( 44 ) );
+% .L2 # table_name
+% L2 # name
+% tinyint # type
+% 1 # length
+#DROP TABLE tab2;
+
+# 14:27:45 >
+# 14:27:45 > "Done."
+# 14:27:45 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
