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

LUCENE-10480: Move scoring from advance to TwoPhaseIterator#matches to improve disjunction within conjunction (#1006)

This commit is contained in:
zacharymorn 2022-07-07 01:10:50 -07:00 committed by GitHub
parent 698f40ad51
commit da8143bfa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lucene/core/src/java/org/apache/lucene/search/BlockMaxMaxscoreScorer.java
View File

@ -138,28 +138,7 @@ class BlockMaxMaxscoreScorer extends Scorer {
} else if (top.doc > upTo) { } else if (top.doc > upTo) {
target = upTo + 1; target = upTo + 1;
} else { } else {
// Start evaluating the score of the new document. It only includes essential return doc = top.doc;
// clauses here, scores of non-essential clauses get added later on in
// TwoPhaseIterator#matches.
score = 0;
for (DisiWrapper w = essentialsScorers.topList(); w != null; w = w.next) {
score += w.scorer.score();
}
final double docScoreUpperBound = score + nonEssentialMaxScoreSum;
if (maxScoreSumPropagator.scoreSumUpperBound(docScoreUpperBound)
< minCompetitiveScore) {
// skip straight to next candidate doc from essential scorer
int docId = top.doc;
do {
top.doc = top.iterator.nextDoc();
top = essentialsScorers.updateTop();
} while (top.doc == docId);
target = top.doc;
} else {
return doc = top.doc;
}
} }
} }
} }
@ -251,8 +230,21 @@ class BlockMaxMaxscoreScorer extends Scorer {
@Override @Override
public boolean matches() throws IOException { public boolean matches() throws IOException {
// Only sum up scores of non-essential scorers, essential scores were already folded into // Start evaluating the score of the new document. It initially only includes essential
// the score. // clauses and abort / return early if a match is not possible.
// Scores of non-essential clauses get added later on to determine actual matches.
score = 0;
for (DisiWrapper w = essentialsScorers.topList(); w != null; w = w.next) {
score += w.scorer.score();
}
final double docScoreUpperBound = score + nonEssentialMaxScoreSum;
if (maxScoreSumPropagator.scoreSumUpperBound(docScoreUpperBound) < minCompetitiveScore) {
return false;
}
// Continue to add scores of non-essential scorers
for (int i = 0; i < firstEssentialScorerIndex; ++i) { for (int i = 0; i < firstEssentialScorerIndex; ++i) {
DisiWrapper w = allScorers[i]; DisiWrapper w = allScorers[i];
if (w.doc < doc) { if (w.doc < doc) {
@ -262,6 +254,7 @@ class BlockMaxMaxscoreScorer extends Scorer {
score += allScorers[i].scorer.score(); score += allScorers[i].scorer.score();
} }
} }
return score() >= minCompetitiveScore; return score() >= minCompetitiveScore;
} }