Changeset: ca8ef5ca5784 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca8ef5ca5784
Modified Files:
monetdb5/extras/crackers/crackers_AVL_index.mx
monetdb5/extras/crackers/crackers_crackmerge.mx
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_joinselect_ops.mx
monetdb5/extras/crackers/crackers_partial_sideways.mx
monetdb5/extras/crackers/crackers_select_ops.mx
monetdb5/extras/crackers/crackers_sideways.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/extras/crackers/crackers_updates.mx
monetdb5/extras/rdf/rdf_shredder.mx
monetdb5/mal/Tests/tst270.stable.out
monetdb5/mal/Tests/tst870.stable.out
monetdb5/mal/mal_debugger.c
monetdb5/modules/kernel/column.mx
monetdb5/modules/kernel/group.mx
monetdb5/modules/mal/extensions.c
monetdb5/modules/mal/mkey.c
monetdb5/optimizer/opt_prejoin.c
monetdb5/tests/BugsViaSourgeforce/Tests/ID.823516.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.823516.stable.out.64bit
monetdb5/tests/suite_00/Tests/test_00.stable.out
monetdb5/tests/suite_00/Tests/test_02.stable.out
Branch: headless
Log Message:
bat* renames
diffs (truncated from 1151 to 300 lines):
diff --git a/monetdb5/extras/crackers/crackers_AVL_index.mx
b/monetdb5/extras/crackers/crackers_AVL_index.mx
--- a/monetdb5/extras/crackers/crackers_AVL_index.mx
+++ b/monetdb5/extras/crackers/crackers_AVL_index.mx
@@ -469,7 +469,7 @@
/* if necessary, sort in place the insertions bat */
if (u->tsorted == FALSE){
- u->batRestricted = BAT_WRITE;
+ u->restricted = BAT_WRITE;
BATmirror(BATorder(BATmirror(u)));
}
diff --git a/monetdb5/extras/crackers/crackers_crackmerge.mx
b/monetdb5/extras/crackers/crackers_crackmerge.mx
--- a/monetdb5/extras/crackers/crackers_crackmerge.mx
+++ b/monetdb5/extras/crackers/crackers_crackmerge.mx
@@ -196,7 +196,7 @@
resTuplesLocal=0;
br=BATnew(TYPE_oid, bo->ttype,BATcount(bo)/10);
BATmmap(br, STORE_MMAP, STORE_MMAP, STORE_MMAP, STORE_MMAP, 0);
- br->batRestricted= BAT_READ;
+ br->restricted= BAT_READ;
while(current!=NULL){
mslice = current->index;
@@ -662,7 +662,7 @@
br=BATnew(TYPE_oid, bo->ttype,BATcount(bo)/10);
BATmmap(br, STORE_MMAP, STORE_MMAP, STORE_MMAP, STORE_MMAP, 0);
- br->batRestricted= BAT_READ;
+ br->restricted= BAT_READ;
m = newCrackerIndexSlice_@1(*bid,br->batCacheid,1000000);
if ((cr = BATdescriptor(CrackerIndex[m].cid)) == NULL)
diff --git a/monetdb5/extras/crackers/crackers_joins.mx
b/monetdb5/extras/crackers/crackers_joins.mx
--- a/monetdb5/extras/crackers/crackers_joins.mx
+++ b/monetdb5/extras/crackers/crackers_joins.mx
@@ -192,7 +192,7 @@
goto bunins_done; \
if (_p + 1 > BATcapacity(b)) { \
if (limit) { \
- *limit = (BUN) (b->batCount * (percdone)); \
+ *limit = (BUN) (b->count * (percdone)); \
goto bunins_done;
\
} \
if (BATextend(b, BATgrows(b)) == NULL) \
@@ -200,7 +200,7 @@
} \
hfastins_nocheck(b, _p, h, Hsize(b)); \
tfastins_nocheck(b, _p, t, Tsize(b)); \
- (b)->batCount++; \
+ (b)->count++; \
}
@= mergejoin
if (((!BATtvoid(l)) || l->tseqbase != oid_nil) &&
@@ -1210,7 +1210,7 @@
if ((b = BATdescriptor(@3)) == NULL)
throw(MAL, "crackers.create new map", "Cannot access
descriptor of map head BAT");
- b->batRestricted= BAT_WRITE;
+ b->restricted= BAT_WRITE;
if ( b->ttype == TYPE_void)
b = BATmirror(BATmaterializeh(BATmirror(b)));
if ( b->htype == TYPE_void)
@@ -1225,7 +1225,7 @@
/*BATkey(b,TRUE);*/
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
c = BATnew(TYPE_oid, TYPE_@1, IndexEntries); /* TODO: size */
@@ -1254,7 +1254,7 @@
throw(MAL, "crackers.create new map", "Cannot access
descriptor of map head BAT");
b = BATcopy(bo, bo->htype, bo->ttype, TRUE);
- b->batRestricted= BAT_WRITE;
+ b->restricted= BAT_WRITE;
if ( b->ttype == TYPE_void)
b = BATmirror(BATmaterializeh(BATmirror(b)));
if ( b->htype == TYPE_void)
@@ -1270,7 +1270,7 @@
/*BATkey(b,TRUE);*/
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
c = BATnew(TYPE_oid, TYPE_@1, IndexEntries); /* TODO: size */
@@ -1312,7 +1312,7 @@
/*BATkey(b,TRUE);*/
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
BATsetcount(b, sizeM);
@@ -1379,7 +1379,7 @@
/*BATkey(b,TRUE);*/
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
BATsetcount(b, sizeM);
@@ -3953,7 +3953,7 @@
if ((mapLeft = BATdescriptor(*bidL)) == NULL)
throw(MAL, "crackers.fullAllignement", "Cannot access crack
map left");
- mapLeft->batRestricted= BAT_READ;
+ mapLeft->restricted= BAT_READ;
/* Get the cracker tape for the set of the right map or create one if
it does not exist */
tapeRpos = existsCrackerIndexSideways(*bidR1, -1);
@@ -4025,7 +4025,7 @@
if ((mapLeft = BATdescriptor(CrackerIndex[mapLpos].cbid)) == NULL)
throw(MAL, "crackers.fullAllignement", "Cannot access crack
map left");
- mapLeft->batRestricted= BAT_READ;
+ mapLeft->restricted= BAT_READ;
/* Get the cracker tape for the set of the right map or create one if
it does not exist */
tapeRpos = existsCrackerIndexSideways(*bidR1, -1);
@@ -4295,7 +4295,7 @@
/* sort in place the right bat */
if (BATRight->tsorted == FALSE){
- BATRight->batRestricted = BAT_WRITE;
+ BATRight->restricted = BAT_WRITE;
BATmirror(BATorder(BATmirror(BATRight)));
}
diff --git a/monetdb5/extras/crackers/crackers_joinselect_ops.mx
b/monetdb5/extras/crackers/crackers_joinselect_ops.mx
--- a/monetdb5/extras/crackers/crackers_joinselect_ops.mx
+++ b/monetdb5/extras/crackers/crackers_joinselect_ops.mx
@@ -118,7 +118,7 @@
d->tdense = FALSE;
BATseqbase(BATmirror(d), oid_nil);
BATkey(BATmirror(d), FALSE);
- d->batRestricted= BAT_READ;
+ d->restricted= BAT_READ;
BBPkeepref(d->batCacheid);
*res = d->batCacheid;
BBPunfix(*left);
@@ -307,7 +307,7 @@
d->tdense = FALSE;
BATseqbase(BATmirror(d), oid_nil);
BATkey(BATmirror(d), FALSE);
- d->batRestricted= BAT_READ;
+ d->restricted= BAT_READ;
BBPkeepref(d->batCacheid);
*res=d->batCacheid;
diff --git a/monetdb5/extras/crackers/crackers_partial_sideways.mx
b/monetdb5/extras/crackers/crackers_partial_sideways.mx
--- a/monetdb5/extras/crackers/crackers_partial_sideways.mx
+++ b/monetdb5/extras/crackers/crackers_partial_sideways.mx
@@ -679,7 +679,7 @@
BATsetcount(pieceMap,size);
BATkey(BATmirror(pieceMap),FALSE);
- pieceMap->batRestricted= BAT_READ;
+ pieceMap->restricted= BAT_READ;
BATmode(pieceMap,PERSISTENT);
if (StorageInfo->setThreshold == TRUE){
@@ -996,7 +996,7 @@
}
else{
BATmode(h,PERSISTENT);
- h->batRestricted= BAT_WRITE;
+ h->restricted= BAT_WRITE;
node->tape = h->batCacheid;
BBPkeepref(h->batCacheid);
@@ -1035,7 +1035,7 @@
b->tdense = FALSE;
/*BATkey(b,TRUE);*/
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
BATsetcount(b, sizeB);
@@ -1043,7 +1043,7 @@
c = BATnew(TYPE_oid, TYPE_@1, IndexEntries); /* TODO: size */
m = newCrackerIndexSideways_@1(*bid, b->batCacheid,-1,
c->batCacheid);
- bo->batRestricted= BAT_READ;
+ bo->restricted= BAT_READ;
BBPunfix(bo->batCacheid);
if (StorageInfo == NULL){
diff --git a/monetdb5/extras/crackers/crackers_select_ops.mx
b/monetdb5/extras/crackers/crackers_select_ops.mx
--- a/monetdb5/extras/crackers/crackers_select_ops.mx
+++ b/monetdb5/extras/crackers/crackers_select_ops.mx
@@ -380,9 +380,9 @@
b->tdense = FALSE;
/*BATkey(b,TRUE);*/
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
- bo->batRestricted= BAT_READ;
+ bo->restricted= BAT_READ;
m = newCrackerIndex_@1(*bid,b->batCacheid);
@@ -411,10 +411,10 @@
b->hdense = FALSE;
b->tdense = FALSE;
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
BATsetcount(b,BATcount(bo));
- bo->batRestricted= BAT_READ;
+ bo->restricted= BAT_READ;
m = newCrackerIndex_@1(*bid,b->batCacheid);
@@ -725,7 +725,7 @@
/* if necessary, sort in place the deletions bat */
if (u->tsorted == FALSE){
- u->batRestricted = BAT_WRITE;
+ u->restricted = BAT_WRITE;
BATmirror(BATorder(BATmirror(u)));
}
@@ -818,7 +818,7 @@
/* if necessary, sort in place the insertions bat */
if (u->tsorted == FALSE){
- u->batRestricted = BAT_WRITE;
+ u->restricted = BAT_WRITE;
BATmirror(BATorder(BATmirror(u)));
}
@@ -929,9 +929,9 @@
b->tsorted = FALSE;
b->hdense = FALSE;
b->tdense = FALSE;
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
- bo->batRestricted= BAT_READ;
+ bo->restricted= BAT_READ;
m = newCrackerIndex_@1(*bid,b->batCacheid);
@@ -1022,9 +1022,9 @@
b->tsorted = FALSE;
b->hdense = FALSE;
b->tdense = FALSE;
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
- bo->batRestricted= BAT_READ;
+ bo->restricted= BAT_READ;
m = newCrackerIndex_@1(*bid,b->batCacheid);
diff --git a/monetdb5/extras/crackers/crackers_sideways.mx
b/monetdb5/extras/crackers/crackers_sideways.mx
--- a/monetdb5/extras/crackers/crackers_sideways.mx
+++ b/monetdb5/extras/crackers/crackers_sideways.mx
@@ -1862,12 +1862,12 @@
/* make sure we use the correct capacity */
tcap = (BUN)
(b->ttype?b->T->heap.size>>b->T->shift:0);
- b->batCapacity = tcap;
+ b->capacity = tcap;
/* first/inserted must point equally far into
the heap as in the source */
- b->batFirst = bp->batFirst;
- b->batInserted = bp->batInserted;
+ b->first = bp->first;
+ b->inserted = bp->inserted;
/* if we have copy-on-write heaps, bn is a
logical view on b to ensure the heaps stay stable */
if (tremap || tvremap) {
@@ -1892,7 +1892,7 @@
/*BATkey(b,TRUE);*/
BATkey(BATmirror(b),FALSE);
- b->batRestricted= BAT_READ;
+ b->restricted= BAT_READ;
BATmode(b,PERSISTENT);
BATsetcount(b, sizeM);
@@ -1950,7 +1950,7 @@
/* if necessary, sort in place the insertions bat */
if (u->tsorted == FALSE){
- u->batRestricted = BAT_WRITE;
+ u->restricted = BAT_WRITE;
BATmirror(BATorder(BATmirror(u)));
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
