Changeset: 44aa50bb3051 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44aa50bb3051
Added Files:
sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.sql
sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.err
sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:
fixed bug 3630 and added a test
diffs (228 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
@@ -3503,17 +3503,22 @@ rel_unop(mvc *sql, sql_rel **rel, symbol
sql_subtype *t = NULL;
int type = (ek.card == card_none)?F_PROC:F_FUNC;
- if (!e) { /* possibly we cannot resolve the argument as the function
maybe an aggregate */
+ if (sname)
+ s = mvc_bind_schema(sql, sname);
+
+ if (!s)
+ return NULL;
+ if (!e)
+ f = find_func(sql, s, fname, 1, F_AGGR);
+ if (!e && f) { /* possibly we cannot resolve the argument as the
function maybe an aggregate */
/* reset error */
sql->session->status = 0;
sql->errstr[0] = '\0';
return rel_aggr(sql, rel, se, fs);
}
-
- if (sname)
- s = mvc_bind_schema(sql, sname);
- if (!s)
- s = sql->session->schema;
+ if (!e)
+ return NULL;
+
t = exp_subtype(e);
f = bind_func(sql, s, fname, t, NULL, type);
if (!f)
@@ -3745,22 +3750,27 @@ rel_binop(mvc *sql, sql_rel **rel, symbo
sql_schema *s = sql->session->schema;
exp_kind iek = {type_value, card_column, FALSE};
int type = (ek.card == card_none)?F_PROC:F_FUNC;
+ sql_subfunc *sf = NULL;
+
+ if (sname)
+ s = mvc_bind_schema(sql, sname);
+ if (!s)
+ return NULL;
l = rel_value_exp(sql, rel, dl->next->data.sym, f, iek);
r = rel_value_exp(sql, rel, dl->next->next->data.sym, f, iek);
- if (!l && !r) { /* possibly we cannot resolve the argument as the
function maybe an aggregate */
+ if (!l && !r)
+ sf = find_func(sql, s, fname, 2, F_AGGR);
+ if (!l && !r && sf) { /* possibly we cannot resolve the argument as the
function maybe an aggregate */
/* reset error */
sql->session->status = 0;
sql->errstr[0] = '\0';
return rel_aggr(sql, rel, se, f);
}
- if (sname)
- s = mvc_bind_schema(sql, sname);
-
if (type == F_FUNC) {
- sql_subfunc *func = find_func(sql, s, fname, 2, F_AGGR);
- if (func) {
+ sf = find_func(sql, s, fname, 2, F_AGGR);
+ if (sf) {
if (!l || !r) { /* reset error */
sql->session->status = 0;
sql->errstr[0] = '\0';
@@ -4549,12 +4559,12 @@ rel_order_by_column_exp(mvc *sql, sql_re
if (r && or != r)
(*R)->l = r;
/* add to internal project */
- if (is_processed(r) && e) {
+ if (e && is_processed(r)) {
rel_project_add_exp(sql, r, e);
e = rel_lastexp(sql, r);
}
/* try with reverted aliases */
- if (!e && sql->session->status != -ERR_AMBIGUOUS) {
+ if (!e && r && sql->session->status != -ERR_AMBIGUOUS) {
sql_rel *nr = rel_project(sql->sa, r,
rel_projections_(sql, r));
/* reset error */
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
@@ -54,3 +54,4 @@ orderby_column_exp.Bug-3620
case-sqrt.Bug-3627
column-with-comma.Bug-3616
stddev-empty.Bug-3628
+order_by_incorrect_error.Bug-3630
diff --git
a/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.sql
b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.sql
@@ -0,0 +1,38 @@
+
+CREATE TABLE "sys"."sirivm" (
+"vehiclenumber" INTEGER,
+"recordedattime" TIMESTAMP,
+"linkdistance" INTEGER,
+"percentage" DECIMAL(5,2),
+"lineref" CHARACTER LARGE OBJECT,
+"dataframeref" CHARACTER LARGE OBJECT,
+"datedvehiclejourneyref" CHARACTER LARGE OBJECT,
+"monitored" BOOLEAN,
+"mon_error" CHARACTER LARGE OBJECT,
+"blockref" CHARACTER LARGE OBJECT,
+"delay" INTEGER,
+"lon" DOUBLE,
+"lat" DOUBLE,
+"laststopref" CHARACTER LARGE OBJECT,
+"laststoporder" INTEGER,
+"lastaimedarr" TIMESTAMP,
+"lastaimeddep" TIMESTAMP,
+"monstopref" CHARACTER LARGE OBJECT,
+"monstoporder" INTEGER,
+"monaimedarr" TIMESTAMP,
+"monaimeddep" TIMESTAMP,
+"monatstop" CHARACTER LARGE OBJECT,
+"monexpectedarr" TIMESTAMP,
+"monexpecteddep" TIMESTAMP,
+"nextstopref" CHARACTER LARGE OBJECT,
+"nextstoporder" INTEGER,
+"nextaimedarr" TIMESTAMP,
+"nextaimeddep" TIMESTAMP,
+"nextexpectedarr" TIMESTAMP,
+"nextexpecteddep" TIMESTAMP,
+"journeypattern" CHARACTER LARGE OBJECT
+);
+select a.recordedattime, a.monexpectedarr, a.monexpecteddep, a.monaimedarr,
b.monaimeddep, a.delay, b.delay, (b.recordedattime - a.monaimedarr)/1000 as
ourdelay, b.recordedattime, b.monexpectedarr, b.monexpecteddep, monstopref
from sirivm as a join sirivm as b using (vehiclenumber, lineref,
datedvehiclejourneyref, monstopref) where a.monatstop = 'false' and b.monatstop
= 'true' order by abs(ourdelay) desc limit 10;
+
+drop TABLE "sys"."sirivm";
+
diff --git
a/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.err
b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'order_by_incorrect_error.Bug-3630` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 15:51:45 >
+# 15:51:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30753" "--set"
"mapi_usock=/var/tmp/mtest-25544/.s.monetdb.30753" "--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"
+# 15:51:45 >
+
+# 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 = 30753
+# cmdline opt mapi_usock = /var/tmp/mtest-25544/.s.monetdb.30753
+# 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
+
+# 15:51:46 >
+# 15:51:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25544" "--port=30753"
+# 15:51:46 >
+
+MAPI = (monetdb) /var/tmp/mtest-25544/.s.monetdb.30753
+QUERY = select a.recordedattime, a.monexpectedarr, a.monexpecteddep,
a.monaimedarr, b.monaimeddep, a.delay, b.delay, (b.recordedattime -
a.monaimedarr)/1000 as ourdelay, b.recordedattime, b.monexpectedarr,
b.monexpecteddep, monstopref from sirivm as a join sirivm as b using
(vehiclenumber, lineref, datedvehiclejourneyref, monstopref) where a.monatstop
= 'false' and b.monatstop = 'true' order by abs(ourdelay) desc limit 10;
+ERROR = !SELECT: identifier 'ourdelay' unknown
+
+# 15:51:46 >
+# 15:51:46 > "Done."
+# 15:51:46 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out
b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out
@@ -0,0 +1,46 @@
+stdout of test 'order_by_incorrect_error.Bug-3630` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 15:51:45 >
+# 15:51:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30753" "--set"
"mapi_usock=/var/tmp/mtest-25544/.s.monetdb.30753" "--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"
+# 15:51:45 >
+
+# 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.333 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:30753/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-25544/.s.monetdb.30753
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 15:51:46 >
+# 15:51:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25544" "--port=30753"
+# 15:51:46 >
+
+#CREATE TABLE "sys"."sirivm" (
+#"vehiclenumber" INTEGER,
+#"recordedattime" TIMESTAMP,
+#"linkdistance" INTEGER,
+#"percentage" DECIMAL(5,2),
+#"lineref" CHARACTER LARGE OBJECT,
+#"dataframeref" CHARACTER LARGE OBJECT,
+#"datedvehiclejourneyref" CHARACTER LARGE OBJECT,
+#"monitored" BOOLEAN,
+#"mon_error" CHARACTER LARGE OBJECT,
+#"blockref" CHARACTER LARGE OBJECT,
+#"delay" INTEGER,
+#"lon" DOUBLE,
+#drop TABLE "sys"."sirivm";
+
+# 15:51:46 >
+# 15:51:46 > "Done."
+# 15:51:46 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
