Changeset: e7211313acb3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7211313acb3
Modified Files:
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_delta.c
gdk/gdk_imprints.c
gdk/gdk_logger.c
gdk/gdk_sample.c
gdk/gdk_select.c
gdk/gdk_storage.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/pcre.c
sql/storage/bat/bat_utils.h
sql/storage/restrict/restrict_storage.h
Branch: default
Log Message:
merged
diffs (truncated from 1227 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -1485,7 +1485,7 @@ BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN
CANDINIT(b, s, start, end, cnt, cand, candend);
- src = Tloc(b, b->U->first);
+ src = Tloc(b, b->batFirst);
switch (b->T->type) {
case TYPE_bte:
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -279,9 +279,9 @@ VIEWcreate_(BAT *h, BAT *t, int slice_vi
* data, though. */
*bn->U = *h->U;
*bn->H = *h->H;
- if (bn->U->first > 0) {
- bn->H->heap.base += h->U->first * h->H->width;
- bn->U->first = 0;
+ if (bn->batFirst > 0) {
+ bn->H->heap.base += h->batFirst * h->H->width;
+ bn->batFirst = 0;
}
if (h->H == t->T) {
vc = 1;
@@ -289,11 +289,11 @@ VIEWcreate_(BAT *h, BAT *t, int slice_vi
bn->T = bn->H;
} else {
*bn->T = *t->T;
- if (bn->U->capacity > t->U->capacity)
- bn->U->capacity = t->U->capacity;
- if (t->U->first > 0)
- bn->T->heap.base += t->U->first * t->T->width;
- if (bn->U->count < t->U->count) {
+ if (bn->batCapacity > t->batCapacity)
+ bn->batCapacity = t->batCapacity;
+ if (t->batFirst > 0)
+ bn->T->heap.base += t->batFirst * t->T->width;
+ if (bn->batCount < t->batCount) {
/* we can't be sure anymore there are nils */
bn->T->nil = 0;
}
@@ -725,7 +725,7 @@ VIEWreset(BAT *b)
/* make the BAT empty and insert all again */
DELTAinit(n);
/* reset capacity */
- n->U->capacity = cnt;
+ n->batCapacity = cnt;
/* swap n and v in case the original input was reversed, because
* BATins demands (v)oid-headed input */
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -254,7 +254,7 @@ BATnewstorage(int ht, int tt, BUN cap)
bn = &bs->B;
BATsetdims(bn);
- bn->U->capacity = cap;
+ bn->batCapacity = cap;
/* alloc the main heaps */
if (ht && HEAPalloc(&bn->H->heap, cap, bn->H->width) < 0) {
@@ -890,11 +890,11 @@ BATcopy(BAT *b, int ht, int tt, int writ
hcap = (BUN) (bn->htype ? bn->H->heap.size >>
bn->H->shift : 0);
tcap = (BUN) (bn->ttype ? bn->T->heap.size >>
bn->T->shift : 0);
if (hcap && tcap)
- bn->U->capacity = MIN(hcap, tcap);
+ bn->batCapacity = MIN(hcap, tcap);
else if (hcap)
- bn->U->capacity = hcap;
+ bn->batCapacity = hcap;
else
- bn->U->capacity = tcap;
+ bn->batCapacity = tcap;
/* first/inserted must point equally far into
@@ -2046,7 +2046,7 @@ BUNlocate(BAT *b, const void *x, const v
void
BATsetcapacity(BAT *b, BUN cnt)
{
- b->U->capacity = cnt;
+ b->batCapacity = cnt;
assert(b->batCount <= cnt);
}
@@ -2171,9 +2171,9 @@ BATseqbase(BAT *b, oid o)
/* adapt keyness */
if (BAThvoid(b)) {
if (o == oid_nil) {
- b->hkey = b->U->count <= 1;
- b->H->nonil = b->U->count == 0;
- b->H->nil = b->U->count > 0;
+ b->hkey = b->batCount <= 1;
+ b->H->nonil = b->batCount == 0;
+ b->H->nil = b->batCount > 0;
b->hsorted = b->hrevsorted = 1;
} else {
if (!b->hkey) {
@@ -2183,7 +2183,7 @@ BATseqbase(BAT *b, oid o)
b->H->nonil = 1;
b->H->nil = 0;
b->hsorted = 1;
- b->hrevsorted = b->U->count <= 1;
+ b->hrevsorted = b->batCount <= 1;
}
}
}
@@ -2994,7 +2994,7 @@ BATassertProps(BAT *b)
assert(b->batFirst >= b->batDeleted);
assert(b->batInserted >= b->batFirst);
assert(b->batFirst + b->batCount >= b->batInserted);
- assert(b->U->first == 0);
+ assert(b->batFirst == 0);
bbpstatus = BBP_status(b->batCacheid);
/* only at most one of BBPDELETED, BBPEXISTING, BBPNEW may be set */
assert(((bbpstatus & BBPDELETED) != 0) +
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1206,9 +1206,9 @@ BATorder_internal(BAT *b, int stable, in
* it's cheap) */
if (b->htype == TYPE_void) {
b->hsorted = 1;
- b->hrevsorted = b->hseqbase == oid_nil || b->U->count <= 1;
+ b->hrevsorted = b->hseqbase == oid_nil || b->batCount <= 1;
b->hkey |= b->hseqbase != oid_nil;
- } else if (b->U->count <= 1) {
+ } else if (b->batCount <= 1) {
b->hsorted = b->hrevsorted = 1;
}
if (reverse ? b->hrevsorted : b->hsorted) {
@@ -1248,10 +1248,10 @@ BATorder_internal(BAT *b, int stable, in
}
if (reverse) {
b->hrevsorted = 1;
- b->hsorted = b->U->count <= 1;
+ b->hsorted = b->batCount <= 1;
} else {
b->hsorted = 1;
- b->hrevsorted = b->U->count <= 1;
+ b->hrevsorted = b->batCount <= 1;
}
b->tsorted = b->trevsorted = 0;
HASHdestroy(b);
@@ -1501,9 +1501,9 @@ BATsubsort(BAT **sorted, BAT **order, BA
} else {
if (b->ttype == TYPE_void) {
b->tsorted = 1;
- b->trevsorted = b->tseqbase == oid_nil || b->U->count
<= 1;
+ b->trevsorted = b->tseqbase == oid_nil || b->batCount
<= 1;
b->tkey |= b->tseqbase != oid_nil;
- } else if (b->U->count <= 1) {
+ } else if (b->batCount <= 1) {
b->tsorted = b->trevsorted = 1;
}
if (!(reverse ? bn->trevsorted : bn->tsorted) &&
@@ -1876,7 +1876,7 @@ BATconstant(int tailtype, const void *v,
bn = BATnew(TYPE_void, tailtype, n);
if (bn == NULL)
return NULL;
- p = Tloc(bn, bn->U->first);
+ p = Tloc(bn, bn->batFirst);
switch (ATOMstorage(tailtype)) {
case TYPE_void:
v = &oid_nil;
@@ -2230,7 +2230,7 @@ BATcount_no_nil(BAT *b)
n = BATcount(b);
if (b->T->nonil)
return n;
- p = Tloc(b, b->U->first);
+ p = Tloc(b, b->batFirst);
t = b->ttype;
if (t != ATOMstorage(t) &&
ATOMnilptr(ATOMstorage(t)) == ATOMnilptr(t) &&
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -494,7 +494,7 @@ fixoidheapcolumn(BAT *b, const char *src
w = b->H->width; /* remember old width */
b->H->width = 1;
b->H->shift = 0;
- if (HEAPalloc(&b->H->heap, b->U->capacity, SIZEOF_OID) < 0)
+ if (HEAPalloc(&b->H->heap, b->batCapacity, SIZEOF_OID) < 0)
GDKfatal("fixoidheap: allocating new %s heap "
"for BAT %d failed\n", headtail, bid);
@@ -503,7 +503,7 @@ fixoidheapcolumn(BAT *b, const char *src
if (b->H->vheap->filename == NULL)
GDKfatal("fixoidheap: GDKmalloc failed\n");
GDKfilepath(b->H->vheap->filename, NULL, nme, htheap);
- if (ATOMheap(TYPE_str, b->H->vheap, b->U->capacity))
+ if (ATOMheap(TYPE_str, b->H->vheap, b->batCapacity))
GDKfatal("fixoidheap: initializing new string "
"heap for BAT %d failed\n", bid);
b->H->vheap->parentid = bid;
@@ -511,7 +511,7 @@ fixoidheapcolumn(BAT *b, const char *src
/* do the conversion */
b->H->heap.dirty = TRUE;
b->H->vheap->dirty = TRUE;
- for (i = 0; i < b->U->count; i++) {
+ for (i = 0; i < b->batCount; i++) {
/* s = h2.base + VarHeapVal(h1.base, i, w); */
switch (w) {
case 1:
@@ -557,18 +557,18 @@ fixoidheapcolumn(BAT *b, const char *src
b->H->width = SIZEOF_OID;
b->H->shift = 3;
assert(b->H->width == (1 << b->H->shift));
- if (HEAPalloc(&b->H->heap, b->U->capacity, SIZEOF_OID) < 0)
+ if (HEAPalloc(&b->H->heap, b->batCapacity, SIZEOF_OID) < 0)
GDKfatal("fixoidheap: allocating new %s heap "
"for BAT %d failed\n", headtail, bid);
b->H->heap.dirty = TRUE;
- old = (int *) h1.base + b->U->first;
- new = (oid *) b->H->heap.base + b->U->first;
+ old = (int *) h1.base + b->batFirst;
+ new = (oid *) b->H->heap.base + b->batFirst;
if (b->H->varsized)
- for (i = 0; i < b->U->count; i++)
+ for (i = 0; i < b->batCount; i++)
new[i] = (oid) old[i] << 3;
else
- for (i = 0; i < b->U->count; i++)
+ for (i = 0; i < b->batCount; i++)
new[i] = old[i] == int_nil ? oid_nil : (oid)
old[i];
b->H->heap.free = h1.free << 1;
HEAPfree(&h1);
@@ -1430,7 +1430,7 @@ BBPdump(void)
BBP_refs(i),
BBP_lrefs(i),
BBP_status(i),
- b->U->count,
+ b->batCount,
HEAPmemsize(&b->H->heap),
HEAPvmsize(&b->H->heap),
HEAPmemsize(b->H->vheap),
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -60,7 +60,7 @@ checkbats(BAT *b1, BAT *b2, const char *
return GDK_FAIL;
}
if (b2 != NULL) {
- if (b1->U->count != b2->U->count) {
+ if (b1->batCount != b2->batCount) {
GDKerror("%s: inputs not the same size.\n", func);
return GDK_FAIL;
}
@@ -94,8 +94,8 @@ checkbats(BAT *b1, BAT *b2, const char *
#define UNARY_2TYPE_FUNC(TYPE1, TYPE2, FUNC) \
do { \
- const TYPE1 *src = (const TYPE1 *) Tloc(b, b->U->first); \
- TYPE2 *dst = (TYPE2 *) Tloc(bn, bn->U->first); \
+ const TYPE1 *src = (const TYPE1 *) Tloc(b, b->batFirst); \
+ TYPE2 *dst = (TYPE2 *) Tloc(bn, bn->batFirst); \
CANDLOOP(dst, i, TYPE2##_nil, 0, start); \
if (b->T->nonil && cand == NULL) { \
for (i = start; i < end; i++) \
@@ -231,11 +231,11 @@ BATcalcnot(BAT *b, BAT *s)
if (nils != 0 && !b->T->nil) {
b->T->nil = 1;
- b->P->descdirty = 1;
+ b->batDirtydesc = 1;
}
if (nils == 0 && !b->T->nonil) {
b->T->nonil = 1;
- b->P->descdirty = 1;
+ b->batDirtydesc = 1;
}
return bn;
@@ -345,11 +345,11 @@ BATcalcnegate(BAT *b, BAT *s)
if (nils != 0 && !b->T->nil) {
b->T->nil = 1;
- b->P->descdirty = 1;
+ b->batDirtydesc = 1;
}
if (nils == 0 && !b->T->nonil) {
b->T->nonil = 1;
- b->P->descdirty = 1;
+ b->batDirtydesc = 1;
}
return bn;
@@ -464,11 +464,11 @@ BATcalcabsolute(BAT *b, BAT *s)
if (nils && !b->T->nil) {
b->T->nil = 1;
- b->P->descdirty = 1;
+ b->batDirtydesc = 1;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
