Skip to content

fix issue 18446 NPE by making sure scoreSupplier.get() returns non-null scorer #19650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+104 −49
Open

fix issue 18446 NPE by making sure scoreSupplier.get() returns non-null scorer #19650

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19d098a
fix issue 18446 NPE by making sure scoreSupplier.get() returns non-nu…
haruki1243 Oct 16, 2025
29f7ccd
add tests and changelog
Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 18 additions & 52 deletions server/src/main/java/org/opensearch/common/lucene/search/function/ScriptScoreQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,72 +124,38 @@ public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float bo
Weight subQueryWeight = subQuery.createWeight(searcher, subQueryScoreMode, 1.0f);

return new Weight(this) {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would need a test for this change as well

@Override
public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOException {
final Weight weight = this;
ScorerSupplier subQueryScorerSupplier = subQueryWeight.scorerSupplier(context);
if (subQueryScorerSupplier == null) {
return null;
}
Weight weight = this;
return new ScorerSupplier() {
private Scorer scorer;
private BulkScorer bulkScorer;

@Override
public BulkScorer bulkScorer() throws IOException {
if (minScore == null) {
final BulkScorer subQueryBulkScorer = subQueryWeight.bulkScorer(context);
if (subQueryBulkScorer == null) {
bulkScorer = null;
} else {
bulkScorer = new ScriptScoreBulkScorer(
subQueryBulkScorer,
subQueryScoreMode,
makeScoreScript(context),
boost
);
}
} else {
final Scorer scorer = get(Long.MAX_VALUE);
if (scorer != null) {
bulkScorer = new Weight.DefaultBulkScorer(scorer);
}
public Scorer get(long leadCost) throws IOException {
Scorer subQueryScorer = subQueryScorerSupplier.get(leadCost);
Scorer scriptScorer = new ScriptScorer(weight, makeScoreScript(context), subQueryScorer, subQueryScoreMode, boost, null);
if (minScore != null) {
scriptScorer = new MinScoreScorer(weight, scriptScorer, minScore);
}

return bulkScorer;
return scriptScorer;
}

@Override
public Scorer get(long leadCost) throws IOException {
final Scorer subQueryScorer = subQueryWeight.scorer(context);

if (subQueryScorer == null) {
scorer = null;
public BulkScorer bulkScorer() throws IOException {
if (minScore == null) {
final BulkScorer subQueryBulkScorer = subQueryScorerSupplier.bulkScorer();
return new ScriptScoreBulkScorer(subQueryBulkScorer, subQueryScoreMode, makeScoreScript(context), boost);
} else {
Scorer scriptScorer = new ScriptScorer(
weight,
makeScoreScript(context),
subQueryScorer,
subQueryScoreMode,
boost,
null
);
if (minScore != null) {
scriptScorer = new MinScoreScorer(weight, scriptScorer, minScore);
}
scorer = scriptScorer;
return super.bulkScorer();
}

return scorer;
}

@Override
public long cost() {
if (scorer != null) {
return scorer.iterator().cost();
} else if (bulkScorer != null) {
return bulkScorer.cost();
} else {
// We have no prior knowledge of how many docs might match for any given query term,
// so we assume that all docs could be a match.
return Integer.MAX_VALUE;
}
return subQueryScorerSupplier.cost();
}
};
}
Expand Down
Loading