Changeset: 4f982292534a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4f982292534a
Modified Files:
gdk/gdk_batop.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/pcre.c
Branch: default
Log Message:
tloc vs tvar
diffs (68 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1902,8 +1902,8 @@ BATordered(BAT *b)
case TYPE_str:
for (BUN q = BATcount(b), p = 1; p < q; p++) {
int c;
- const char *p1 = BUNtail(bi, p - 1);
- const char *p2 = BUNtail(bi, p);
+ const char *p1 = BUNtvar(bi, p - 1);
+ const char *p2 = BUNtvar(bi, p);
if (p1 == p2)
c = 0;
else if (p1[0] == '\200') {
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -867,7 +867,7 @@ BKCshrinkBAT(bat *ret, const bat *bid, c
if ( o < ol && *o == oidx ){
o++;
} else {
- if (BUNappend(bn, BUNtail(bi, p), false) !=
GDK_SUCCEED) {
+ if (BUNappend(bn, BUNtvar(bi, p), false) !=
GDK_SUCCEED) {
bat_iterator_end(&bi);
BBPunfix(b->batCacheid);
BBPunfix(bn->batCacheid);
diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -71,7 +71,7 @@ typedef struct{
args[i] += mut->args[i].size;
\
} else if (ATOMvarsized(mut->args[i].type)) {
\
mut->args[i].o++;
\
- mut->args[i].s = (str *)
BUNtail(mut->args[i].bi, mut->args[i].o); \
+ mut->args[i].s = (str *)
BUNtvar(mut->args[i].bi, mut->args[i].o); \
args[i] = (void*) &mut->args[i].s;
\
} else {
\
mut->args[i].o++;
\
@@ -123,7 +123,7 @@ typedef struct{
args[i] += mut->args[i].size;
\
} else
if(ATOMvarsized(mut->args[i].type)){ \
mut->args[i].o++;
\
- mut->args[i].s = (str*)
BUNtail(mut->args[i].bi, mut->args[i].o); \
+ mut->args[i].s = (str*)
BUNtvar(mut->args[i].bi, mut->args[i].o); \
args[i] = (void*) &
mut->args[i].s; \
} else {
\
mut->args[i].o++;
\
@@ -161,7 +161,7 @@ MANIFOLDjob(MULTItask *mut)
if(ATOMstorage(mut->args[i].type) < TYPE_str){
args[i] = (char*) mut->args[i].first;
} else if(ATOMvarsized(mut->args[i].type)){
- mut->args[i].s = (str*)
BUNtail(mut->args[i].bi, mut->args[i].o);
+ mut->args[i].s = (str*)
BUNtvar(mut->args[i].bi, mut->args[i].o);
args[i] = (void*) & mut->args[i].s;
} else {
mut->args[i].s = (str*)
BUNtloc(mut->args[i].bi, mut->args[i].o);
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -2256,7 +2256,7 @@ PCREjoin(bat *r1, bat *r2, bat lid, bat
goto fail;
}
bi = bat_iterator(caseignore);
- ci = *(bit*)BUNtail(bi, 0);
+ ci = *(bit*)BUNtloc(bi, 0);
bat_iterator_end(&bi);
bi = bat_iterator(escape);
esc = BUNtvar(bi, 0);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
