Changeset: d24424930f91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d24424930f91
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_batop.c
monetdb5/modules/atoms/batxml.c
Branch: default
Log Message:
Use new bunfastapp_nocheck macro where we can.
diffs (79 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2303,8 +2303,8 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
r++;
}
while (BATcount(bn) < prev - min) {
- bunfastins_nocheck(bn, BUNlast(bn), 0,
- nil, 0, Tsize(bn));
+ bunfastapp_nocheck(bn, BUNlast(bn),
+ nil, Tsize(bn));
nils++;
}
qindex = BUNfirst(b) + (BUN) (r + (p-r-1) *
quantile);
@@ -2312,7 +2312,7 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
assert(qindex >= (BUNfirst(b) + r ));
assert(qindex < (BUNfirst(b) + p));
v = BUNtail(bi, qindex);
- bunfastins_nocheck(bn, BUNlast(bn), 0, v, 0,
Tsize(bn));
+ bunfastapp_nocheck(bn, BUNlast(bn), v,
Tsize(bn));
nils += (*atomcmp)(v, nil) == 0;
r = p;
@@ -2321,8 +2321,7 @@ BATgroupquantile(BAT *b, BAT *g, BAT *e,
}
}
while (BATcount(bn) < ngrp) {
- bunfastins_nocheck(bn, BUNlast(bn), 0,
- nil, 0, Tsize(bn));
+ bunfastapp_nocheck(bn, BUNlast(bn), nil, Tsize(bn));
}
BATseqbase(bn, min);
} else { /* quantiles for entire BAT b, EZ */
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -398,7 +398,7 @@ BATins(BAT *b, BAT *n, bit force)
BATiter ni = bat_iterator(n);
BATloop(n, p, q) {
- bunfastins_nocheck(b, r, NULL,
BUNtail(ni, p), 0, Tsize(b));
+ bunfastapp_nocheck(b, r, BUNtail(ni,
p), Tsize(b));
r++;
}
}
@@ -601,7 +601,7 @@ BATappend(BAT *b, BAT *n, bit force)
BATiter ni = bat_iterator(n);
BATloop(n, p, q) {
- bunfastins_nocheck(b, r, NULL,
BUNtail(ni, p), 0, Tsize(b));
+ bunfastapp_nocheck(b, r, BUNtail(ni,
p), Tsize(b));
r++;
}
}
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -1542,10 +1542,10 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
for (p = 0, q = BATcount(g); p <= q; p++) {
if (p == q || grps[p] != prev) {
while (BATcount(bn) < prev - min) {
- bunfastins_nocheck(bn, BUNlast(bn), 0,
str_nil, 0, Tsize(bn));
+ bunfastapp_nocheck(bn, BUNlast(bn),
str_nil, Tsize(bn));
nils++;
}
- bunfastins_nocheck(bn, BUNlast(bn), 0, buf, 0,
Tsize(bn));
+ bunfastapp_nocheck(bn, BUNlast(bn), buf,
Tsize(bn));
nils += strNil(buf);
strncpy(buf, str_nil, maxlen);
buflen = 0;
@@ -1628,7 +1628,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
goto bunins_failed;
}
}
- bunfastins_nocheck(bn, BUNlast(bn), 0, buf, 0, Tsize(bn));
+ bunfastapp_nocheck(bn, BUNlast(bn), buf, Tsize(bn));
}
BATseqbase(bn, min);
bn->T->nil = nils != 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
