Skip to content

Commit

Permalink
LUCENE-10089: Disable numeric sort optimization early (#291)
Browse files Browse the repository at this point in the history 
This commit moves the responsibility to disable
the numeric sort optimization on comparators to the SortField.
This way we don't need to apply the logic on every top field collectors.
  • Loading branch information
@jimczi
jimczi authored Sep 13, 2021
1 parent 56968b7 commit 1953757
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 54 deletions.
1 change: 0 additions & 1 deletion lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ private FieldValueHitQueue(SortField[] fields, int size) {
SortField field = fields[i];
reverseMul[i] = field.reverse ? -1 : 1;
comparators[i] = field.getComparator(size, i);
if (field.getOptimizeSortWithPoints() == false) comparators[i].disableSkipping();
}
if (numComparators == 1) {
// inform a comparator that sort is based on this single field
Expand Down
34 changes: 25 additions & 9 deletions lucene/core/src/java/org/apache/lucene/search/SortField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,36 +501,48 @@ public Comparator<BytesRef> getBytesComparator() {
* @return {@link FieldComparator} to use when sorting
*/
public FieldComparator<?> getComparator(final int numHits, final int sortPos) {

final FieldComparator<?> fieldComparator;
switch (type) {
case SCORE:
return new FieldComparator.RelevanceComparator(numHits);
fieldComparator = new FieldComparator.RelevanceComparator(numHits);
break;

case DOC:
return new DocComparator(numHits, reverse, sortPos);
fieldComparator = new DocComparator(numHits, reverse, sortPos);
break;

case INT:
return new IntComparator(numHits, field, (Integer) missingValue, reverse, sortPos);
fieldComparator =
new IntComparator(numHits, field, (Integer) missingValue, reverse, sortPos);
break;

case FLOAT:
return new FloatComparator(numHits, field, (Float) missingValue, reverse, sortPos);
fieldComparator =
new FloatComparator(numHits, field, (Float) missingValue, reverse, sortPos);
break;

case LONG:
return new LongComparator(numHits, field, (Long) missingValue, reverse, sortPos);
fieldComparator = new LongComparator(numHits, field, (Long) missingValue, reverse, sortPos);
break;

case DOUBLE:
return new DoubleComparator(numHits, field, (Double) missingValue, reverse, sortPos);
fieldComparator =
new DoubleComparator(numHits, field, (Double) missingValue, reverse, sortPos);
break;

case CUSTOM:
assert comparatorSource != null;
return comparatorSource.newComparator(field, numHits, sortPos, reverse);
fieldComparator = comparatorSource.newComparator(field, numHits, sortPos, reverse);
break;

case STRING:
return new FieldComparator.TermOrdValComparator(
numHits, field, missingValue == STRING_LAST);

case STRING_VAL:
return new FieldComparator.TermValComparator(numHits, field, missingValue == STRING_LAST);
fieldComparator =
new FieldComparator.TermValComparator(numHits, field, missingValue == STRING_LAST);
break;

case REWRITEABLE:
throw new IllegalStateException(
Expand All @@ -539,6 +551,10 @@ public FieldComparator<?> getComparator(final int numHits, final int sortPos) {
default:
throw new IllegalStateException("Illegal sort type: " + type);
}
if (getOptimizeSortWithPoints() == false) {
fieldComparator.disableSkipping();
}
return fieldComparator;
}

/**
Expand Down
101 changes: 57 additions & 44 deletions lucene/core/src/java/org/apache/lucene/search/SortedNumericSortField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,67 +242,76 @@ public void setMissingValue(Object missingValue) {

@Override
public FieldComparator<?> getComparator(int numHits, int sortPos) {
final FieldComparator<?> fieldComparator;
switch (type) {
case INT:
return new IntComparator(numHits, getField(), (Integer) missingValue, reverse, sortPos) {
@Override
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new IntLeafComparator(context) {
fieldComparator =
new IntComparator(numHits, getField(), (Integer) missingValue, reverse, sortPos) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new IntLeafComparator(context) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
}
};
}
};
}
};
break;
case FLOAT:
return new FloatComparator(numHits, getField(), (Float) missingValue, reverse, sortPos) {
@Override
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new FloatLeafComparator(context) {
fieldComparator =
new FloatComparator(numHits, getField(), (Float) missingValue, reverse, sortPos) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new FloatLeafComparator(context) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
}
};
}
};
}
};
break;
case LONG:
return new LongComparator(numHits, getField(), (Long) missingValue, reverse, sortPos) {
@Override
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new LongLeafComparator(context) {
fieldComparator =
new LongComparator(numHits, getField(), (Long) missingValue, reverse, sortPos) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new LongLeafComparator(context) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
}
};
}
};
}
};
break;
case DOUBLE:
return new DoubleComparator(numHits, getField(), (Double) missingValue, reverse, sortPos) {
@Override
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new DoubleLeafComparator(context) {
fieldComparator =
new DoubleComparator(numHits, getField(), (Double) missingValue, reverse, sortPos) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
public LeafFieldComparator getLeafComparator(LeafReaderContext context)
throws IOException {
return new DoubleLeafComparator(context) {
@Override
protected NumericDocValues getNumericDocValues(
LeafReaderContext context, String field) throws IOException {
return SortedNumericSelector.wrap(
DocValues.getSortedNumeric(context.reader(), field), selector, type);
}
};
}
};
}
};
break;
case CUSTOM:
case DOC:
case REWRITEABLE:
Expand All @@ -312,6 +321,10 @@ protected NumericDocValues getNumericDocValues(
default:
throw new AssertionError();
}
if (getOptimizeSortWithPoints() == false) {
fieldComparator.disableSkipping();
}
return fieldComparator;
}

private NumericDocValues getValue(LeafReader reader) throws IOException {
Expand Down

0 comments on commit 1953757

Please sign in to comment.