Changeset: 9dfa3162fce2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9dfa3162fce2
Modified Files:
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_delta.h
gdk/gdk_join.c
monetdb5/modules/mal/txtsim.c
Branch: default
Log Message:
Get rid of macro Tsize, use ->twidth instead.
diffs (132 lines):
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -2,6 +2,7 @@
# This file is updated with Maddlog
* Fri Mar 18 2022 Sjoerd Mullender <sjo...@acm.org>
+- Get rid of macro Tsize, use ->twidth instead.
- Get rid of macro BUNlast, just use BATcount instead.
* Mon Jan 31 2022 Sjoerd Mullender <sjo...@acm.org>
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1148,8 +1148,6 @@ gdk_export BUN BUNfnd(BAT *b, const void
#define BATttype(b) (BATtdense(b) ? TYPE_oid : (b)->ttype)
-#define Tsize(b) ((b)->twidth)
-
#define tailsize(b,p) ((b)->ttype ? \
(ATOMstorage((b)->ttype) == TYPE_msk ? \
(((size_t) (p) + 31) / 32) * 4 : \
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1342,7 +1342,7 @@ BUNdelete(BAT *b, oid o)
} else {
val = Tloc(b, BATcount(b) - 1);
HASHdelete(b, BATcount(b) - 1, val);
- memcpy(Tloc(b, p), val, Tsize(b));
+ memcpy(Tloc(b, p), val, b->twidth);
HASHinsert(b, p, val);
MT_lock_set(&b->theaplock);
if (b->tminpos == BATcount(b) - 1)
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -934,7 +934,7 @@ BATdel(BAT *b, BAT *d)
} else {
memmove(Tloc(b, o),
Tloc(b, o + c),
- Tsize(b) * (BATcount(b) - (o + c)));
+ b->twidth * (BATcount(b) - (o + c)));
}
b->theap->dirty = true;
// o += b->hseqbase; // if this were to be used again
@@ -999,7 +999,7 @@ BATdel(BAT *b, BAT *d)
}
pos += n;
} else {
- n *= Tsize(b);
+ n *= b->twidth;
memmove(p,
Tloc(b, o[-1] + 1 -
b->hseqbase),
n);
@@ -2460,7 +2460,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
if (do_sort(Tloc(bn, r),
ords ? ords + r : NULL,
bn->tvheap ? bn->tvheap->base :
NULL,
- p - r, Tsize(bn), ords ?
sizeof(oid) : 0,
+ p - r, bn->twidth, ords ?
sizeof(oid) : 0,
bn->ttype, reverse, nilslast,
stable) != GDK_SUCCEED)
goto error;
r = p;
@@ -2471,7 +2471,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
if (do_sort(Tloc(bn, r),
ords ? ords + r : NULL,
bn->tvheap ? bn->tvheap->base : NULL,
- p - r, Tsize(bn), ords ? sizeof(oid) : 0,
+ p - r, bn->twidth, ords ? sizeof(oid) : 0,
bn->ttype, reverse, nilslast, stable) !=
GDK_SUCCEED)
goto error;
/* if single group (r==0) the result is (rev)sorted,
@@ -2503,7 +2503,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
do_sort(Tloc(bn, 0),
ords,
bn->tvheap ? bn->tvheap->base : NULL,
- BATcount(bn), Tsize(bn), ords ? sizeof(oid) : 0,
+ BATcount(bn), bn->twidth, ords ? sizeof(oid) : 0,
bn->ttype, reverse, nilslast, stable) !=
GDK_SUCCEED)) {
if (m != NULL) {
HEAPfree(m, true);
diff --git a/gdk/gdk_delta.h b/gdk/gdk_delta.h
--- a/gdk/gdk_delta.h
+++ b/gdk/gdk_delta.h
@@ -21,7 +21,7 @@ DELTAinit(BAT *b)
BATsetcount(b, 0);
b->theap->free = 0;
b->batInserted = 0;
- b->tshift = ATOMelmshift(Tsize(b));
+ b->tshift = ATOMelmshift(b->twidth);
TRC_DEBUG(DELTA,
"%s free %zu ins " BUNFMT " base %p\n",
BBP_logical(b->batCacheid),
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3856,7 +3856,7 @@ leftjoin(BAT **r1p, BAT **r2p, BAT *l, B
|| BATordered_rev(l)
|| BATtdense(r)
|| lcnt < 1024
- || BATcount(r) * (Tsize(r) + hsz + 2 * sizeof(BUN)) >
GDK_mem_maxsize / (GDKnr_threads ? GDKnr_threads : 1))) {
+ || BATcount(r) * (r->twidth + hsz + 2 * sizeof(BUN)) >
GDK_mem_maxsize / (GDKnr_threads ? GDKnr_threads : 1))) {
rc = mergejoin(r1p, r2p, l, r, &lci, &rci,
nil_matches, nil_on_miss, semi,
only_misses,
not_in, max_one, min_one, estimate, t0,
false, func);
diff --git a/monetdb5/modules/mal/txtsim.c b/monetdb5/modules/mal/txtsim.c
--- a/monetdb5/modules/mal/txtsim.c
+++ b/monetdb5/modules/mal/txtsim.c
@@ -923,17 +923,17 @@ CMDqgramselfjoin(bat *res1, bat *res2, b
msg = createException(MAL, "tstsim.qgramselfjoin",
SEMANTIC_TYPE_MISMATCH ": qgram and len are not
synced");
- else if (Tsize(qgram) != ATOMsize(qgram->ttype))
+ else if (qgram->twidth != ATOMsize(qgram->ttype))
msg = createException(MAL, "tstsim.qgramselfjoin",
SEMANTIC_TYPE_MISMATCH ": qgram is not a true void
bat");
- else if (Tsize(id) != ATOMsize(id->ttype))
+ else if (id->twidth != ATOMsize(id->ttype))
msg = createException(MAL, "tstsim.qgramselfjoin",
SEMANTIC_TYPE_MISMATCH ": id is not a true void bat");
- else if (Tsize(pos) != ATOMsize(pos->ttype))
+ else if (pos->twidth != ATOMsize(pos->ttype))
msg = createException(MAL, "tstsim.qgramselfjoin",
SEMANTIC_TYPE_MISMATCH ": pos is not a true void
bat");
- else if (Tsize(len) != ATOMsize(len->ttype))
+ else if (len->twidth != ATOMsize(len->ttype))
msg = createException(MAL, "tstsim.qgramselfjoin",
SEMANTIC_TYPE_MISMATCH ": len is not a true void
bat");
if (msg) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
