Changeset: 936301a9a4f3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=936301a9a4f3
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err
sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out
Branch: Dec2016
Log Message:
fixed bug 6080, ie dead code elimination removed all columns.
diffs (116 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
@@ -5637,8 +5637,14 @@ exps_mark_used(sql_allocator *sa, sql_re
int len = list_length(rel->exps), i;
sql_exp **exps = SA_NEW_ARRAY(sa, sql_exp*, len);
- for (n=rel->exps->h, i = 0; n; n = n->next, i++)
- exps[i] = n->data;
+ for (n=rel->exps->h, i = 0; n; n = n->next, i++) {
+ sql_exp *e = exps[i] = n->data;
+
+ nr += e->used;
+ }
+
+ if (!nr && is_project(rel->op)) /* project atleast one column */
+ exps[0]->used = 1;
for (i = len-1; i >= 0; i--) {
sql_exp *e = exps[i];
diff --git
a/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err
b/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err
--- a/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err
+++ b/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err
@@ -1,1 +1,34 @@
-no crash
+stderr of test 'rel2bin_project-assert.Bug-6080` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 12:38:27 >
+# 12:38:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30365" "--set"
"mapi_usock=/var/tmp/mtest-30673/.s.monetdb.30365" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 12:38:27 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/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 = 30365
+# cmdline opt mapi_usock = /var/tmp/mtest-30673/.s.monetdb.30365
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 12:38:28 >
+# 12:38:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30673" "--port=30365"
+# 12:38:28 >
+
+
+# 12:38:28 >
+# 12:38:28 > "Done."
+# 12:38:28 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out
b/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out
--- a/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out
+++ b/sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out
@@ -1,1 +1,52 @@
-no crash
+stdout of test 'rel2bin_project-assert.Bug-6080` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 12:38:27 >
+# 12:38:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30365" "--set"
"mapi_usock=/var/tmp/mtest-30673/.s.monetdb.30365" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 12:38:27 >
+
+# MonetDB 5 server v11.25.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.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:30365/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30673/.s.monetdb.30365
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:38:28 >
+# 12:38:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30673" "--port=30365"
+# 12:38:28 >
+
+#select
+# 64 as c0
+#from
+# (select distinct
+# 68 as c0
+# from
+# tmp.keys as ref_0
+# inner join sys.args as ref_1
+# right join sys.geometry_columns as ref_2
+# on (ref_1.id = ref_2.srid )
+# left join sys.netcdf_dims as ref_12
+# right join sys.args as ref_13
+# on (ref_12.name = ref_13.name )
+# on (ref_1.id = ref_13.id )
+# on (ref_0.action = ref_13.id )
+# where (ref_2.f_geometry_column is not NULL)
+# and (false)) as subq_0
+% .L122 # table_name
+% c0 # name
+% tinyint # type
+% 1 # length
+
+# 12:38:28 >
+# 12:38:28 > "Done."
+# 12:38:28 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
