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

Simplify logic in ScoreCachingWrappingScorer (#14012) 

This is functionally equivalent to the logic that was present, but
makes the behavior clearer.
This commit is contained in:
Michael Froh 2024-12-03 10:24:41 -08:00 committed by Adrien Grand
parent 02db61ffb3
commit c9c631f9d2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
View File

@ -31,8 +31,7 @@ import java.util.Collections;
*/ */
public final class ScoreCachingWrappingScorer extends Scorable { public final class ScoreCachingWrappingScorer extends Scorable {
private int lastDoc = -1; private boolean scoreIsCached;
private int curDoc = -1;
private float curScore; private float curScore;
private final Scorable in; private final Scorable in;
@ -64,7 +63,8 @@ public final class ScoreCachingWrappingScorer extends Scorable {
@Override @Override
public void collect(int doc) throws IOException { public void collect(int doc) throws IOException {
if (scorer != null) { if (scorer != null) {
scorer.curDoc = doc; // Invalidate cache when collecting a new doc
scorer.scoreIsCached = false;
} }
super.collect(doc); super.collect(doc);
} }
@ -82,9 +82,9 @@ public final class ScoreCachingWrappingScorer extends Scorable {
@Override @Override
public float score() throws IOException { public float score() throws IOException {
if (lastDoc != curDoc) { if (scoreIsCached == false) {
curScore = in.score(); curScore = in.score();
curDoc = lastDoc; scoreIsCached = true;
} }
return curScore; return curScore;