Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/crackers
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11588
Modified Files:
crackers_joins.mx
Log Message:
fix "variable not used" errors
Index: crackers_joins.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/crackers/crackers_joins.mx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- crackers_joins.mx 15 Jan 2008 16:34:21 -0000 1.4
+++ crackers_joins.mx 17 Jan 2008 09:03:17 -0000 1.5
@@ -367,7 +367,6 @@
@= MoveToNextPiece
//printf("Move @2 \n");
[EMAIL PROTECTED] = [EMAIL PROTECTED];
- [EMAIL PROTECTED] = [EMAIL PROTECTED];
[EMAIL PROTECTED] = findNextPiece([EMAIL PROTECTED]);
if ([EMAIL PROTECTED] == NULL){
// printf(" Skip the rest of the opposite(@2) pieces because @2
pieces are done \n");
@@ -462,14 +461,14 @@
BAT *indexLeft, *mapLeft, *viewLeft, *markedViewLeft, *viewHeadLeft;
BUN curTupleLeft, baseLeft;
oid curPosLeft, prevPosLeft;
- @1 curValueLeft, prevValueLeft;
+ @1 curValueLeft;
int tapeRpos, mapRpos;
struct Node *curNodeRight;
BAT *indexRight, *mapRight, *viewRight, *markedViewRight,
*viewHeadRight;
BUN curTupleRight, baseRight;
oid curPosRight, prevPosRight;
- @1 curValueRight, prevValueRight;
+ @1 curValueRight;
BAT *res;
@@ -535,7 +534,6 @@
@:JoinTwoPieces()@
- prevValueLeft = prevValueRight = 0;
while (1){
if (curValueLeft < curValueRight ||
@@ -572,7 +570,7 @@
BAT *indexLeft, *mapLeft, *viewLeft, *markedViewLeft, *viewHeadLeft;
BUN curTupleLeft, baseLeft;
oid curPosLeft, prevPosLeft;
- @1 curValueLeft, prevValueLeft;
+ @1 curValueLeft;
bit crackedLeft;
int tapeRpos, mapRpos;
@@ -580,7 +578,7 @@
BAT *indexRight, *mapRight, *viewRight, *markedViewRight,
*viewHeadRight;
BUN curTupleRight, baseRight;
oid curPosRight, prevPosRight;
- @1 curValueRight, prevValueRight;
+ @1 curValueRight;
bit crackedRight;
BAT *res;
@@ -644,7 +642,6 @@
res = BATnew(TYPE_oid,TYPE_oid,5*BATcount(mapRight));
prevPosLeft = prevPosRight = -1;
- prevValueLeft = prevValueRight = 0;
while (1){
@@ -723,12 +720,10 @@
joinsDone++;
prevPosLeft = curPosLeft;
- prevValueLeft = curValueLeft;
if (crackedLeft == FALSE)
curNodeLeft = findNextPiece(curNodeLeft);
prevPosRight = curPosRight;
- prevValueRight = curValueRight;
if (crackedRight == FALSE)
curNodeRight = findNextPiece(curNodeRight);
@@ -830,12 +825,10 @@
joinsDone++;
prevPosLeft = curPosLeft;
- prevValueLeft = curValueLeft;
if (crackedLeft == FALSE && curNodeLeft != NULL)
curNodeLeft = findNextPiece(curNodeLeft);
prevPosRight = curPosRight;
- prevValueRight = curValueRight;
if (crackedRight == FALSE && curNodeRight != NULL)
curNodeRight = findNextPiece(curNodeRight);
}
@@ -864,7 +857,7 @@
BAT *indexLeft, *mapLeft, *viewLeft, *markedViewLeft, *viewHeadLeft;
BUN curTupleLeft, baseLeft;
oid curPosLeft, prevPosLeft;
- @1 curValueLeft, prevValueLeft;
+ @1 curValueLeft;
bit crackedLeft, existsHashTableLeft;
int tapeRpos, mapRpos;
@@ -872,7 +865,7 @@
BAT *indexRight, *mapRight, *viewRight, *markedViewRight,
*viewHeadRight;
BUN curTupleRight, baseRight;
oid curPosRight, prevPosRight;
- @1 curValueRight, prevValueRight;
+ @1 curValueRight;
bit crackedRight, existsHashTableRight;
BAT *res;
@@ -937,7 +930,6 @@
prevPosLeft = prevPosRight = -1;
prevNodeLeft = prevNodeRight = NULL;
- prevValueLeft = prevValueRight = 0;
/*
printf("\n New Join Index Left \n");
@@ -1024,7 +1016,6 @@
joinsDone++;
prevPosLeft = curPosLeft;
- prevValueLeft = curValueLeft;
if (crackedLeft == FALSE){
prevNodeLeft = curNodeLeft;
curNodeLeft = findNextPiece(curNodeLeft);
@@ -1036,7 +1027,6 @@
}
prevPosRight = curPosRight;
- prevValueRight = curValueRight;
if (crackedRight == FALSE){
prevNodeRight = curNodeRight;
curNodeRight = findNextPiece(curNodeRight);
@@ -1145,7 +1135,6 @@
joinsDone++;
prevPosLeft = curPosLeft;
- prevValueLeft = curValueLeft;
if (crackedLeft == FALSE){
prevNodeLeft = curNodeLeft;
curNodeLeft = findNextPiece(curNodeLeft);
@@ -1157,7 +1146,6 @@
}
prevPosRight = curPosRight;
- prevValueRight = curValueRight;
if (crackedRight == FALSE){
prevNodeRight = curNodeRight;
curNodeRight = findNextPiece(curNodeRight);
@@ -1190,18 +1178,18 @@
str [EMAIL PROTECTED](int *resid, int *bidL1, int *bidR1, int *bidR2){
lng T1=GDKusec(), TJtotal = 0, TJ1, TJ2, T2;
int mapLpos;
- struct Node *curNodeLeft, *prevNodeLeft;
+ struct Node *curNodeLeft;
BAT *indexLeft, *mapLeft, *viewLeft, *markedViewLeft, *viewHeadLeft;
BUN curTupleLeft, baseLeft;
oid curPosLeft, prevPosLeft;
- @1 curValueLeft, prevValueLeft;
+ @1 curValueLeft;
int tapeRpos, mapRpos;
struct Node *curNodeRight, *prevNodeRight;
BAT *indexRight, *mapRight, *viewRight, *markedViewRight=NULL,
*viewHeadRight;
BUN curTupleRight, baseRight;
oid curPosRight, prevPosRight;
- @1 curValueRight, prevValueRight;
+ @1 curValueRight;
bit existsHashTableRight=FALSE;
BAT *res;
@@ -1256,8 +1244,7 @@
res = BATnew(TYPE_oid,TYPE_oid,5*BATcount(mapRight));
prevPosLeft = prevPosRight = -1;
- prevNodeLeft = prevNodeRight = NULL;
- prevValueLeft = prevValueRight = 0;
+ prevNodeRight = NULL;
/*
printf("\n New Join Index Left \n");
@@ -1305,7 +1292,6 @@
((curValueLeft == curValueRight) && (curNodeRight->inclusive
== FALSE) && (curNodeLeft->inclusive == TRUE))){
printf("\n skiping right \n");
prevPosRight = curPosRight;
- prevValueRight = curValueRight;
prevNodeRight = curNodeRight;
curNodeRight = findNextPiece(curNodeRight);
@@ -1318,12 +1304,9 @@
joinsDone++;
prevPosLeft = curPosLeft;
- prevValueLeft = curValueLeft;
- prevNodeLeft = curNodeLeft;
curNodeLeft = findNextPiece(curNodeLeft);
prevPosRight = curPosRight;
- prevValueRight = curValueRight;
prevNodeRight = curNodeRight;
curNodeRight = findNextPiece(curNodeRight);
}
@@ -1366,7 +1349,7 @@
BAT *BATLeft, *b, *c, *res, *view;
int m;
@1 currentValue;
- BUN idxFirst, currentTupleLeft;
+ BUN currentTupleLeft;
oid *currentResTupleHead, *currentResTupleTail, *curViewTupleHead,
*currentTupleLeftHead;
oid numberOfTuplesLeft;
bit HBound;
@@ -1411,8 +1394,6 @@
@:addPartialResult()@
currentTupleLeft ++;
- idxFirst = BUNfirst(c);
-
for(i=1;i<numberOfTuplesLeft;i++){
currentValue = *(@1*)Tloc(BATLeft, currentTupleLeft);
currentTupleLeftHead = (oid*)Hloc(BATLeft, currentTupleLeft);
@@ -1561,7 +1542,6 @@
str [EMAIL PROTECTED](int *res, int *bidL, int *bidR1, int *bidR2){
int mapLpos;
BAT *indexLeft, *mapLeft;
- BUN baseLeft;
int tapeRpos, mapRpos;
BAT *indexRight, *mapRight;
@@ -1583,8 +1563,6 @@
if ((mapLeft = BATdescriptor(CrackerIndex[mapLpos].cbid)) == NULL)
throw(MAL, "crackers.fullAllignement", "Cannot access crack
map left");
- baseLeft = BUNfirst(indexLeft);
-
/* Get the cracker tape for the set of the right map or create one if
it does not exist */
tapeRpos = existsCrackerIndexSideways(*bidR1, -1);
if (tapeRpos == -1)
@@ -1611,7 +1589,7 @@
alignStep(mapLeft, CrackerIndex[mapRpos].Tree, 0, BATcount(mapLeft)-1,
indexRight, baseRight, indexLeft, mapLpos);
/*
printf("\n Index Left \n");
-printAVLTree(CrackerIndex[mapLpos].Tree, indexLeft, baseLeft, bunSizeLeft);
+printAVLTree(CrackerIndex[mapLpos].Tree, indexLeft, BUNfirst(indexLeft),
bunSizeLeft);
printf("\n Index Right \n");
printAVLTree(CrackerIndex[mapRpos].Tree, indexRight, baseRight, bunSizeRight);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
