Changeset: 6e8ee7a572ed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e8ee7a572ed
Modified Files:
monetdb5/extras/crackers/crackers_AVL_index.mx
monetdb5/extras/crackers/crackers_core_ordered.mx
monetdb5/extras/crackers/crackers_core_unordered.mx
monetdb5/extras/crackers/crackers_crackmerge.mx
monetdb5/extras/crackers/crackers_index.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/crackers/crackers_validation.mx
monetdb5/extras/rdf/rdf_shredder.mx
monetdb5/mal/Tests/tst911.stable.out
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_box.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/modules/atoms/colxml.c
monetdb5/modules/kernel/aggr.mx
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/array.mx
monetdb5/modules/kernel/colcalc.mx
monetdb5/modules/kernel/colcast.mx
monetdb5/modules/kernel/colcolor.mx
monetdb5/modules/kernel/colifthen.mx
monetdb5/modules/kernel/colmmath.mx
monetdb5/modules/kernel/colmtime.mx
monetdb5/modules/kernel/colstr.mx
monetdb5/modules/kernel/column.mx
monetdb5/modules/kernel/group.mx
monetdb5/modules/kernel/kprelude.mx
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/inout.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/pqueue.mx
monetdb5/modules/mal/table_sql.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/optimizer/opt_dictionary.c
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_prejoin.c
monetdb5/scheduler/run_octopus.c
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/BATpropcheck_after_outerjoin.SF-936469.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/BATpropcheck_after_outerjoin.SF-936469.stable.out
monetdb5/tests/BugReports/Tests/no.037.mal
monetdb5/tests/BugReports/Tests/no.037.stable.out
monetdb5/tests/BugReports/Tests/no.051.mal
monetdb5/tests/BugReports/Tests/no.051.stable.out
monetdb5/tests/BugReports/Tests/no.073.stable.out
monetdb5/tests/BugReports/Tests/no.073_s00.mal
monetdb5/tests/BugReports/Tests/no.117.mal
monetdb5/tests/BugReports/Tests/no.117.stable.out
monetdb5/tests/BugReports/Tests/no.165.mal
monetdb5/tests/BugReports/Tests/no.165.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914935.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914935.stable.out.64bit
monetdb5/tests/gdkTests/Tests/bat_replace.mal
monetdb5/tests/gdkTests/Tests/bat_replace.stable.out
Branch: headless
Log Message:
BAT* renamings
diffs (truncated from 5498 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
@@ -117,7 +117,7 @@
BAT *b;
(void) k;
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.make AVL index", "Cannot access
descriptor");
indexPos = newAVLIndex(*bid);
@@ -146,10 +146,10 @@
if (indexPos == -1)
throw(MAL, "crackers.insert AVL index", "No AVL index present
for this BAT");
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.insert AVL index", "Cannot access
descriptor");
- if ((u = BATdescriptor(*uid)) == NULL)
+ if ((u = COLdescriptor(*uid)) == NULL)
throw(MAL, "crackers.insert AVL index", "Cannot access update
descriptor");
cur = BUNfirst(u);
@@ -180,7 +180,7 @@
if (indexPos == -1)
throw(MAL, "crackers.insert AVL index", "No AVL index present
for this BAT");
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.insert AVL index", "Cannot access
descriptor");
result = BATnew(TYPE_oid, TYPE_@1, (BUN)(*(@1*)hgh-*(@1*)low)*2);
@@ -456,10 +456,10 @@
if (indexPos == -1)
throw(MAL, "crackers.delete from AVL index", "No AVL index
present for this BAT");
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.delete from AVL index", "Cannot access
descriptor");
- if ((u = BATdescriptor(*uid)) == NULL)
+ if ((u = COLdescriptor(*uid)) == NULL)
throw(MAL, "crackers.delete from AVL index", "Cannot access
deletions BAT");
if (BATcount(u) == 0){
@@ -470,7 +470,7 @@
/* if necessary, sort in place the insertions bat */
if (u->tsorted == FALSE){
u->restricted = BAT_WRITE;
- BATmirror(BATorder(BATmirror(u)));
+ BATmirror(COLorder(BATmirror(u)));
}
first = BUNfirst(b);
diff --git a/monetdb5/extras/crackers/crackers_core_ordered.mx
b/monetdb5/extras/crackers/crackers_core_ordered.mx
--- a/monetdb5/extras/crackers/crackers_core_ordered.mx
+++ b/monetdb5/extras/crackers/crackers_core_ordered.mx
@@ -90,7 +90,7 @@
str msg;
oid pos;
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.crack_zeroOrdered", "Cannot access
descriptor");
msg = CRKcrackOrderedZero_LE_@1(b,*mid, 0, BATcount(b)-1,&pos);
@@ -105,7 +105,7 @@
BAT *b;
str msg;
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.crack_oneOrdered", "Cannot access
descriptor");
msg = CRKcrackOrderedThree_LE_RE_@1(b,*mid,*mid, 0, BATcount(b)-1);
@@ -120,7 +120,7 @@
str msg;
oid posl,posh;
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.crack_threeOrdered", "Cannot access
descriptor");
msg = CRKcrackOrderedThreeL_LO_RE_@1(b,*low,*hgh, 0,
BATcount(b)-1,&posl, &posh);
diff --git a/monetdb5/extras/crackers/crackers_core_unordered.mx
b/monetdb5/extras/crackers/crackers_core_unordered.mx
--- a/monetdb5/extras/crackers/crackers_core_unordered.mx
+++ b/monetdb5/extras/crackers/crackers_core_unordered.mx
@@ -195,7 +195,7 @@
str msg;
oid pos;
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.crack_zeroUnordered", "Cannot access
descriptor");
/* set bounds for the iterator */
@@ -217,7 +217,7 @@
if (*(@1 *) low > *(@1 *) hgh)
throw(MAL, "crackers.crack_threeUnordered", "illegal range");
- if ((b = BATdescriptor(*bid)) == NULL)
+ if ((b = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.crack_threeUnordered", "Cannot access
descriptor");
/* set bounds for the iterator */
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
@@ -195,15 +195,15 @@
current=CrackerIndex[m].smNode;
resTuplesLocal=0;
br=BATnew(TYPE_oid, bo->ttype,BATcount(bo)/10);
- BATmmap(br, STORE_MMAP, STORE_MMAP, STORE_MMAP, STORE_MMAP, 0);
+ COLmmap(br, STORE_MMAP, STORE_MMAP, STORE_MMAP, STORE_MMAP, 0);
br->restricted= BAT_READ;
while(current!=NULL){
mslice = current->index;
- b=BATdescriptor(current->batId);
+ b=COLdescriptor(current->batId);
if (b==NULL)
throw(MAL, "crackers.crackmerge", "Cannot access
slice");
- if ((c = BATdescriptor(CrackerIndex[mslice].cid)) == NULL)
+ if ((c = COLdescriptor(CrackerIndex[mslice].cid)) == NULL)
throw(MAL, "crackers.crackRange", "Cannot access
cracker index");
/* find out where in the index the low falls */
@@ -347,7 +347,7 @@
@= CrackSearchBounds
printf("\nsearch bounds \n");
markLow=markHgh=0;
- b=BATdescriptor(curNode->pieceBAT);
+ b=COLdescriptor(curNode->pieceBAT);
if (b==NULL)
throw(MAL, "crackers.crackmerge", "Cannot access slice");
@@ -427,7 +427,7 @@
@
@= CrackSearchLow
- b=BATdescriptor(curNode->pieceBAT);
+ b=COLdescriptor(curNode->pieceBAT);
if (b==NULL)
throw(MAL, "crackers.crackmerge", "Cannot access slice");
@@ -456,7 +456,7 @@
@
@= CrackSearchHgh
- b=BATdescriptor(curNode->pieceBAT);
+ b=COLdescriptor(curNode->pieceBAT);
if (b==NULL)
throw(MAL, "crackers.crackmerge", "Cannot access slice");
@@ -530,11 +530,11 @@
b = BATcopy(slice, bo->htype, bo->ttype, TRUE);
BBPunfix(slice->batCacheid);
if ( bo->htype == TYPE_void)
- b = BATmaterializeh(b);
+ b = COLmaterializeh(b);
mslice =
newCrackerIndexSlice_@1(b->batCacheid,b->batCacheid,100);
- if ((c = BATdescriptor(CrackerIndex[mslice].cid)) ==
NULL)
+ if ((c = COLdescriptor(CrackerIndex[mslice].cid)) ==
NULL)
throw(MAL, "crackers.crackmerge", "Cannot
access crack index");
cl1 = BUNfirst(b);
@@ -585,7 +585,7 @@
mslice =
newCrackerIndexSlice_@1(b->batCacheid,b->batCacheid,100);
- if ((c = BATdescriptor(CrackerIndex[mslice].cid)) ==
NULL)
+ if ((c = COLdescriptor(CrackerIndex[mslice].cid)) ==
NULL)
throw(MAL, "crackers.crackmerge", "Cannot
access crack index");
cl1 = BUNfirst(b);
@@ -651,7 +651,7 @@
m = existsCrackerIndex(*bid);
- if ((bo = BATdescriptor(*bid)) == NULL)
+ if ((bo = COLdescriptor(*bid)) == NULL)
throw(MAL, "crackers.crackmerge", "Cannot access descriptor");
/* if this is the first time we select something from this bat,
@@ -661,11 +661,11 @@
oid endSlice,startSlice;
br=BATnew(TYPE_oid, bo->ttype,BATcount(bo)/10);
- BATmmap(br, STORE_MMAP, STORE_MMAP, STORE_MMAP, STORE_MMAP, 0);
+ COLmmap(br, STORE_MMAP, STORE_MMAP, STORE_MMAP, STORE_MMAP, 0);
br->restricted= BAT_READ;
m = newCrackerIndexSlice_@1(*bid,br->batCacheid,1000000);
- if ((cr = BATdescriptor(CrackerIndex[m].cid)) == NULL)
+ if ((cr = COLdescriptor(CrackerIndex[m].cid)) == NULL)
throw(MAL, "crackers.crackmerge", "Cannot access crack
index");
current=NULL;
@@ -701,7 +701,7 @@
}
/*For every other query other than the first*/
- if ((cr = BATdescriptor(CrackerIndex[m].cid)) == NULL)
+ if ((cr = COLdescriptor(CrackerIndex[m].cid)) == NULL)
throw(MAL, "crackers.crackmerge", "Cannot access crack index");
base = BUNfirst(cr);
diff --git a/monetdb5/extras/crackers/crackers_index.mx
b/monetdb5/extras/crackers/crackers_index.mx
--- a/monetdb5/extras/crackers/crackers_index.mx
+++ b/monetdb5/extras/crackers/crackers_index.mx
@@ -293,7 +293,7 @@
if (i == -1)
fprintf(stderr, " the crack index does not exist \n");
- BATprint(BATdescriptor(CrackerIndex[i].cid));
+ COLprint(COLdescriptor(CrackerIndex[i].cid));
return MAL_SUCCEED;
}
@@ -310,7 +310,7 @@
if (position == -1)
fprintf(stderr, " the crack index does not exist \n");
- if ((c = BATdescriptor(CrackerIndex[position].cid)) == NULL)
+ if ((c = COLdescriptor(CrackerIndex[position].cid)) == NULL)
throw(MAL, "crackers.CRKprintAVLTree_int", "Cannot access
cracker index");
idxFirst = BUNfirst(c);
@@ -329,7 +329,7 @@
if (i == -1)
fprintf(stderr, " the crack index does not exist \n");
- BATprint(BATdescriptor(CrackerIndex[i].cbid));
+ COLprint(COLdescriptor(CrackerIndex[i].cbid));
return MAL_SUCCEED;
}
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
@@ -150,7 +150,7 @@
if (_idx < _slices) {
/* outliers detected, compute a real
sample on at most 1% of the data */
_sample = MIN(_lcount / 100, (1 <<
SAMPLE_TRESHOLD_LOG) / 3);
- _tmp2 = BATsample(_tmp1, _sample);
+ _tmp2 = COLsample(_tmp1, _sample);
if (_tmp2) {
_tmp3 = BATjoin(_tmp2, r,
BUN_NONE); /* might be expensive */
if (_tmp3) {
@@ -459,7 +459,7 @@
@:TypeSwitch_1(JoinFunctions_impl_1)@
str CRKbatCount(lng *count, int *bid){
- BAT *b=BATdescriptor(*bid);
+ BAT *b=COLdescriptor(*bid);
if (b==NULL)
throw(MAL, "crack bat count", "Cannot access BAT");
*count = BATcount(b);
@@ -468,10 +468,10 @@
}
str CRKmaterializeH(int *res, int *bid){
- BAT *b=BATdescriptor(*bid);
+ BAT *b=COLdescriptor(*bid);
if (b==NULL)
throw(MAL, "crack materialize head", "Cannot access BAT");
- b=BATmaterializeh(b);
+ b=COLmaterializeh(b);
BBPunfix(b->batCacheid);
(void)res;
return MAL_SUCCEED;
@@ -527,9 +527,9 @@
#ifdef DEBUG_CRACKERS_JOIN
printf("\n Left \n");
- BATprint(markedViewLeft);
+ COLprint(markedViewLeft);
printf("\n Right \n");
- BATprint(markedViewRight);
+ COLprint(markedViewRight);
#endif
sizeLeft = curPosLeft - prevPosLeft + 1;
sizeRight = curPosRight - prevPosRight + 1;
@@ -548,7 +548,7 @@
#ifdef DEBUG_CRACKERS_JOIN
printf("\n Res \n");
- BATprint(res);
+ COLprint(res);
@:dumpIndex(Index Left)@
#endif
@
@@ -572,9 +572,9 @@
#ifdef DEBUG_CRACKERS_JOIN
printf("\n Left \n");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
