Changeset: 957e3171edc3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/957e3171edc3
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_analytic.h
gdk/gdk_analytic_func.c
sql/backends/monet5/sql_rank.c
Branch: default
Log Message:
Code cleanup.
diffs (92 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
@@ -311,7 +311,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); \
} \
@@ -403,7 +403,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); \
} \
@@ -423,7 +423,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; \
@@ -431,7 +431,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)
@@ -443,7 +443,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/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);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
