Changeset: 5b12c90ac153 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b12c90ac153
Modified Files:
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/gdk_cand.h
gdk/gdk_imprints.c
gdk/gdk_logger.c
gdk/gdk_orderidx.c
gdk/gdk_sample.c
gdk/gdk_select.c
monetdb5/extras/pyapi/connection.c
monetdb5/extras/pyapi/pyapi.c
monetdb5/extras/rapi/converters.c.h
monetdb5/extras/sphinx/sphinx.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/mat.c
sql/backends/monet5/sql.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
Branch: default
Log Message:
Cleanup: consistently use macros to hide complexity of H, T, and S structs.
diffs (truncated from 2284 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1341,7 +1341,7 @@ gdk_export BUN BUNfnd(BAT *b, const void
#define Tsize(b) ((b)->T->width)
-#define tailsize(b,p) ((b)->T->type?((size_t)(p))<<(b)->T->shift:0)
+#define tailsize(b,p) ((b)->ttype?((size_t)(p))<<(b)->T->shift:0)
#define Tloc(b,p) ((b)->T->heap.base+((p)<<(b)->T->shift))
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -1574,9 +1574,9 @@ BATgroupavg(BAT **bnp, BAT **cntsp, BAT
/* 0 <= r < n (if n > 0) */ \
/* or if n == 0: a == 0; r == 0 */ \
if (cand) { \
- if (i < *cand - b->H->seq) \
+ if (i < *cand - b->hseqbase) \
continue; \
- assert(i == *cand - b->H->seq); \
+ assert(i == *cand - b->hseqbase); \
if (++cand == candend) \
end = i + 1; \
} \
@@ -1639,7 +1639,7 @@ BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN
src = Tloc(b, b->batFirst);
- switch (b->T->type) {
+ switch (b->ttype) {
case TYPE_bte:
AVERAGE_TYPE(bte);
break;
@@ -1665,7 +1665,7 @@ BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN
break;
default:
GDKerror("BATcalcavg: average of type %s unsupported.\n",
- ATOMname(b->T->type));
+ ATOMname(b->ttype));
return GDK_FAIL;
}
if (vals)
@@ -1754,7 +1754,7 @@ BATgroupcount(BAT *b, BAT *g, BAT *e, BA
else
gids = (const oid *) Tloc(g, BUNfirst(g) + start);
- t = b->T->type;
+ t = b->ttype;
nil = ATOMnilptr(t);
atomcmp = ATOMcompare(t);
t = ATOMbasetype(t);
@@ -1982,7 +1982,7 @@ do_groupmin(oid *restrict oids, BAT *b,
if (cnt == 0)
return nils;
- t = b->T->type;
+ t = b->ttype;
nil = ATOMnilptr(t);
atomcmp = ATOMcompare(t);
t = ATOMbasetype(t);
@@ -2107,7 +2107,7 @@ do_groupmax(oid *restrict oids, BAT *b,
if (cnt == 0)
return nils;
- t = b->T->type;
+ t = b->ttype;
nil = ATOMnilptr(t);
atomcmp = ATOMcompare(t);
t = ATOMbasetype(t);
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -254,8 +254,8 @@ VIEWcreate_(oid seq, BAT *b, int slice_v
bn->H->imprints = NULL;
bn->T->imprints = NULL;
/* Order OID index */
- bn->H->orderidx = NULL;
- bn->T->orderidx = NULL;
+ bn->horderidx = NULL;
+ bn->torderidx = NULL;
BBPcacheit(bs, 1); /* enter in BBP */
return bn;
}
@@ -450,24 +450,24 @@ VIEWreset(BAT *b)
BBPunfix(tvp);
}
- b->H->type = TYPE_void;
- b->H->varsized = 1;
+ b->htype = TYPE_void;
+ b->hvarsized = 1;
b->H->shift = 0;
b->H->width = 0;
- b->H->seq = v->H->seq;
- b->H->key = BOUND2BTRUE | 1;
+ b->hseqbase = v->hseqbase;
+ b->hkey = BOUND2BTRUE | 1;
- b->T->type = v->T->type;
- b->T->varsized = v->T->varsized;
+ b->ttype = v->ttype;
+ b->tvarsized = v->tvarsized;
b->T->shift = v->T->shift;
b->T->width = v->T->width;
- b->T->seq = v->T->seq;
+ b->tseqbase = v->tseqbase;
b->T->heap.parentid = 0;
b->batRestricted = BAT_WRITE;
/* reset BOUND2BTRUE */
- b->T->key = BATtkey(v);
+ b->tkey = BATtkey(v);
/* copy the heaps */
b->H->heap = head;
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -99,7 +99,7 @@ BATcreatedesc(oid hseq, int tt, int heap
bn->htype = TYPE_void;
bn->H->width = 0;
bn->H->shift = 0;
- bn->H->varsized = 1;
+ bn->hvarsized = 1;
bn->hseqbase = hseq;
bn->hkey = TRUE | BOUND2BTRUE;
bn->H->nonil = TRUE;
@@ -190,7 +190,7 @@ BATsetdims(BAT *b)
b->T->width = b->ttype == TYPE_str ? 1 : ATOMsize(b->ttype);
b->T->shift = ATOMelmshift(Tsize(b));
assert_shift_width(b->T->shift, b->T->width);
- b->T->varsized = b->ttype == TYPE_void || BATatoms[b->ttype].atomPut !=
NULL;
+ b->tvarsized = b->ttype == TYPE_void || BATatoms[b->ttype].atomPut !=
NULL;
}
/*
@@ -1349,7 +1349,7 @@ BATsetcount(BAT *b, BUN cnt)
b->batCount = cnt;
b->batDirtydesc = TRUE;
b->T->heap.free = tailsize(b, BUNfirst(b) + cnt);
- if (b->T->type == TYPE_void)
+ if (b->ttype == TYPE_void)
b->batCapacity = cnt;
if (cnt <= 1) {
b->hrevsorted = 1;
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -85,7 +85,7 @@ insert_string_bat(BAT *b, BAT *n, int fo
b->T->vheap->hashash == n->T->vheap->hashash &&
/* if needs to be kept unique, take slow path */
(b->tkey & BOUND2BTRUE) == 0) {
- if (b->S->role == TRANSIENT) {
+ if (b->batRole == TRANSIENT) {
/* If b is in the transient farm (i.e. b will
* never become persistent), we try some
* clever tricks to avoid copying:
@@ -362,7 +362,7 @@ BATappend(BAT *b, BAT *n, bit force)
assert(b->H->heap.parentid == 0 &&
b->T->heap.parentid == 0 &&
b->H->vheap == NULL &&
- (b->T->vheap == NULL || b->T->vheap->parentid == b->batCacheid
|| b->T->type == TYPE_str));
+ (b->T->vheap == NULL || b->T->vheap->parentid == b->batCacheid
|| b->ttype == TYPE_str));
ALIGNapp(b, "BATappend", force, GDK_FAIL);
BATcompatible(b, n, GDK_FAIL, "BATappend");
@@ -1264,7 +1264,7 @@ BATconstant(oid hseq, int tailtype, cons
bn->tsorted = 1;
bn->trevsorted = 1;
bn->T->nonil = !bn->T->nil;
- bn->T->key = BATcount(bn) <= 1;
+ bn->tkey = BATcount(bn) <= 1;
return bn;
bunins_failed:
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -557,7 +557,7 @@ fixoidheapcolumn(BAT *b, const char *src
HEAPfree(b->T->vheap, 0);
} else {
assert(b->ttype == TYPE_oid ||
- (b->ttype != TYPE_void && b->T->varsized));
+ (b->ttype != TYPE_void && b->tvarsized));
h1 = b->T->heap;
h1.filename = NULL;
h1.base = NULL;
@@ -583,7 +583,7 @@ fixoidheapcolumn(BAT *b, const char *src
b->T->heap.dirty = TRUE;
old = (int *) h1.base + b->batFirst;
new = (oid *) b->T->heap.base + b->batFirst;
- if (b->T->varsized)
+ if (b->tvarsized)
for (i = 0; i < b->batCount; i++)
new[i] = (oid) old[i] << 3;
else
@@ -811,7 +811,7 @@ fixwkbheap(void)
if ((bs = BBP_desc(bid)) == NULL)
continue; /* not a valid BAT */
b = (BAT *) bs; /* bit of a hack: BATstore contents not known
*/
- if (b->T->type != utypewkb || b->batCount == 0)
+ if (b->ttype != utypewkb || b->batCount == 0)
continue; /* nothing to do for this BAT */
assert(b->T->vheap);
assert(b->T->width == SIZEOF_VAR_T);
@@ -1789,8 +1789,8 @@ BBPdump(void)
"Tvheap=[" SZFMT "," SZFMT "] "
"Thash=[" SZFMT "," SZFMT "]\n",
i,
- ATOMname(b->H->type),
- ATOMname(b->T->type),
+ ATOMname(b->htype),
+ ATOMname(b->ttype),
BBP_logical(i) ? BBP_logical(i) : "<NULL>",
BBP_refs(i),
BBP_lrefs(i),
@@ -2365,7 +2365,7 @@ incref(bat i, int logical, int lock)
assert(BBP_refs(i) + BBP_lrefs(i) ||
BBP_status(i) & (BBPDELETED | BBPSWAPPED));
- assert(bs->B.H->type == TYPE_void);
+ assert(bs->B.htype == TYPE_void);
if (logical) {
/* parent BATs are not relevant for logical refs */
tp = tvp = 0;
@@ -4084,7 +4084,7 @@ BBPdiskscan(const char *parent)
BAT *b = getdesc(bid);
delete = b == NULL;
if (!delete)
- b->T->orderidx = (Heap *) 1;
+ b->torderidx = (Heap *) 1;
#else
delete = TRUE;
#endif
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -107,7 +107,7 @@ checkbats(BAT *b1, BAT *b2, const char *
dst[i] = FUNC(src[i]); \
} else { \
for (i = start; i < end; i++) { \
- CHECKCAND(dst, i, b->H->seq, TYPE2##_nil); \
+ CHECKCAND(dst, i, b->hseqbase, TYPE2##_nil); \
if (src[i] == TYPE1##_nil) { \
nils++; \
dst[i] = TYPE2##_nil; \
@@ -208,9 +208,9 @@ BATcalcnot(BAT *b, BAT *s)
if (bn == NULL)
return NULL;
- switch (ATOMbasetype(b->T->type)) {
+ switch (ATOMbasetype(b->ttype)) {
case TYPE_bte:
- if (b->T->type == TYPE_bit) {
+ if (b->ttype == TYPE_bit) {
UNARY_2TYPE_FUNC(bit, bit, NOTBIT);
} else {
UNARY_2TYPE_FUNC(bte, bte, NOT);
@@ -233,18 +233,18 @@ BATcalcnot(BAT *b, BAT *s)
default:
BBPunfix(bn->batCacheid);
GDKerror("BATcalcnot: type %s not supported.\n",
- ATOMname(b->T->type));
+ ATOMname(b->ttype));
return NULL;
}
BATsetcount(bn, cnt);
/* NOT reverses the order, but NILs mess it up */
- bn->T->sorted = nils == 0 && b->T->revsorted;
- bn->T->revsorted = nils == 0 && b->T->sorted;
+ bn->tsorted = nils == 0 && b->trevsorted;
+ bn->trevsorted = nils == 0 && b->tsorted;
bn->T->nil = nils != 0;
bn->T->nonil = nils == 0;
- bn->T->key = b->T->key & 1;
+ bn->tkey = b->tkey & 1;
if (nils != 0 && !b->T->nil) {
b->T->nil = 1;
@@ -327,7 +327,7 @@ BATcalcnegate(BAT *b, BAT *s)
if (bn == NULL)
return NULL;
- switch (ATOMbasetype(b->T->type)) {
+ switch (ATOMbasetype(b->ttype)) {
case TYPE_bte:
UNARY_2TYPE_FUNC(bte, bte, NEGATE);
break;
@@ -354,18 +354,18 @@ BATcalcnegate(BAT *b, BAT *s)
default:
BBPunfix(bn->batCacheid);
GDKerror("BATcalcnegate: type %s not supported.\n",
- ATOMname(b->T->type));
+ ATOMname(b->ttype));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
