Changeset: 8390961e34a6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8390961e34a6
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_analytic_func.c
sql/backends/monet5/rel_bin.c
Branch: nilmask
Log Message:
Merge with default branch.
diffs (149 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -264,7 +264,7 @@ BAT *GDKanalyticallast(BAT *b, BAT *s, B
BAT *GDKanalyticallead(BAT *b, BAT *p, BUN lead, const void *restrict
default_value, int tpe) __attribute__((__warn_unused_result__));
BAT *GDKanalyticalmax(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int tpe, int
frame_type) __attribute__((__warn_unused_result__));
BAT *GDKanalyticalmin(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int tpe, int
frame_type) __attribute__((__warn_unused_result__));
-BAT *GDKanalyticalnthvalue(BAT *b, BAT *s, BAT *e, BAT *l, lng *nth, int tp1)
__attribute__((__warn_unused_result__));
+BAT *GDKanalyticalnthvalue(BAT *b, BAT *s, BAT *e, BAT *l, lng nth, int tp1)
__attribute__((__warn_unused_result__));
BAT *GDKanalyticalntile(BAT *b, BAT *p, BAT *n, int tpe, const void *restrict
ntile) __attribute__((__warn_unused_result__));
BAT *GDKanalyticalprod(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int tp1, int
tp2, int frame_type) __attribute__((__warn_unused_result__));
BAT *GDKanalyticalsum(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int tp1, int
tp2, int frame_type) __attribute__((__warn_unused_result__));
diff --git a/gdk/gdk_analytic.h b/gdk/gdk_analytic.h
--- a/gdk/gdk_analytic.h
+++ b/gdk/gdk_analytic.h
@@ -38,7 +38,7 @@ gdk_export BAT *GDKanalyticalfirst(BAT *
__attribute__((__warn_unused_result__));
gdk_export BAT *GDKanalyticallast(BAT *b, BAT *s, BAT *e, int tpe)
__attribute__((__warn_unused_result__));
-gdk_export BAT *GDKanalyticalnthvalue(BAT *b, BAT *s, BAT *e, BAT *l, lng
*nth, int tp1)
+gdk_export BAT *GDKanalyticalnthvalue(BAT *b, BAT *s, BAT *e, BAT *l, lng nth,
int tp1)
__attribute__((__warn_unused_result__));
gdk_export BAT *GDKanalyticalmin(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int
tpe, int frame_type)
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -421,7 +421,7 @@ GDKanalyticalfirst(BAT *b, BAT *s, BAT *
TPE *rb = (TPE*)Tloc(r, 0); \
for (; k < cnt; k++) { \
const TPE *bs = bp + start[k], *be = bp + end[k]; \
- TPE curval = (be > bs) ? *(be - 1) : TPE##_nil; \
+ TPE curval = (be > bs) ? be[-1] : TPE##_nil; \
rb[k] = curval; \
has_nils |= is_##TPE##_nil(curval); \
} \
@@ -539,7 +539,7 @@ GDKanalyticallast(BAT *b, BAT *s, BAT *e
for (; k < cnt; k++) { \
const TPE *bs = bp + start[k]; \
const TPE *be = bp + end[k]; \
- TPE curval = (be > bs && nth < (lng)(end[k] -
start[k])) ? *(bs + nth) : TPE##_nil; \
+ TPE curval = (be > bs && nth < (lng)(end[k] -
start[k])) ? bs[nth] : TPE##_nil; \
rb[k] = curval; \
has_nils |= is_##TPE##_nil(curval); \
} \
@@ -559,7 +559,7 @@ GDKanalyticallast(BAT *b, BAT *s, BAT *e
curval = TPE##_nil; \
has_nils = true; \
} else { \
- curval = *(bs + lnth - 1); \
+ curval = bs[lnth - 1]; \
has_nils |= is_##TPE##_nil(curval); \
} \
rb[k] = curval; \
@@ -567,7 +567,7 @@ GDKanalyticallast(BAT *b, BAT *s, BAT *e
} while (0)
BAT *
-GDKanalyticalnthvalue(BAT *b, BAT *s, BAT *e, BAT *t, lng *pnth, int tpe)
+GDKanalyticalnthvalue(BAT *b, BAT *s, BAT *e, BAT *t, lng nth, int tpe)
{
BAT *r = COLnew(b->hseqbase, tpe, BATcount(b), TRANSIENT);
if (r == NULL)
@@ -579,7 +579,6 @@ GDKanalyticalnthvalue(BAT *b, BAT *s, BA
bool has_nils = false;
oid k = 0, cnt = bi.count;
const oid *restrict start = si.base, *restrict end = ei.base;
- lng nth = pnth ? *pnth : 0;
const lng *restrict tp = ti.base;
const void *nil = ATOMnilptr(tpe);
int (*atomcmp)(const void *, const void *) = ATOMcompare(tpe);
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -4098,7 +4098,7 @@ rel2bin_recursive_munion(backend *be, sq
stmt *rel_stmt = NULL, *sub = NULL;
int nr_unions = list_length((list*)rel->l);
if (nr_unions != 2)
- return sql_error(sql, 10, SQLSTATE(27000) "UNION: recursive
unions need a base and recusive part");
+ return sql_error(sql, 10, SQLSTATE(27000) "UNION: recursive
unions need a base and recursive part");
stmt *l = stmt_limit_value(be, topn);
bool distinct = need_distinct(rel);
@@ -4159,7 +4159,7 @@ rel2bin_recursive_munion(backend *be, sq
r = pushLng(be->mb, r, 0);
if (l) {
r = pushArgument(be->mb, r, l->nr);
- r = pushBit(be->mb, r, FALSE); /* not symetrical */
+ r = pushBit(be->mb, r, FALSE); /* not symmetrical */
r = pushBit(be->mb, r, TRUE); /* including lower bound
*/
r = pushBit(be->mb, r, FALSE); /* excluding upper bound
*/
r = pushBit(be->mb, r, FALSE); /* nils_false */
@@ -4202,7 +4202,7 @@ rel2bin_recursive_munion(backend *be, sq
rec = subres_assign_resultvars(be, rec, rel_stmt->op4.lval);
if (distinct) {
rec = rel2bin_distinct(be, rec, NULL);
- /* remove values allready in the result table */
+ /* remove values already in the result table */
stmt *s = releqjoin(be, rec->op4.lval, result_table,
NULL, 0 /* use hash */, 0, 1 /*is_semantics*/);
stmt *lm = stmt_result(be, s, 0);
diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -986,7 +986,7 @@ SQLnth_value(Client cntxt, MalBlkPtr mb,
is_a_bat = isaBatType(getArgType(mb, pci, 2));
if (isaBatType(tpe)) {
- lng *nth = NULL;
+ lng nth = 0;
res = getArgReference_bat(stk, pci, 0);
if (!(b = BATdescriptor(*getArgReference_bat(stk, pci, 1)))) {
@@ -1000,7 +1000,7 @@ SQLnth_value(Client cntxt, MalBlkPtr mb,
goto bailout;
}
} else {
- nth = getArgReference_lng(stk, pci, 2);
+ nth = *getArgReference_lng(stk, pci, 2);
}
if (!(s = BATdescriptor(*getArgReference_bat(stk, pci, 6)))) {
msg = createException(SQL, "sql.nth_value",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -1597,8 +1597,9 @@ push_up_munion(mvc *sql, sql_rel *rel, l
int len = 0, need_length_reduction = 0;
int rec = is_recursive(s);
- /* Incase of recursive push up the project of the base side
(inplace) */
- /* push normaly into right side, but stop when we hit this base
again */
+ /* In case of recursive push up the project of the base side
+ * (inplace) push normally into right side, but stop when we hit
+ * this base again */
/* left of rel should be a set */
list *rlist = sa_list(sql->sa);
diff --git a/sql/server/sql_var.c b/sql/server/sql_var.c
--- a/sql/server/sql_var.c
+++ b/sql/server/sql_var.c
@@ -71,7 +71,7 @@ init_global_variables(mvc *sql)
mal_optimizer = GDKgetenv("sql_optimizer");
if (!mal_optimizer)
mal_optimizer = "default_pipe";
- /* TODO: Change optmizer to mal_optimizer */
+ /* TODO: Change optimizer to mal_optimizer */
SQL_GLOBAL(sname, "optimizer", mal_optimizer);
sql_find_subtype(&ctype, "sec_interval", inttype2digits(ihour, isec),
0);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
