Changeset: cd7a4002c34d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd7a4002c34d
Added Files:
sql/test/bugs/Tests/select_select_bug.sql
sql/test/bugs/Tests/select_select_bug.stable.err
sql/test/bugs/Tests/select_select_bug.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/bugs/Tests/All
Branch: Jun2016
Log Message:
fix problem with select (select x), ...
diffs (120 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
@@ -4124,7 +4124,12 @@ rel_value_exp2(mvc *sql, sql_rel **rel,
/* in the selection phase we should have
project/groupbys, unless
* this is the value (column) for the
aggregation then the
* crossproduct is pushed under the
project/groupby. */
- if (f == sql_sel && is_project(p->op) &&
!is_processed(p)) {
+ if (f == sql_sel && r->op == op_project &&
list_length(r->exps) == 1 && exps_are_atoms(r->exps)) {
+ sql_exp *ne = r->exps->h->data;
+
+ 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;
diff --git a/sql/test/bugs/Tests/All b/sql/test/bugs/Tests/All
--- a/sql/test/bugs/Tests/All
+++ b/sql/test/bugs/Tests/All
@@ -108,3 +108,4 @@ apply_with_union_assertion
cur_date_crash-JIRA-42
WHERE_and_multiple_LEFT_JOIN_incorrect_results-JIRA-43
WHERE_IN_subquery_incorrect_results-JIRA-44
+select_select_bug
diff --git a/sql/test/bugs/Tests/select_select_bug.sql
b/sql/test/bugs/Tests/select_select_bug.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/select_select_bug.sql
@@ -0,0 +1,5 @@
+CREATE TABLE vessels (implicit_timestamp timestamp, mmsi int, lat real, lon
real, nav_status tinyint, cog real, sog real, true_heading smallint, rotais
smallint);
+SELECT (SELECT current_timestamp), count(DISTINCT mmsi) FROM vessels;
+drop table vessels;
+
+
diff --git a/sql/test/bugs/Tests/select_select_bug.stable.err
b/sql/test/bugs/Tests/select_select_bug.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/select_select_bug.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'select_select_bug` in directory 'sql/test/bugs` itself:
+
+
+# 19:07:43 >
+# 19:07:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34274" "--set"
"mapi_usock=/var/tmp/mtest-17024/.s.monetdb.34274" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_bugs"
"--set" "embedded_r=yes"
+# 19:07:43 >
+
+# 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 = 34274
+# cmdline opt mapi_usock = /var/tmp/mtest-17024/.s.monetdb.34274
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_bugs
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 19:07:43 >
+# 19:07:43 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17024" "--port=34274"
+# 19:07:43 >
+
+
+# 19:07:43 >
+# 19:07:43 > "Done."
+# 19:07:43 >
+
diff --git a/sql/test/bugs/Tests/select_select_bug.stable.out
b/sql/test/bugs/Tests/select_select_bug.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/select_select_bug.stable.out
@@ -0,0 +1,40 @@
+stdout of test 'select_select_bug` in directory 'sql/test/bugs` itself:
+
+
+# 19:07:43 >
+# 19:07:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34274" "--set"
"mapi_usock=/var/tmp/mtest-17024/.s.monetdb.34274" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_bugs"
"--set" "embedded_r=yes"
+# 19:07:43 >
+
+# MonetDB 5 server v11.23.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_bugs', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:34274/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17024/.s.monetdb.34274
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 19:07:43 >
+# 19:07:43 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17024" "--port=34274"
+# 19:07:43 >
+
+#CREATE TABLE vessels (implicit_timestamp timestamp, mmsi int, lat real, lon
real, nav_status tinyint, cog real, sog real, true_heading smallint, rotais
smallint);
+#SELECT (SELECT current_timestamp), count(DISTINCT mmsi) FROM vessels;
+% .L1, sys.L2 # table_name
+% L1, L2 # name
+% timestamptz, wrd # type
+% 32, 1 # length
+[ 2016-07-05 19:07:43.000000+02:00, 0 ]
+#drop table vessels;
+
+# 19:07:43 >
+# 19:07:43 > "Done."
+# 19:07:43 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
