Changeset: 1c470a09693a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c470a09693a
Modified Files:
gdk/gdk_analytic_func.c
gdk/gdk_calc.c
gdk/gdk_subquery.c
sql/backends/monet5/UDF/udf/udf.c
Branch: default
Log Message:
BUNtloc vs BUNtvar
diffs (truncated from 466 to 300 lines):
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
@@ -223,7 +223,7 @@ GDKanalyticalfirst(BAT *r, BAT *b, BAT *
default:{
if (ATOMvarsized(tpe)) {
for (; k < cnt; k++) {
- const void *curval = (end[k] > start[k]) ?
BUNtail(bpi, start[k]) : nil;
+ const void *curval = (end[k] > start[k]) ?
BUNtvar(bpi, start[k]) : nil;
if (tfastins_nocheckVAR(r, k, curval, Tsize(r))
!= GDK_SUCCEED)
return GDK_FAIL;
has_nils |= atomcmp(curval, nil) == 0;
@@ -232,7 +232,7 @@ GDKanalyticalfirst(BAT *r, BAT *b, BAT *
uint16_t width = r->twidth;
uint8_t *restrict rcast = (uint8_t *) Tloc(r, 0);
for (; k < cnt; k++) {
- const void *curval = (end[k] > start[k]) ?
BUNtail(bpi, start[k]) : nil;
+ const void *curval = (end[k] > start[k]) ?
BUNtloc(bpi, start[k]) : nil;
memcpy(rcast, curval, width);
rcast += width;
has_nils |= atomcmp(curval, nil) == 0;
@@ -294,7 +294,7 @@ GDKanalyticallast(BAT *r, BAT *b, BAT *s
default:{
if (ATOMvarsized(tpe)) {
for (; k < cnt; k++) {
- const void *curval = (end[k] > start[k]) ?
BUNtail(bpi, end[k] - 1) : nil;
+ const void *curval = (end[k] > start[k]) ?
BUNtvar(bpi, end[k] - 1) : nil;
if (tfastins_nocheckVAR(r, k, curval, Tsize(r))
!= GDK_SUCCEED)
return GDK_FAIL;
has_nils |= atomcmp(curval, nil) == 0;
@@ -303,7 +303,7 @@ GDKanalyticallast(BAT *r, BAT *b, BAT *s
uint16_t width = r->twidth;
uint8_t *restrict rcast = (uint8_t *) Tloc(r, 0);
for (; k < cnt; k++) {
- const void *curval = (end[k] > start[k]) ?
BUNtail(bpi, end[k] - 1) : nil;
+ const void *curval = (end[k] > start[k]) ?
BUNtloc(bpi, end[k] - 1) : nil;
memcpy(rcast, curval, width);
rcast += width;
has_nils |= atomcmp(curval, nil) == 0;
@@ -403,7 +403,7 @@ GDKanalyticalnthvalue(BAT *r, BAT *b, BA
curval = (void *) nil;
has_nils = true;
} else {
- curval = BUNtail(bpi, start[k]
+ (oid)(lnth - 1));
+ curval = BUNtvar(bpi, start[k]
+ (oid)(lnth - 1));
has_nils |= atomcmp(curval,
nil) == 0;
}
if (tfastins_nocheckVAR(r, k, curval,
Tsize(r)) != GDK_SUCCEED)
@@ -419,7 +419,7 @@ GDKanalyticalnthvalue(BAT *r, BAT *b, BA
curval = (void *) nil;
has_nils = true;
} else {
- curval = BUNtail(bpi, start[k]
+ (oid)(lnth - 1));
+ curval = BUNtloc(bpi, start[k]
+ (oid)(lnth - 1));
has_nils |= atomcmp(curval,
nil) == 0;
}
memcpy(rcast, curval, width);
@@ -465,7 +465,7 @@ GDKanalyticalnthvalue(BAT *r, BAT *b, BA
} else {
nth--;
for (; k < cnt; k++) {
- const void *curval = (end[k] >
start[k] && nth < (lng)(end[k] - start[k])) ? BUNtail(bpi, start[k] + (oid)
nth) : nil;
+ const void *curval = (end[k] >
start[k] && nth < (lng)(end[k] - start[k])) ? BUNtvar(bpi, start[k] + (oid)
nth) : nil;
if (tfastins_nocheckVAR(r, k,
curval, Tsize(r)) != GDK_SUCCEED)
return GDK_FAIL;
has_nils |= atomcmp(curval,
nil) == 0;
@@ -483,7 +483,7 @@ GDKanalyticalnthvalue(BAT *r, BAT *b, BA
} else {
nth--;
for (; k < cnt; k++) {
- const void *curval = (end[k] >
start[k] && nth < (lng)(end[k] - start[k])) ? BUNtail(bpi, start[k] + (oid)
nth) : nil;
+ const void *curval = (end[k] >
start[k] && nth < (lng)(end[k] - start[k])) ? BUNtloc(bpi, start[k] + (oid)
nth) : nil;
memcpy(rcast, curval, width);
rcast += width;
has_nils |= atomcmp(curval,
nil) == 0;
@@ -888,7 +888,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
for (; k < i;) { \
j = k; \
do { \
- void *next = BUNtail(bpi, k); \
+ void *next = BUNtvar(bpi, k); \
if (atomcmp(next, nil) != 0) {
\
if (atomcmp(curval, nil) == 0)
\
curval = next;
\
@@ -906,7 +906,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
for (; k < i;) { \
j = k; \
do { \
- void *next = BUNtail(bpi, k); \
+ void *next = BUNtloc(bpi, k); \
if (atomcmp(next, nil) != 0) {
\
if (atomcmp(curval, nil) == 0)
\
curval = next;
\
@@ -930,7 +930,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
l = i - 1; \
if (ATOMvarsized(tpe)) { \
for (j = l; ; j--) { \
- void *next = BUNtail(bpi, j); \
+ void *next = BUNtvar(bpi, j); \
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -952,7 +952,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
} \
} else { \
for (j = l; ; j--) { \
- void *next = BUNtail(bpi, j); \
+ void *next = BUNtloc(bpi, j); \
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -982,7 +982,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
void *curval = (void*) nil; \
if (ATOMvarsized(tpe)) { \
for (j = k; j < i; j++) { \
- void *next = BUNtail(bpi, j); \
+ void *next = BUNtvar(bpi, j); \
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -995,7 +995,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
return GDK_FAIL; \
} else { \
for (j = k; j < i; j++) { \
- void *next = BUNtail(bpi, j); \
+ void *next = BUNtloc(bpi, j); \
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1015,14 +1015,14 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
do { \
if (ATOMvarsized(tpe)) { \
for (; k < i; k++) { \
- void *next = BUNtail(bpi, k); \
+ void *next = BUNtvar(bpi, k); \
if (tfastins_nocheckVAR(r, k, next, Tsize(r))
!= GDK_SUCCEED) \
return GDK_FAIL; \
has_nils |= atomcmp(next, nil) == 0;
\
} \
} else { \
for (; k < i; k++) { \
- void *next = BUNtail(bpi, k); \
+ void *next = BUNtloc(bpi, k); \
memcpy(rcast, next, width); \
rcast += width; \
has_nils |= atomcmp(next, nil) == 0;
\
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -1273,8 +1273,8 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s1, BA
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next_dense(&ci1) -
b1hseqbase;
oid x2 = canditer_next_dense(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtvar(b1i, x1);
+ const void *p2 = BUNtvar(b2i, x2);
if (cmp(p1, nil) == 0 || cmp(p2, nil)
== 0) {
nils = true;
p1 = nil;
@@ -1288,8 +1288,8 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s1, BA
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next(&ci1) -
b1hseqbase;
oid x2 = canditer_next(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtvar(b1i, x1);
+ const void *p2 = BUNtvar(b2i, x2);
if (cmp(p1, nil) == 0 || cmp(p2, nil)
== 0) {
nils = true;
p1 = nil;
@@ -1307,8 +1307,8 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s1, BA
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next_dense(&ci1) -
b1hseqbase;
oid x2 = canditer_next_dense(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtloc(b1i, x1);
+ const void *p2 = BUNtloc(b2i, x2);
if (cmp(p1, nil) == 0 || cmp(p2, nil)
== 0) {
nils = true;
p1 = nil;
@@ -1322,8 +1322,8 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s1, BA
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next(&ci1) -
b1hseqbase;
oid x2 = canditer_next(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtloc(b1i, x1);
+ const void *p2 = BUNtloc(b2i, x2);
if (cmp(p1, nil) == 0 || cmp(p2, nil)
== 0) {
nils = true;
p1 = nil;
@@ -1468,8 +1468,8 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next_dense(&ci1) -
b1hseqbase;
oid x2 = canditer_next_dense(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtvar(b1i, x1);
+ const void *p2 = BUNtvar(b2i, x2);
if (cmp(p1, nil) == 0) {
if (cmp(p2, nil) == 0) {
/* both values are nil
*/
@@ -1487,8 +1487,8 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next(&ci1) -
b1hseqbase;
oid x2 = canditer_next(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtvar(b1i, x1);
+ const void *p2 = BUNtvar(b2i, x2);
if (cmp(p1, nil) == 0) {
if (cmp(p2, nil) == 0) {
/* both values are nil
*/
@@ -1510,8 +1510,8 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next_dense(&ci1) -
b1hseqbase;
oid x2 = canditer_next_dense(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtloc(b1i, x1);
+ const void *p2 = BUNtloc(b2i, x2);
if (cmp(p1, nil) == 0) {
if (cmp(p2, nil) == 0) {
/* both values are nil
*/
@@ -1529,8 +1529,8 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next(&ci1) -
b1hseqbase;
oid x2 = canditer_next(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtloc(b1i, x1);
+ const void *p2 = BUNtloc(b2i, x2);
if (cmp(p1, nil) == 0) {
if (cmp(p2, nil) == 0) {
/* both values are nil
*/
@@ -1654,7 +1654,7 @@ BATcalcmincst(BAT *b, const ValRecord *v
if (ATOMvarsized(b->ttype)) {
for (BUN i = 0; i < ncand; i++) {
oid x = canditer_next(&ci) - bhseqbase;
- const void *restrict p1 = BUNtail(bi, x);
+ const void *restrict p1 = BUNtvar(bi, x);
if (cmp(p1, nil) == 0) {
nils = true;
p1 = nil;
@@ -1669,7 +1669,7 @@ BATcalcmincst(BAT *b, const ValRecord *v
uint16_t width = bn->twidth;
for (BUN i = 0; i < ncand; i++) {
oid x = canditer_next(&ci) - bhseqbase;
- const void *restrict p1 = BUNtail(bi, x);
+ const void *restrict p1 = BUNtloc(bi, x);
if (cmp(p1, nil) == 0) {
nils = true;
p1 = nil;
@@ -1804,7 +1804,7 @@ BATcalcmincst_no_nil(BAT *b, const ValRe
if (cmp(p2, nil) == 0) {
for (BUN i = 0; i < ncand; i++) {
oid x = canditer_next(&ci) - bhseqbase;
- const void *restrict p1 = BUNtail(bi,
x);
+ const void *restrict p1 = BUNtvar(bi,
x);
nils |= cmp(p1, nil) == 0;
if (tfastins_nocheckVAR(bn, i, p1,
Tsize(bn)) != GDK_SUCCEED)
goto bunins_failed;
@@ -1812,7 +1812,7 @@ BATcalcmincst_no_nil(BAT *b, const ValRe
} else {
for (BUN i = 0; i < ncand; i++) {
oid x = canditer_next(&ci) - bhseqbase;
- const void *restrict p1 = BUNtail(bi,
x);
+ const void *restrict p1 = BUNtvar(bi,
x);
p1 = cmp(p1, nil) == 0 || cmp(p2, p1) <
0 ? p2 : p1;
if (tfastins_nocheckVAR(bn, i, p1,
Tsize(bn)) != GDK_SUCCEED)
goto bunins_failed;
@@ -1824,7 +1824,7 @@ BATcalcmincst_no_nil(BAT *b, const ValRe
if (cmp(p2, nil) == 0) {
for (BUN i = 0; i < ncand; i++) {
oid x = canditer_next(&ci) - bhseqbase;
- const void *restrict p1 = BUNtail(bi,
x);
+ const void *restrict p1 = BUNtloc(bi,
x);
nils |= cmp(p1, nil) == 0;
memcpy(bcast, p1, width);
bcast += width;
@@ -1832,7 +1832,7 @@ BATcalcmincst_no_nil(BAT *b, const ValRe
} else {
for (BUN i = 0; i < ncand; i++) {
oid x = canditer_next(&ci) - bhseqbase;
- const void *restrict p1 = BUNtail(bi,
x);
+ const void *restrict p1 = BUNtloc(bi,
x);
p1 = cmp(p1, nil) == 0 || cmp(p2, p1) <
0 ? p2 : p1;
memcpy(bcast, p1, width);
bcast += width;
@@ -1938,8 +1938,8 @@ BATcalcmax(BAT *b1, BAT *b2, BAT *s1, BA
for (BUN i = 0; i < ncand; i++) {
oid x1 = canditer_next_dense(&ci1) -
b1hseqbase;
oid x2 = canditer_next_dense(&ci2) -
b2hseqbase;
- const void *p1 = BUNtail(b1i, x1);
- const void *p2 = BUNtail(b2i, x2);
+ const void *p1 = BUNtvar(b1i, x1);
+ const void *p2 = BUNtvar(b2i, x2);
if (cmp(p1, nil) == 0 || cmp(p2, nil)
== 0) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
