Changeset: d4b01e89ac7a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4b01e89ac7a
Added Files:
sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql
sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err
sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2017/Tests/All
Branch: Dec2016
Log Message:
fixed bug 6201, ie handle group by in selection properly
diffs (135 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
@@ -4331,19 +4331,10 @@ rel_value_exp2(mvc *sql, sql_rel **rel,
exp_setname(sql->sa, ne,
exp_relname(e), exp_name(e));
e = ne;
} else if (f == sql_sel && is_project(p->op) &&
!is_processed(p)) {
- sql_rel *pp = p;
- if (p->l)
- pp = p->l;
- if (is_groupby(pp->op)) {
- pp->l =
rel_crossproduct(sql->sa, pp->l, r, op_join);
- e = rel_groupby_add_aggr(sql,
pp, e);
- } else if (p->l) {
+ if (p->l) {
p->l =
rel_crossproduct(sql->sa, p->l, r, op_join);
- } else if (!p->l) {
+ } else {
p->l = r;
- } else {
- assert(0);
- *rel =
rel_crossproduct(sql->sa, p, r, op_join);
}
} else {
*rel = rel_crossproduct(sql->sa, p, r,
op_join);
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -12,4 +12,5 @@ splitpart.Bug-6194
HAVE_HGE?cast-with-many-decimals.Bug-6195
union_func_crash.Bug-6196
complicated_logic.Bug-105
+crash_on_count_div_count.Bug-6201
oidx-on-strings.Bug-6202
diff --git
a/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql
b/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql
@@ -0,0 +1,5 @@
+create table t1 (c1 integer);
+insert into t1 values (1);
+select count(*) / (select count(*) from t1) as c2 from t1;
+select sum(c2) from (select count(*) / (select count(*) from t1) as c2 from
t1) as t;
+drop table t1;
diff --git
a/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err
b/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'crash_on_count_div_count.Bug-6201` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 22:55:15 >
+# 22:55:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36960" "--set"
"mapi_usock=/var/tmp/mtest-16137/.s.monetdb.36960" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 22:55:15 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/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 = 36960
+# cmdline opt mapi_usock = /var/tmp/mtest-16137/.s.monetdb.36960
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 22:55:15 >
+# 22:55:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16137" "--port=36960"
+# 22:55:15 >
+
+
+# 22:55:15 >
+# 22:55:15 > "Done."
+# 22:55:15 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.out
b/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.out
@@ -0,0 +1,47 @@
+stdout of test 'crash_on_count_div_count.Bug-6201` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 22:55:15 >
+# 22:55:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36960" "--set"
"mapi_usock=/var/tmp/mtest-16137/.s.monetdb.36960" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 22:55:15 >
+
+# MonetDB 5 server v11.26.0
+# 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.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:36960/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-16137/.s.monetdb.36960
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 22:55:15 >
+# 22:55:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16137" "--port=36960"
+# 22:55:15 >
+
+#create table t1 (c1 integer);
+#insert into t1 values (1);
+[ 1 ]
+#select count(*) / (select count(*) from t1) as c2 from t1;
+% .L10 # table_name
+% c2 # name
+% bigint # type
+% 1 # length
+[ 1 ]
+#select sum(c2) from (select count(*) / (select count(*) from t1) as c2 from
t1) as t;
+% .L14 # table_name
+% L13 # name
+% bigint # type
+% 1 # length
+[ 1 ]
+#drop table t1;
+
+# 22:55:15 >
+# 22:55:15 > "Done."
+# 22:55:15 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
