Changeset: 504294a644fd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=504294a644fd
Added Files:
sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.sql
sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.err
sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:
fixed bug in order with column expression ie bug 3620
diffs (112 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
@@ -4536,7 +4536,7 @@ rel_order_by_column_exp(mvc *sql, sql_re
if (!r)
return e;
- if (!is_project(r->op)) {
+ if (!is_project(r->op) || is_set(r->op)) {
r = rel_project(sql->sa, r, rel_projections(sql, r, NULL, 1,
1));
(*R)->l = r;
set_processed(r);
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -50,3 +50,4 @@ queueError.Bug-3604
querylog.Bug-3607
fk-property-assert.Bug-3612
hexadecimal_literals.Bug-3621
+orderby_column_exp.Bug-3620
diff --git a/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.sql
b/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.sql
@@ -0,0 +1,1 @@
+SELECT val FROM (SELECT 1 AS val UNION ALL SELECT 2) AS foo ORDER BY -val ASC;
diff --git
a/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.err
b/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'orderby_column_exp.Bug-3620` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 18:10:21 >
+# 18:10:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38539" "--set"
"mapi_usock=/var/tmp/mtest-668/.s.monetdb.38539" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:10:21 >
+
+# 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 = 38539
+# cmdline opt mapi_usock = /var/tmp/mtest-668/.s.monetdb.38539
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 18:10:22 >
+# 18:10:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-668" "--port=38539"
+# 18:10:22 >
+
+
+# 18:10:22 >
+# 18:10:22 > "Done."
+# 18:10:22 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.out
b/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'orderby_column_exp.Bug-3620` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 18:10:21 >
+# 18:10:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38539" "--set"
"mapi_usock=/var/tmp/mtest-668/.s.monetdb.38539" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:10:21 >
+
+# MonetDB 5 server v11.19.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.334 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:38539/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-668/.s.monetdb.38539
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 18:10:22 >
+# 18:10:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-668" "--port=38539"
+# 18:10:22 >
+
+#SELECT val FROM (SELECT 1 AS val UNION ALL SELECT 2) AS foo ORDER BY -val ASC;
+% .foo # table_name
+% val # name
+% tinyint # type
+% 1 # length
+[ 2 ]
+[ 1 ]
+
+# 18:10:22 >
+# 18:10:22 > "Done."
+# 18:10:22 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
