mirror of https://github.com/apache/lucene.git
Make CombinedFieldQuery eligible for WAND/MAXSCORE. (#13999)
`CombinedFieldQuery` currently returns an infinite maximum score. We can do better by returning the maximum score that the sim scorer can return, which in the case of BM25 is bounded by the IDF. This makes CombinedFieldQuery eligible for WAND/MAXSCORE (not their block-max variants though, since we return the same score upper bound for the whole index).
This commit is contained in:
parent
7d5ea247f9
commit
b12404b09b
|
@ -76,6 +76,9 @@ Optimizations
|
||||||
* GITHUB#14000: Speed up top-k retrieval of filtered disjunctions.
|
* GITHUB#14000: Speed up top-k retrieval of filtered disjunctions.
|
||||||
(Adrien Grand)
|
(Adrien Grand)
|
||||||
|
|
||||||
|
* GITHUB#13999: CombinedFieldQuery now returns non-infinite maximum scores,
|
||||||
|
making it eligible to dynamic pruning. (Adrien Grand)
|
||||||
|
|
||||||
Bug Fixes
|
Bug Fixes
|
||||||
---------------------
|
---------------------
|
||||||
* GITHUB#13832: Fixed an issue where the DefaultPassageFormatter.format method did not format passages as intended
|
* GITHUB#13832: Fixed an issue where the DefaultPassageFormatter.format method did not format passages as intended
|
||||||
|
|
|
@ -438,12 +438,14 @@ public final class CombinedFieldQuery extends Query implements Accountable {
|
||||||
private final DisiPriorityQueue queue;
|
private final DisiPriorityQueue queue;
|
||||||
private final DocIdSetIterator iterator;
|
private final DocIdSetIterator iterator;
|
||||||
private final MultiNormsLeafSimScorer simScorer;
|
private final MultiNormsLeafSimScorer simScorer;
|
||||||
|
private final float maxScore;
|
||||||
|
|
||||||
CombinedFieldScorer(
|
CombinedFieldScorer(
|
||||||
DisiPriorityQueue queue, DocIdSetIterator iterator, MultiNormsLeafSimScorer simScorer) {
|
DisiPriorityQueue queue, DocIdSetIterator iterator, MultiNormsLeafSimScorer simScorer) {
|
||||||
this.queue = queue;
|
this.queue = queue;
|
||||||
this.iterator = iterator;
|
this.iterator = iterator;
|
||||||
this.simScorer = simScorer;
|
this.simScorer = simScorer;
|
||||||
|
this.maxScore = simScorer.getSimScorer().score(Float.POSITIVE_INFINITY, 1L);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -475,7 +477,7 @@ public final class CombinedFieldQuery extends Query implements Accountable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getMaxScore(int upTo) throws IOException {
|
public float getMaxScore(int upTo) throws IOException {
|
||||||
return Float.POSITIVE_INFINITY;
|
return maxScore;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,6 +90,10 @@ final class MultiNormsLeafSimScorer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SimScorer getSimScorer() {
|
||||||
|
return scorer;
|
||||||
|
}
|
||||||
|
|
||||||
private long getNormValue(int doc) throws IOException {
|
private long getNormValue(int doc) throws IOException {
|
||||||
if (norms != null) {
|
if (norms != null) {
|
||||||
boolean found = norms.advanceExact(doc);
|
boolean found = norms.advanceExact(doc);
|
||||||
|
|
Loading…
Reference in New Issue