Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/crackers
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7851
Modified Files:
crackers_joins.mx
Log Message:
enclose the remaining debug printf commands within DEBUG_CRACKERS_JOIN
Index: crackers_joins.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/crackers/crackers_joins.mx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- crackers_joins.mx 17 Jan 2008 10:30:41 -0000 1.7
+++ crackers_joins.mx 18 Jan 2008 15:16:27 -0000 1.8
@@ -680,7 +680,9 @@
[EMAIL PROTECTED]@1(mapRight, curValueLeft,
prevPosRight+1, curPosRight, &newPosition);
else
[EMAIL PROTECTED]@1(mapRight, curValueLeft,
prevPosRight+1, curPosRight, &newPosition);
- //printf("newPos %lld \n",newPosition);
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("newPos %lld \n",newPosition);
+#endif
TC2=GDKusec();
TCtotal+=TC2-TC1;
@@ -695,7 +697,9 @@
else if (curValueRight < curValueLeft ||
((curValueLeft == curValueRight) && (curNodeRight->inclusive
== FALSE) && (curNodeLeft->inclusive == TRUE))){
- //printf("crack Left \n");
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("crack Left \n");
+#endif
crackedOperationsLeft++;
@@ -705,7 +709,9 @@
else
[EMAIL PROTECTED]@1(mapLeft, curValueRight,
prevPosLeft+1, curPosLeft, &newPosition);
- //printf("newPos %lld \n",newPosition);
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("newPos %lld \n",newPosition);
+#endif
TC2=GDKusec();
TCtotal+=TC2-TC1;
@@ -765,7 +771,9 @@
else
[EMAIL PROTECTED]@1(mapRight, curValueLeft,
prevPosRight+1, curPosRight, &newPosition);
- //printf("newPos %lld \n",newPosition);
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("newPos %lld \n",newPosition);
+#endif
TC2=GDKusec();
TCtotal+=TC2-TC1;
@@ -777,7 +785,9 @@
}
else { /* this means that there is no chance to join
with the future pieces of the other side */
- //printf("skippiing the rest of the pieces
left");
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("skippiing the rest of the pieces left");
+#endif
@:JoinTwoPieces()@
joinsDone++;
@@ -794,7 +804,9 @@
else
[EMAIL PROTECTED]@1(mapLeft, curValueRight,
prevPosLeft+1, curPosLeft, &newPosition);
- //printf("newPos %lld \n",newPosition);
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("newPos %lld \n",newPosition);
+#endif
TC2=GDKusec();
TCtotal+=TC2-TC1;
@@ -806,7 +818,9 @@
}
else {
- //printf("skipping the rest of the pieces
right");
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("skipping the rest of the pieces right");
+#endif
@:JoinTwoPieces()@
joinsDone++;
@@ -815,7 +829,9 @@
}
else if (curNodeLeft == NULL && curNodeRight == NULL){
- //printf(" into the last piece for both maps \n");
+#ifdef DEBUG_CRACKERS_JOIN
+ printf(" into the last piece for both maps \n");
+#endif
@:JoinTwoPieces()@
joinsDone++;
@@ -916,11 +932,13 @@
/* Take the map */
if ((mapRight = BATdescriptor(CrackerIndex[mapRpos].cbid)) == NULL)
throw(MAL, "crackers.simpleJoin", "Cannot access crack index");
- /*
+
+#ifdef DEBUG_CRACKERS_JOIN
printf("maps\n");
BATprint(mapLeft);
BATprint(mapRight);
- */
+#endif
+
/* Get the piece that holds the lowest values */
curNodeRight = getFirstNode(CrackerIndex[mapRpos].Tree);
@@ -964,7 +982,9 @@
if (curValueLeft < curValueRight ||
((curValueLeft == curValueRight) && (curNodeLeft->inclusive ==
FALSE) && (curNodeRight->inclusive == TRUE))){
- //printf("crack Right \n");
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("crack Right \n");
+#endif
crackedOperationsRight++;
@@ -973,7 +993,9 @@
[EMAIL PROTECTED]@1(mapRight, curValueLeft,
prevPosRight+1, curPosRight, &newPosition);
else
[EMAIL PROTECTED]@1(mapRight, curValueLeft,
prevPosRight+1, curPosRight, &newPosition);
- //printf("newPos %lld \n",newPosition);
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("newPos %lld \n",newPosition);
+#endif
TC2=GDKusec();
TCtotal+=TC2-TC1;
@@ -988,7 +1010,9 @@
else if (curValueRight < curValueLeft ||
((curValueLeft == curValueRight) && (curNodeRight->inclusive
== FALSE) && (curNodeLeft->inclusive == TRUE))){
- //printf("crack Left \n");
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("crack Left \n");
+#endif
crackedOperationsLeft++;
@@ -998,7 +1022,9 @@
else
[EMAIL PROTECTED]@1(mapLeft, curValueRight,
prevPosLeft+1, curPosLeft, &newPosition);
- //printf("newPos %lld \n",newPosition);
+#ifdef DEBUG_CRACKERS_JOIN
+ printf("newPos %lld \n",newPosition);
+#endif
TC2=GDKusec();
TCtotal+=TC2-TC1;
@@ -1296,7 +1322,10 @@
while (curValueRight < curValueLeft ||
((curValueLeft == curValueRight) && (curNodeRight->inclusive
== FALSE) && (curNodeLeft->inclusive == TRUE))){
+
+#ifdef DEBUG_CRACKERS_JOIN
printf("\n skiping right \n");
+#endif
prevPosRight = curPosRight;
prevNodeRight = curNodeRight;
curNodeRight = findNextPiece(curNodeRight);
@@ -1590,7 +1619,10 @@
baseRight = BUNfirst(indexRight);
- if (CrackerIndex[mapRpos].Tree == NULL) printf("\n head is null \n");
+#ifdef DEBUG_CRACKERS_JOIN
+ if (CrackerIndex[mapRpos].Tree == NULL)
+ printf("\n head is null \n");
+#endif
alignStep(mapLeft, CrackerIndex[mapRpos].Tree, 0, BATcount(mapLeft)-1,
indexRight, baseRight, indexLeft, mapLpos);
@:dumpIndex(Index Left)@
-------------------------------------------------------------------------
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
