Changeset: d46f853f693d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d46f853f693d
Modified Files:
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_partial_sideways.mx
monetdb5/extras/crackers/crackers_updates.mx
Branch: Aug2011
Log Message:
fixed compilation: disabled unused functions
diffs (83 lines):
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
@@ -4055,7 +4055,8 @@ str CRKFullAlignment_@1_@5(int *res, int
@
@= JoinFunctions_impl_2
-str SinglePassJoinPutTuple_@1(@1 *value, oid *id, struct Node *current, BUN
baseLeft, BAT * indexLeft, BAT *firstPieceBAT, struct Node *prevNode){
+#if 0
+static str SinglePassJoinPutTuple_@1(@1 *value, oid *id, struct Node *current,
BUN baseLeft, BAT * indexLeft, BAT *firstPieceBAT, struct Node *prevNode){
@1 *bound;
if (current == NULL){
@@ -4078,8 +4079,9 @@ str SinglePassJoinPutTuple_@1(@1 *value,
return MAL_SUCCEED;
}
-
-str cacheConsciousAlignJoinStep_@1(BAT *mapLeft, BAT *mapRight, struct Node
*curNodeRight, oid startPos, oid endPos, BAT *indexRight, BUN baseRight, BAT *
indexLeft, int mapLpos, oid cacheThreshold, struct Node *firstNodeRight, struct
Node *lastNodeRight, BAT *res){
+#endif
+
+static str cacheConsciousAlignJoinStep_@1(BAT *mapLeft, BAT *mapRight, struct
Node *curNodeRight, oid startPos, oid endPos, BAT *indexRight, BUN baseRight,
BAT * indexLeft, int mapLpos, oid cacheThreshold, struct Node *firstNodeRight,
struct Node *lastNodeRight, BAT *res){
oid newPosition=0;
struct Node *temp, *prevNodeRight;
BAT * viewHeadRight=NULL, *viewRight=NULL, *viewLeft=NULL,
*markedViewRight=NULL;
@@ -4341,7 +4343,8 @@ static void cacheConsciousAlignStep_@1(B
}
}
-void alignStep_@1(BAT *mapLeft, struct Node *curNodeRight, oid startPos, oid
endPos, BAT *indexRight, BUN baseRight, BAT * indexLeft, int mapLpos){
+#if 0
+static void alignStep_@1(BAT *mapLeft, struct Node *curNodeRight, oid
startPos, oid endPos, BAT *indexRight, BUN baseRight, BAT * indexLeft, int
mapLpos){
oid newPosition=0;
@1 bound = *(@1*)Tloc(indexRight, baseRight + curNodeRight->position);
@@ -4358,4 +4361,5 @@ void alignStep_@1(BAT *mapLeft, struct N
alignStep_@1(mapLeft, curNodeRight->right,
newPosition+1, endPos, indexRight, baseRight, indexLeft, mapLpos);
}
}
+#endif
@
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
@@ -487,7 +487,8 @@ getTheLeastUsedMapPiece(int CBindex, int
return res;
}
-void printStorageInfo(){
+#if 0
+static void printStorageInfo(void){
struct mapSetNode *curMapSet;
struct mapNode *curMap;
struct Node *curPiece;
@@ -514,6 +515,7 @@ void printStorageInfo(){
}
printf("\n\n");
}
+#endif
static void
removePieceFromStorageInfo(int batId, int tailBatId, int pieceId){
diff --git a/monetdb5/extras/crackers/crackers_updates.mx
b/monetdb5/extras/crackers/crackers_updates.mx
--- a/monetdb5/extras/crackers/crackers_updates.mx
+++ b/monetdb5/extras/crackers/crackers_updates.mx
@@ -217,7 +217,8 @@ CRKmergeInsertionsB_OnNeed@1(int *k, int
return MAL_SUCCEED;
}
-str
+#if 0
+static str
CRKmergeInsertions_OnNeed@1(int *k, int *bid, int *new, bit *deleteNodes){
int position = existsCrackerIndex(*bid);
(void) k;
@@ -231,6 +232,7 @@ CRKmergeInsertions_OnNeed@1(int *k, int
return MAL_SUCCEED;
}
+#endif
str
CRKmergeDeletions_OnNeed@1(int *k, int *bid, int *del){
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
