Changeset: d3c7a2940aaf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3c7a2940aaf
Modified Files:
monetdb5/extras/bwd/operations.c
monetdb5/extras/bwd/utilities.c
Branch: bwd
Log Message:
* a little bit of cleaning up (don't overestimate this :-))
* largely semi-commented out the printfs
Unterschiede (118 Zeilen):
diff --git a/monetdb5/extras/bwd/operations.c b/monetdb5/extras/bwd/operations.c
--- a/monetdb5/extras/bwd/operations.c
+++ b/monetdb5/extras/bwd/operations.c
@@ -62,7 +62,7 @@ str BWDLeftJoinApproximate(bat * res, ba
}
BAT* left = BATdescriptor(*l);
- printf ("%s left bat (%d) is of type [%s%s, %s%s]\n", __func__,
left->batCacheid, typeNames[BAThtype(left)], BAThvoid(left)?" (void)":"",
typeNames[BATttype(left)], BATtvoid(left)?" (void)":"");
+ if(0) printf ("%s left bat (%d) is of type [%s%s, %s%s]\n", __func__,
left->batCacheid, typeNames[BAThtype(left)], BAThvoid(left)?" (void)":"",
typeNames[BATttype(left)], BATtvoid(left)?" (void)":"");
if(0 && BAThvoid(left) && BATtvoid(left) && BAThvoid(right) &&
right->tseqbase != oid_nil){
// the more I think about this, the more I feel this case can
never happen
@@ -162,7 +162,7 @@ str BWDLeftJoinRefine(bat * res, bat * l
return ALGleftjoin(res, l, r);
}
BAT* left = BATdescriptor(*l);
- printf ("%s left bat (%d) is of type [%s%s, %s%s]\n", __func__,
left->batCacheid, typeNames[BAThtype(left)], BAThvoid(left)?" (void)":"",
typeNames[BATttype(left)], BATtvoid(left)?" (void)":"");
+ if(0) printf ("%s left bat (%d) is of type [%s%s, %s%s]\n", __func__,
left->batCacheid, typeNames[BAThtype(left)], BAThvoid(left)?" (void)":"",
typeNames[BATttype(left)], BATtvoid(left)?" (void)":"");
BAT* right = BATdescriptor(*r);
BAT* refinement;
@@ -289,7 +289,7 @@ BAT* data = BATdescriptor(*bid);
err = clEnqueueNDRangeKernel(getCommandQueue(), selectKernel,
1, (const size_t[]){0}, (const size_t[]){dataCount}, (const size_t[]){1}, 0,
NULL, NULL);
if(err) printf("#%s, clEnqueueNDRangeKernel: %s;\n", __func__,
clError(err));
}
- printf ("%s result bat (%d) is of type [%s%s, %s%s]\n", __func__,
result->batCacheid, typeNames[BAThtype(result)], BAThvoid(result)?" (void)":"",
typeNames[BATttype(result)], BATtvoid(result)?" (void)":"");
+ if(0) printf ("%s result bat (%d) is of type [%s%s, %s%s]\n", __func__,
result->batCacheid, typeNames[BAThtype(result)], BAThvoid(result)?" (void)":"",
typeNames[BATttype(result)], BATtvoid(result)?" (void)":"");
BBPkeepref(*res = result->batCacheid);
BBPreleaseref(*bid);
return MAL_SUCCEED;
@@ -430,7 +430,7 @@ str uselectrefine(bat *res, bat *bid, pt
BBPreleaseref(approximation->batCacheid);
}
- printf ("%s result bat (%d) is of type [%s%s, %s%s]\n", __func__,
result->batCacheid, typeNames[BAThtype(result)], BAThvoid(result)?" (void)":"",
typeNames[BATttype(result)], BATtvoid(result)?" (void)":"");
+ if(0) printf ("%s result bat (%d) is of type [%s%s, %s%s]\n", __func__,
result->batCacheid, typeNames[BAThtype(result)], BAThvoid(result)?" (void)":"",
typeNames[BATttype(result)], BATtvoid(result)?" (void)":"");
BBPkeepref(*res = result->batCacheid);
@@ -569,7 +569,7 @@ str BWDSemijoinRefine(int *res, int *lid
const size_t leftHMin = left->hseqbase, leftHMax =
left->hseqbase + BATcount(left);
for (int i = 0; i < supersetPositionsColumn->count;
++i) {
if((supersetPositionsColumn->positions[i] >=
leftHMin) & (supersetPositionsColumn->positions[i] < leftHMax)){
- printf ("%s refined value: %d\n",
__func__, (refinementRegion[refinementCount++] = decompressIntValue(i,
approximationBits, supersetApproximateValuesColumn, residuals,
supersetPositionsColumn->positions[i])));
+ refinementRegion[refinementCount++] =
decompressIntValue(i, approximationBits, supersetApproximateValuesColumn,
residuals, supersetPositionsColumn->positions[i]);
}
}
}
@@ -581,7 +581,7 @@ str BWDSemijoinRefine(int *res, int *lid
BATsetprop(refinement, batRegistryIndex, TYPE_int,
(int[]){getNextFreeDecomposedBATSlotIndex()});
getDecomposedBATSlot(refinement)->residuals = filteredResiduals;
- printf ("%s setting residuals of %d to %p\n", __func__,
refinement->batCacheid, getDecomposedBATSlot(refinement)->residuals);
+ if(0) printf ("%s setting residuals of %d to %p\n", __func__,
refinement->batCacheid, getDecomposedBATSlot(refinement)->residuals);
getDecomposedBATSlot(refinement)->approximationBits =
approximationBits;
diff --git a/monetdb5/extras/bwd/utilities.c b/monetdb5/extras/bwd/utilities.c
--- a/monetdb5/extras/bwd/utilities.c
+++ b/monetdb5/extras/bwd/utilities.c
@@ -135,7 +135,7 @@ const char batTailIsDecomposed(const BAT
const cl_mem batTailApproximation(const BAT* subject){
PROPrec* rightTailApproximationProperty;
if(!(rightTailApproximationProperty = BATgetprop(subject,
batRegistryIndex))){
- printf("#batTailApproximation: bat hasn't been
decomposed;\n");
+ if(0) printf("%s: bat hasn't been decomposed;\n",
__func__);
return NULL;
}
return getDecomposedBATSlot(subject)->tailApproximation;
@@ -145,7 +145,7 @@ const cl_mem batTailApproximation(const
const cl_mem batTailPositions(const BAT* subject){
PROPrec* rightTailApproximationProperty;
if(!(rightTailApproximationProperty = BATgetprop(subject,
batRegistryIndex))){
- printf("#batTailApproximation: bat hasn't been
decomposed;\n");
+ if(0) printf("%s: bat hasn't been decomposed;\n",
__func__);
return NULL;
}
if(0) printf ("tail positions of bat %d (bwd slot %d) is at
%p\n", subject->batCacheid, rightTailApproximationProperty->v.val.ival,
getDecomposedBATSlot(subject)->tailPositions);
@@ -155,7 +155,7 @@ const cl_mem batTailPositions(const BAT*
const cl_mem batHeadApproximation(const BAT* subject){
PROPrec* rightTailApproximationProperty;
if(!(rightTailApproximationProperty = BATgetprop(subject,
batRegistryIndex))){
- printf("#batTailApproximation: bat hasn't been
decomposed;\n");
+ if(0) printf("%s: bat hasn't been decomposed;\n",
__func__);
return NULL;
}
return getDecomposedBATSlot(subject)->headApproximation;
@@ -163,7 +163,7 @@ const cl_mem batHeadApproximation(const
const size_t batTailApproximationBits(const BAT* subject){
PROPrec* rightTailApproximationProperty;
if(!(rightTailApproximationProperty = BATgetprop(subject,
batRegistryIndex))){
- printf("#batTailApproximation: bat hasn't been
decomposed;\n");
+ if(0) printf("%s: bat hasn't been decomposed;\n",
__func__);
return 0;
}
return
bwdRegistry[rightTailApproximationProperty->v.val.ival].approximationBits;
@@ -175,10 +175,10 @@ const size_t batTailResidualBits(const B
const unsigned char* batTailResiduals(const BAT* subject){
PROPrec* rightTailApproximationProperty;
if(!(rightTailApproximationProperty = BATgetprop(subject,
batRegistryIndex))){
- printf("#batTailApproximation: bat hasn't been
decomposed;\n");
+ if(0) printf("%s: bat hasn't been decomposed;\n",
__func__);
return NULL;
}
- if(1) printf ("%s(%d) = %p\n", __func__, subject->batCacheid,
bwdRegistry[rightTailApproximationProperty->v.val.ival].residuals);
+ if(0) printf ("%s(%d) = %p\n", __func__, subject->batCacheid,
bwdRegistry[rightTailApproximationProperty->v.val.ival].residuals);
return
bwdRegistry[rightTailApproximationProperty->v.val.ival].residuals;
}
@@ -192,7 +192,7 @@ const unsigned int getNextFreeDecomposed
DecomposedBATSlot* getDecomposedBATSlot(const BAT* subject){
PROPrec* rightTailApproximationProperty;
if(!(rightTailApproximationProperty = BATgetprop(subject,
batRegistryIndex))){
- printf("#batTailApproximation: bat hasn't been decomposed;\n");
+ if(0) printf("%s: bat hasn't been decomposed;\n", __func__);
return NULL;
}
return
getDecomposedBATSlotForIndex(rightTailApproximationProperty->v.val.ival);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
