Changeset: 831e7c6b6236 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=831e7c6b6236
Modified Files:
monetdb5/extras/crackers/crackers_selecthol_ops.mx
monetdb5/extras/crackers/crackers_selectholpl_ops.mx
Branch: holindex
Log Message:
Minor changes.
diffs (72 lines):
diff --git a/monetdb5/extras/crackers/crackers_selecthol_ops.mx
b/monetdb5/extras/crackers/crackers_selecthol_ops.mx
--- a/monetdb5/extras/crackers/crackers_selecthol_ops.mx
+++ b/monetdb5/extras/crackers/crackers_selecthol_ops.mx
@@ -569,35 +569,7 @@ createView:
/* If one or both of the result view bounds were not found using the
index then we have to crack */
if (foundLow == 0 || foundHgh == 0) {
- if (foundLow == 0 && foundHgh == 0) {
- /* We have to do two cracks separatelly */
-
- /* For the cl bound and the next one in the index*/
- @:crkTwoLTree@5(@1,@5)@
- t = (int *) Tloc(b, BUNfirst(b));
-
- /* For the ch bound and the previous one in the index*/
- @:crkTwoRTree@5(@1,@5)@
-
- if (IndexSize < IndexStop) {
- if (vl > 0)
- _vl = vl - 1;
- else
- _vl = vl;
- if (gapL>0)
- {
- addCrackerIndex_@1(m, low,
*inclusiveLow, _vl, c);
- FN->c = FN->c + 1;
- }
- if (gapH>0)
- {
- addCrackerIndex_@1(m, hgh, HBound, vh,
c);
- FN->c = FN->c + 1;
- }
- if ((vl == 1) && (*t == *low) && (*inclusiveLow
== TRUE))
- vl = vl - 1;
- }
- } else if (foundLow == 0) {
+ if (foundLow == 0) {
@:crkTwoLTree@5(@1,@5)@
t = (int *) Tloc(b, BUNfirst(b));
if (IndexSize < IndexStop) {
@@ -614,15 +586,17 @@ createView:
vl = vl - 1;
}
vh = ch2;
- } else if (foundHgh == 0) {
+ }
+ if (foundHgh == 0) {
@:crkTwoRTree@5(@1,@5)@
t = (int *) Tloc(b, BUNfirst(b));
- if (IndexSize < IndexStop)
+ if (IndexSize < IndexStop) {
if (gapH>0)
{
addCrackerIndex_@1(m, hgh, HBound, vh,
c);
FN->c = FN->c + 1;
}
+ }
vl = cl1;
if ((vl == 0) && (*t < *low) && (*inclusiveLow == TRUE))
vl = vl + 1;
diff --git a/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
b/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
--- a/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
+++ b/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
@@ -603,7 +603,7 @@ createView:
}
if (foundHgh == 0) {
pthread_rwlock_rdlock(&CrackerIndex[m].columnRWLock);
- lowNode = findNodeL_@1(*low, TRUE,
CrackerIndex[m].Tree, c, idxFirst, NULL);
+ lowNode = findNodeL_@1(*hgh, TRUE,
CrackerIndex[m].Tree, c, idxFirst, NULL);
if (pthread_rwlock_trywrlock(&lowNode->pieceLock)){
pthread_rwlock_unlock(&CrackerIndex[m].columnRWLock);
pthread_rwlock_wrlock(&lowNode->pieceLock);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
