Changeset: d8a3ac8e4d55 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8a3ac8e4d55
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
Modified Files:
sql/server/rel_select.c
Branch: Jul2017
Log Message:
handle multiple aggregates in an in expression in the selection
fixes bug 6523
diffs (125 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
@@ -2158,10 +2158,16 @@ rel_logical_value_exp(mvc *sql, sql_rel
else
return NULL;
}
- z = NULL;
- } else {
- r = NULL;
+ } else if (r) {
+ sql_rel *gp = z->l;
+ rel_project_add_exp(sql, z, r);
+ reset_processed(gp);
+ r = exp_column(sql->sa,
exp_relname(r), exp_name(r), exp_subtype(r), r->card, has_nil(r), is_intern(r));
+ if (outer)
+ outer->l = z;
+ left = z;
}
+ z = NULL;
}
if (!l || !r || (z && !(r=rel_check_type(sql,
st, r, type_equal)))) {
rel_destroy(right);
@@ -3558,6 +3564,11 @@ static sql_exp *
if (groupby->l && groupby->op == op_project) {
sql_rel *r = groupby->l;
+ if (!is_processed(r) && f == sql_sel && r->op == op_project) {
+ project = r;
+ r = r->l;
+ }
+
if (f == sql_having)
project = groupby;
if (f == sql_having && r->op == op_select && r->l)
@@ -3571,7 +3582,7 @@ static sql_exp *
groupby = r;
}
- if (groupby->op != op_groupby) /* implicit groupby */
+ if (groupby->op != op_groupby) /* implicit groupby */
*rel = rel_project2groupby(sql, groupby);
if (!*rel)
return NULL;
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-case-subquery-missing.Bug-6523` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 23:19:10 >
+# 23:19:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35344" "--set"
"mapi_usock=/var/tmp/mtest-28683/.s.monetdb.35344" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 23:19:10 >
+
+# 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 = 35344
+# cmdline opt mapi_usock = /var/tmp/mtest-28683/.s.monetdb.35344
+# 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
+
+# 23:19:11 >
+# 23:19:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28683" "--port=35344"
+# 23:19:11 >
+
+
+# 23:19:11 >
+# 23:19:11 > "Done."
+# 23:19:11 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
@@ -0,0 +1,37 @@
+stdout of test 'sqlitelogictest-case-subquery-missing.Bug-6523` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 23:19:10 >
+# 23:19:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35344" "--set"
"mapi_usock=/var/tmp/mtest-28683/.s.monetdb.35344" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 23:19:10 >
+
+# 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:35344/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28683/.s.monetdb.35344
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 23:19:11 >
+# 23:19:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28683" "--port=35344"
+# 23:19:11 >
+
+#SELECT CASE WHEN 18 IN ( AVG ( + 12 ) + - + ( - 29 ) + - SUM ( + + 53 ) * - (
73 ) ) THEN NULL WHEN ( - COUNT ( * ) * - SUM ( DISTINCT 80 ) ) IS NOT NULL
THEN 15 END + CASE 27 WHEN - 68 * + CAST ( COALESCE ( 42, + 57 * 20 ) AS
INTEGER ) THEN + 11 * 11 + - CASE - 16 + 25 WHEN 37 + 24 THEN 51 + 41 END / 4
END * + 0 AS col1;
+% .L15 # table_name
+% col1 # name
+% int # type
+% 1 # length
+[ NULL ]
+
+# 23:19:11 >
+# 23:19:11 > "Done."
+# 23:19:11 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
