Changeset: 336fa5aa932e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=336fa5aa932e
Added Files:
sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.sql
sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.err
sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2013/Tests/All
Branch: Feb2013
Log Message:
fixed bug 3885. If we are unable to resolve a unop, try an
aggregate function before returning an error.
diffs (156 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
@@ -3264,6 +3264,7 @@ rel_unop_(mvc *sql, sql_exp *e, sql_sche
}
static sql_exp * _rel_aggr(mvc *sql, sql_rel **rel, int distinct, sql_schema
*s, char *aname, dnode *arguments, int f);
+static sql_exp *rel_aggr(mvc *sql, sql_rel **rel, symbol *se, int f);
static sql_exp *
rel_unop(mvc *sql, sql_rel **rel, symbol *se, int fs, exp_kind ek)
@@ -3278,8 +3279,12 @@ rel_unop(mvc *sql, sql_rel **rel, symbol
sql_subtype *t = NULL;
int type = (ek.card == card_none)?F_PROC:F_FUNC;
- if (!e)
- return NULL;
+ if (!e) { /* 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)
@@ -3769,15 +3774,19 @@ static sql_exp *
rel_aggr(mvc *sql, sql_rel **rel, symbol *se, int f)
{
dlist *l = se->data.lval;
- int distinct = l->h->next->data.i_val;
+ dnode *d = l->h->next;
+ int distinct = 0;
char *aname = qname_fname(l->h->data.lval);
char *sname = qname_schema(l->h->data.lval);
sql_schema *s = sql->session->schema;
- assert(l->h->next->type == type_int);
+ if (l->h->next->type == type_int) {
+ distinct = l->h->next->data.i_val;
+ d = l->h->next->next;
+ }
if (sname)
s = mvc_bind_schema(sql, sname);
- return _rel_aggr( sql, rel, distinct, s, aname, l->h->next->next, f);
+ return _rel_aggr( sql, rel, distinct, s, aname, d, f);
}
static sql_exp *
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -50,3 +50,4 @@ env_errors.Bug-3370
swapped_likejoin.Bug-3375
python-explain.Bug-3380
case-orderby.Bug-3388
+unop_vs_aggr.Bug-3885
diff --git a/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.sql
b/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.sql
@@ -0,0 +1,5 @@
+create table err_stddev2(col1 double);
+insert into err_stddev2 values(2.4);
+insert into err_stddev2 values(2.6);
+SELECT sys.stddev_pop(col1) * sys.stddev_pop(col1) FROM err_stddev2;
+drop table err_stddev2;
diff --git a/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.err
b/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'unop_vs_aggr.Bug-3885` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 17:13:55 >
+# 17:13:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32330" "--set"
"mapi_usock=/var/tmp/mtest-29023/.s.monetdb.32330" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 17:13:55 >
+
+# 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 = yes
+# 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 = 32330
+# cmdline opt mapi_usock = /var/tmp/mtest-29023/.s.monetdb.32330
+# 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-2013
+# cmdline opt mal_listing = 0
+
+# 17:13:55 >
+# 17:13:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29023" "--port=32330"
+# 17:13:55 >
+
+
+# 17:13:55 >
+# 17:13:55 > "Done."
+# 17:13:55 >
+
diff --git a/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.out
b/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.out
@@ -0,0 +1,44 @@
+stdout of test 'unop_vs_aggr.Bug-3885` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 17:13:55 >
+# 17:13:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32330" "--set"
"mapi_usock=/var/tmp/mtest-29023/.s.monetdb.32330" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 17:13:55 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.775 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:32330/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29023/.s.monetdb.32330
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:13:55 >
+# 17:13:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29023" "--port=32330"
+# 17:13:55 >
+
+#create table err_stddev2(col1 double);
+#insert into err_stddev2 values(2.4);
+[ 1 ]
+#insert into err_stddev2 values(2.6);
+[ 1 ]
+#SELECT sys.stddev_pop(col1) * sys.stddev_pop(col1) FROM err_stddev2;
+% sys.L2 # table_name
+% sql_mul_L1 # name
+% double # type
+% 24 # length
+[ 0.01 ]
+#drop table err_stddev2;
+
+# 17:13:55 >
+# 17:13:55 > "Done."
+# 17:13:55 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
