Changeset: d04a59d1b9a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d04a59d1b9a9
Added Files:
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.err
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2015/Tests/All
Branch: Jul2015
Log Message:
fixed bug 3818, ie crash n the reduce groupby optimizer
diffs (151 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
@@ -4437,7 +4437,7 @@ rel_reduce_groupby_exps(int *changes, mv
for (n = rel->exps->h; n; n = n->next) {
sql_exp *e = n->data, *ne = NULL;
- if (is_column(e->type)) {
+ if (e->type == e_column) {
if (e->l)
ne =
exps_bind_column2(dgbe, e->l, e->r);
else
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -65,4 +65,5 @@ string_split.Bug-3564
not-like-without-wildcard.Bug-3811
copy_into.Bug-3813
select-tilde-arg.Bug-3814
+crash_in_reduce_groupby.Bug-3818
case_type.Bug-3821
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql
@@ -0,0 +1,18 @@
+
+ CREATE TABLE t1a (cods int, elrik int, ether int, jaelen int, otter int,
sora int);
+ CREATE TABLE t2a (tib0 int);
+
+ SELECT cods, elrik, ether, jaelen, sora, SUM(otter)
+ FROM t1a
+ GROUP BY cods, elrik, ether, jaelen, sora
+ UNION ALL
+ SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
+ FROM t2a
+ GROUP BY cods, elrik, ether, jaelen, sora;
+
+SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
+ FROM t2a
+GROUP BY cods, elrik, ether, jaelen, sora;
+
+drop table t2a;
+drop table t1a;
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.err
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'crash_in_reduce_groupby.Bug-3818` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 11:28:41 >
+# 11:28:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34815" "--set"
"mapi_usock=/var/tmp/mtest-10633/.s.monetdb.34815" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 11:28:41 >
+
+# builtin opt gdk_dbpath =
/scratch/niels/build/rc/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 = 34815
+# cmdline opt mapi_usock = /var/tmp/mtest-10633/.s.monetdb.34815
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 11:28:41 >
+# 11:28:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10633" "--port=34815"
+# 11:28:41 >
+
+
+# 11:28:42 >
+# 11:28:42 > "Done."
+# 11:28:42 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
@@ -0,0 +1,60 @@
+stdout of test 'crash_in_reduce_groupby.Bug-3818` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 11:28:41 >
+# 11:28:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34815" "--set"
"mapi_usock=/var/tmp/mtest-10633/.s.monetdb.34815" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 11:28:41 >
+
+# MonetDB 5 server v11.21.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.586 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://rocks101.scilens.private:34815/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10633/.s.monetdb.34815
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.45'
+# Finished reading the write-ahead log 'sql_logs/sql/log.45'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 11:28:41 >
+# 11:28:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10633" "--port=34815"
+# 11:28:41 >
+
+#CREATE TABLE t1a (cods int, elrik int, ether int, jaelen int, otter int, sora
int);
+#CREATE TABLE t2a (tib0 int);
+#SELECT cods, elrik, ether, jaelen, sora, SUM(otter)
+# FROM t1a
+# GROUP BY cods, elrik, ether, jaelen, sora
+# UNION ALL
+# SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
+# FROM t2a
+# GROUP BY cods, elrik, ether, jaelen, sora;
+% .L2, .L2, .L2, .L2, .L2, .L2 # table_name
+% cods, elrik, ether, jaelen, sora, L1 # name
+% int, int, int, int, int, hugeint # type
+% 1, 1, 1, 1, 1, 1 # length
+[ 0, 0, 0, 0, 0, NULL ]
+#SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
+# FROM t2a
+#GROUP BY cods, elrik, ether, jaelen, sora;
+% .L, .L, .L, .L, .L, sys.L1 # table_name
+% cods, elrik, ether, jaelen, sora, L1 # name
+% tinyint, tinyint, tinyint, tinyint, tinyint,
hugeint # type
+% 1, 1, 1, 1, 1, 40 # length
+[ 0, 0, 0, 0, 0, NULL ]
+#drop table t2a;
+#drop table t1a;
+
+# 11:28:42 >
+# 11:28:42 > "Done."
+# 11:28:42 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
