Changeset: 6b26ffac9b0b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b26ffac9b0b
Modified Files:
monetdb5/extras/bwd/operations.c
Branch: bwd
Log Message:
* more unsorted properties set
Unterschiede (84 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
@@ -444,6 +444,11 @@ str BWDLeftJoinRefine(bat * res, bat * l
}
#undef expansionLoop
BATsetcount(refinement, left->batCount);
+ if(BAThtype(refinement) != TYPE_void)
+ result->hsorted = FALSE;
+ if(BATttype(refinement) != TYPE_void)
+ result->tsorted = FALSE;
+
BATseqbase(refinement, 0);
} else {
@@ -477,6 +482,10 @@ str BWDLeftJoinRefine(bat * res, bat * l
}
#undef refinementLoop
BATsetcount(refinement, refinementCount);
+ if(BAThtype(refinement) != TYPE_void)
+ result->hsorted = FALSE;
+ if(BATttype(refinement) != TYPE_void)
+ result->tsorted = FALSE;
BATseqbase(refinement, 0);
}
@@ -808,6 +817,8 @@ str uselectrefine(bat *res, bat *bid, pt
if(1) printf ("%s not reduced
the result from %zd to %d because all bits are gpu resident\n", __func__,
candidateCount, i);
}
BATsetcount(result, candidateCount);
+ if(BAThtype(result) != TYPE_void)
+ result->hsorted = FALSE;
BATseqbase(BATmirror(result), oid_nil);
} else {
@@ -841,6 +852,9 @@ str uselectrefine(bat *res, bat *bid, pt
if(1) printf ("%s reduced the
result from %zd to %d\n", __func__, Hloc(data,
BUNfirst(data))?MIN(candidateCount, BATcount(data)):candidateCount, j);
BATsetcount(result, j);
+ if(BAThtype(result) !=
TYPE_void)
+ result->hsorted = FALSE;
+
}
BATseqbase(BATmirror(result), oid_nil);
GDKfree(compressedHead);
@@ -1143,7 +1157,11 @@ str BWDSemijoinRefine(int *res, int *lid
}
- BATsetcount(refinement,
refinementCount);
+ BATsetcount(refinement,
refinementCount);
+ if(BATttype(refinement)
!= TYPE_void)
+ result->tsorted
= FALSE;
+
+
} else {
/* const int
approximationBits = */
@@ -1173,7 +1191,10 @@ str BWDSemijoinRefine(int *res, int *lid
#undef expansionLoop
/*
memcpy(refinementRegion, supersetApproximateValuesColumn->elements,
BATcount(right)*sizeof(int)); */
- BATsetcount(refinement,
BATcount(right));
+ BATsetcount(refinement, BATcount(right));
+ if(BATttype(refinement) != TYPE_void)
+ result->tsorted = FALSE;
+
}
@@ -1748,9 +1769,11 @@ BAT* materializeBATInHostMemory(BAT* inp
printf("unsupported tail type in materialization: %s, %s,
%s:%d", BATatoms[input->T->type].name, __func__, __FILE__, __LINE__);
abort();
}
- result->hsorted = FALSE;
- result->tsorted = FALSE;
BATsetcount(result, count);
+ if(BAThtype(result) != TYPE_void)
+ result->hsorted = FALSE;
+ if(BATttype(result) != TYPE_void)
+ result->tsorted = FALSE;
return result;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
