Skip to content

Prevent NullPointerException in SourceConfirmedTextQuery #80472

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

Merged
iverase merged 1 commit into from
Nov 8, 2021
Merged

Prevent NullPointerException in SourceConfirmedTextQuery #80472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 27 additions & 20 deletions ...-extras/src/main/java/org/elasticsearch/index/mapper/extras/SourceConfirmedTextQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,28 +219,35 @@ public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float bo
throw new IllegalStateException("Query " + in + " doesn't have any term");
}
final String field = terms.iterator().next().field();
final Map<Term, TermStates> termStates = new HashMap<>();
final List<TermStatistics> termStats = new ArrayList<>();
for (Term term : terms) {
TermStates ts = termStates.computeIfAbsent(term, t -> {
try {
return TermStates.build(searcher.getTopReaderContext(), t, scoreMode.needsScores());
} catch (IOException e) {
throw new UncheckedIOException(e);
}
});
if (scoreMode.needsScores()) {
if (ts.docFreq() > 0) {
termStats.add(searcher.termStatistics(term, ts.docFreq(), ts.totalTermFreq()));
final CollectionStatistics collectionStatistics = searcher.collectionStatistics(field);
final SimScorer simScorer;
final Weight approximationWeight;
if (collectionStatistics == null) {
// field does not exist in the index
simScorer = null;
approximationWeight = null;
} else {
final Map<Term, TermStates> termStates = new HashMap<>();
final List<TermStatistics> termStats = new ArrayList<>();
for (Term term : terms) {
TermStates ts = termStates.computeIfAbsent(term, t -> {
try {
return TermStates.build(searcher.getTopReaderContext(), t, scoreMode.needsScores());
} catch (IOException e) {
throw new UncheckedIOException(e);
}
});
if (scoreMode.needsScores()) {
if (ts.docFreq() > 0) {
termStats.add(searcher.termStatistics(term, ts.docFreq(), ts.totalTermFreq()));
}
} else {
termStats.add(new TermStatistics(term.bytes(), 1, 1L));
}
} else {
termStats.add(new TermStatistics(term.bytes(), 1, 1L));
}
simScorer = searcher.getSimilarity().scorer(boost, collectionStatistics, termStats.toArray(TermStatistics[]::new));
approximationWeight = searcher.createWeight(approximate(in), ScoreMode.COMPLETE_NO_SCORES, 1f);
}
final SimScorer simScorer = searcher.getSimilarity()
.scorer(boost, searcher.collectionStatistics(field), termStats.toArray(TermStatistics[]::new));
final Weight approximationWeight = searcher.createWeight(approximate(in), ScoreMode.COMPLETE_NO_SCORES, 1f);

return new Weight(this) {

@Override
Expand Down Expand Up @@ -272,7 +279,7 @@ public Explanation explain(LeafReaderContext context, int doc) throws IOExceptio

@Override
public RuntimePhraseScorer scorer(LeafReaderContext context) throws IOException {
final Scorer approximationScorer = approximationWeight.scorer(context);
final Scorer approximationScorer = approximationWeight != null ? approximationWeight.scorer(context) : null;
if (approximationScorer == null) {
return null;
}
Expand Down
12 changes: 12 additions & 0 deletions ...as/src/test/java/org/elasticsearch/index/mapper/extras/SourceConfirmedTextQueryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,4 +417,16 @@ public void testApproximation() {
).build();
assertEquals(approximation, SourceConfirmedTextQuery.approximate(phrasePrefixQuery));
}

public void testEmptyIndex() throws Exception {
try (Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(Lucene.STANDARD_ANALYZER))) {
try (IndexReader reader = DirectoryReader.open(w)) {
IndexSearcher searcher = new IndexSearcher(reader);
PhraseQuery query = new PhraseQuery("body", "a", "b");
Query sourceConfirmedPhraseQuery = new SourceConfirmedTextQuery(query, SOURCE_FETCHER_PROVIDER, Lucene.STANDARD_ANALYZER);
assertEquals(0, searcher.count(sourceConfirmedPhraseQuery));
}
}
}

}