Changeset: 7e5a294af159 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e5a294af159
Added Files:
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.sql
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.err
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
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
sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.sql
sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.err
sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out
Modified Files:
gdk/gdk_aggr.c
monetdb5/modules/kernel/algebra.c
sql/backends/monet5/sql_statement.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/test/BugTracker-2014/Tests/All
sql/test/Dependencies/Tests/Dependencies_bam.stable.out
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 724 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2634,7 +2634,7 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
} while (0)
static dbl
-calcvariance(dbl *avgp, const void *values, BUN cnt, int tp, int issample)
+calcvariance(dbl *avgp, const void *values, BUN cnt, int tp, int issample,
const char *func)
{
BUN n = 0, i;
dbl mean = 0;
@@ -2674,6 +2674,8 @@ calcvariance(dbl *avgp, const void *valu
AGGR_STDEV_SINGLE(dbl);
break;
default:
+ GDKerror("%s: type (%s) not supported.\n",
+ func, ATOMname(tp));
return dbl_nil;
}
if (n <= (BUN) issample) {
@@ -2690,7 +2692,8 @@ dbl
BATcalcstdev_population(dbl *avgp, BAT *b)
{
dbl v = calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 0);
+ BATcount(b), b->ttype, 0,
+ "BATcalcstdev_population");
return v == dbl_nil ? dbl_nil : sqrt(v);
}
@@ -2698,7 +2701,8 @@ dbl
BATcalcstdev_sample(dbl *avgp, BAT *b)
{
dbl v = calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 1);
+ BATcount(b), b->ttype, 1,
+ "BATcalcstdev_sample");
return v == dbl_nil ? dbl_nil : sqrt(v);
}
@@ -2706,14 +2710,16 @@ dbl
BATcalcvariance_population(dbl *avgp, BAT *b)
{
return calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 0);
+ BATcount(b), b->ttype, 0,
+ "BATcalcvariance_population");
}
dbl
BATcalcvariance_sample(dbl *avgp, BAT *b)
{
return calcvariance(avgp, (const void *) Tloc(b, BUNfirst(b)),
- BATcount(b), b->ttype, 1);
+ BATcount(b), b->ttype, 1,
+ "BATcalcvariance_sample");
}
#define AGGR_STDEV(TYPE) \
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -2177,7 +2177,7 @@ ALGstdev(dbl *res, const bat *bid)
throw(MAL, "aggr.stdev", RUNTIME_OBJECT_MISSING);
stdev = BATcalcstdev_sample(NULL, b);
BBPreleaseref(b->batCacheid);
- if (stdev == dbl_nil)
+ if (stdev == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.stdev", SEMANTIC_TYPE_MISMATCH);
*res = stdev;
return MAL_SUCCEED;
@@ -2193,7 +2193,7 @@ ALGstdevp(dbl *res, const bat *bid)
throw(MAL, "aggr.stdevp", RUNTIME_OBJECT_MISSING);
stdev = BATcalcstdev_population(NULL, b);
BBPreleaseref(b->batCacheid);
- if (stdev == dbl_nil)
+ if (stdev == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.stdevp", SEMANTIC_TYPE_MISMATCH);
*res = stdev;
return MAL_SUCCEED;
@@ -2212,7 +2212,7 @@ ALGvariance(dbl *res, const bat *bid)
throw(MAL, "aggr.variance", RUNTIME_OBJECT_MISSING);
variance = BATcalcvariance_sample(NULL, b);
BBPreleaseref(b->batCacheid);
- if (variance == dbl_nil)
+ if (variance == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.variance", SEMANTIC_TYPE_MISMATCH);
*res = variance;
return MAL_SUCCEED;
@@ -2228,7 +2228,7 @@ ALGvariancep(dbl *res, const bat *bid)
throw(MAL, "aggr.variancep", RUNTIME_OBJECT_MISSING);
variance = BATcalcvariance_population(NULL, b);
BBPreleaseref(b->batCacheid);
- if (variance == dbl_nil)
+ if (variance == dbl_nil && GDKerrbuf && GDKerrbuf[0])
throw(MAL, "aggr.variancep", SEMANTIC_TYPE_MISMATCH);
*res = variance;
return MAL_SUCCEED;
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1655,7 +1655,11 @@ stmt_if(sql_allocator *sa, stmt *cond, s
list_append(l, ifstmts);
list_append(l, stmt_control_end(sa, cstmt));
if (elsestmts) {
- cond = stmt_unop(sa, cond, not);
+ sql_subfunc *or = sql_bind_func(sa, NULL, "or", bt, bt, F_FUNC);
+ sql_subfunc *isnull = sql_bind_func(sa, NULL, "isnull", bt,
NULL, F_FUNC);
+ cond = stmt_binop(sa,
+ stmt_unop(sa, cond, not),
+ stmt_unop(sa, cond, isnull), or);
list_append(l, cstmt = stmt_cond(sa, cond, NULL, 0));
list_append(l, elsestmts);
list_append(l, stmt_control_end(sa, cstmt));
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -215,10 +215,11 @@ psm_if_then_else( mvc *sql, sql_subtype
{
if (!elseif)
return NULL;
- if (elseif->next && elseif->type == type_symbol) { /* if or elseif */
+ assert(elseif->type == type_symbol);
+ if (elseif->data.sym && elseif->data.sym->token == SQL_IF) {
sql_exp *cond;
list *ifstmts, *elsestmts;
- dnode *n = elseif;
+ dnode *n = elseif->data.sym->data.lval->h;
sql_rel *rel = NULL;
cond = rel_logical_value_exp(sql, &rel, n->data.sym, sql_sel);
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
@@ -3594,17 +3594,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)
@@ -3836,22 +3841,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';
@@ -4640,12 +4650,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
@@ -56,3 +56,7 @@ orderby_column_exp.Bug-3620
typecast_error.Bug-3622
case-sqrt.Bug-3627
column-with-comma.Bug-3616
+stddev-empty.Bug-3628
+ifthenelse.Bug-3629
+order_by_incorrect_error.Bug-3630
+
diff --git a/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.sql
b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.sql
@@ -0,0 +1,13 @@
+START TRANSACTION;
+CREATE FUNCTION test(b1 BOOLEAN)
+RETURNS INTEGER
+BEGIN
+ IF b1 THEN RETURN 1;
+ ELSEIF NOT(b1) THEN RETURN 0;
+ ELSE RETURN NULL;
+ END IF;
+END;
+SELECT test(true), test(false), test(null);
+select test(true);
+select test(false);
+select test(null);
diff --git a/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.err
b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'ifthenelse.Bug-3629` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 18:33:32 >
+# 18:33:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36196" "--set"
"mapi_usock=/var/tmp/mtest-3090/.s.monetdb.36196" "--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:33:32 >
+
+# 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 = 36196
+# cmdline opt mapi_usock = /var/tmp/mtest-3090/.s.monetdb.36196
+# 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:33:32 >
+# 18:33:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3090" "--port=36196"
+# 18:33:32 >
+
+
+# 18:33:32 >
+# 18:33:32 > "Done."
+# 18:33:32 >
+
diff --git a/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
@@ -0,0 +1,65 @@
+stdout of test 'ifthenelse.Bug-3629` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 18:33:32 >
+# 18:33:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36196" "--set"
"mapi_usock=/var/tmp/mtest-3090/.s.monetdb.36196" "--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:33:32 >
+
+# 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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
