Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid performance regression by constructing lazily the PointTree in NumericComparator (#13498) (#13877)

This commit is contained in:
Ignacio Vera 2024-10-09 12:33:34 +02:00 committed by Luca Cavanna
parent 7e97503eef
commit 7f50732cc3
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -307,6 +307,8 @@ Bug Fixes
* GITHUB#12878: Fix the declared Exceptions of Expression#evaluate() to match those
of DoubleValues#doubleValue(). (Uwe Schindler)
* GITHUB#13498: Avoid performance regression by constructing lazily the PointTree in NumericComparator, (Ignacio Vera)
Changes in Runtime Behavior
---------------------

15
lucene/core/src/java/org/apache/lucene/search/comparators/NumericComparator.java
View File

@ -95,7 +95,8 @@ public abstract class NumericComparator<T extends Number> extends FieldComparato
private final LeafReaderContext context;
protected final NumericDocValues docValues;
private final PointValues pointValues;
private final PointValues.PointTree pointTree;
// lazily constructed to avoid performance overhead when this is not used
private PointValues.PointTree pointTree;
// if skipping functionality should be enabled on this segment
private final boolean enableSkipping;
private final int maxDoc;
@ -139,7 +140,6 @@ public abstract class NumericComparator<T extends Number> extends FieldComparato
+ " expected "
+ bytesCount);
}
this.pointTree = pointValues.getPointTree();
this.enableSkipping = true; // skipping is enabled when points are available
this.maxDoc = context.reader().maxDoc();
this.competitiveIterator = DocIdSetIterator.all(maxDoc);
@ -147,7 +147,6 @@ public abstract class NumericComparator<T extends Number> extends FieldComparato
encodeTop();
}
} else {
this.pointTree = null;
this.enableSkipping = false;
this.maxDoc = 0;
}
@ -273,7 +272,8 @@ public abstract class NumericComparator<T extends Number> extends FieldComparato
final long threshold = iteratorCost >>> 3;
if (PointValues.isEstimatedPointCountGreaterThanOrEqualTo(visitor, pointTree, threshold)) {
if (PointValues.isEstimatedPointCountGreaterThanOrEqualTo(
visitor, getPointTree(), threshold)) {
// the new range is not selective enough to be worth materializing, it doesn't reduce number
// of docs at least 8x
updateSkipInterval(false);
@ -290,6 +290,13 @@ public abstract class NumericComparator<T extends Number> extends FieldComparato
updateSkipInterval(true);
}
private PointValues.PointTree getPointTree() throws IOException {
if (pointTree == null) {
pointTree = pointValues.getPointTree();
}
return pointTree;
}
private void updateSkipInterval(boolean success) {
if (updateCounter > 256) {
if (success) {