honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in PinnedQuery call to DisjunctionMaxScorer. (#51047) (#51064) 

Fix NPE in PinnedQuery call to DisjunctionMaxScorer. (#51047)
Added test and fix that tests for score type.
Closes #51034
This commit is contained in:
markharwood 2020-01-16 10:41:43 +00:00 committed by GitHub
parent 1d391f7113
commit ff0a45f882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x-pack/plugin/search-business-rules/src/main/java/org/apache/lucene/search/CappedScoreQuery.java
View File

@ -123,11 +123,14 @@ public final class CappedScoreQuery extends Query {
@Override
public Scorer get(long leadCost) throws IOException {
final Scorer innerScorer = innerScorerSupplier.get(leadCost);
// test scoreMode to avoid NPE - see https://github.com/elastic/elasticsearch/issues/51034
if (scoreMode == ScoreMode.TOP_SCORES) {
// short-circuit if scores will not need capping
innerScorer.advanceShallow(0);
if (innerScorer.getMaxScore(DocIdSetIterator.NO_MORE_DOCS) <= maxScore) {
return innerScorer;
}
}
return new CappedScorer(innerWeight, innerScorer, maxScore);
}

26
x-pack/plugin/search-business-rules/src/test/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java
View File

@ -14,6 +14,7 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.Operator;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.QueryStringQueryBuilder;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.test.ESIntegTestCase;
@ -142,6 +143,31 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
}
/**
* Test scoring the entire set of documents, which uses a slightly different logic when creating scorers.
*/
public void testExhaustiveScoring() throws Exception {
assertAcked(prepareCreate("test")
.addMapping("_doc", jsonBuilder().startObject().startObject("_doc").startObject("properties")
.startObject("field1").field("analyzer", "whitespace").field("type", "text").endObject()
.startObject("field2").field("analyzer", "whitespace").field("type", "text").endObject()
.endObject().endObject().endObject())
.setSettings(Settings.builder().put(indexSettings()).put("index.number_of_shards", 1)));
client().prepareIndex("test", "_doc").setId("1").setSource("field1", "foo").get();
client().prepareIndex("test", "_doc").setId("2").setSource("field1", "foo", "field2", "foo").get();
refresh();
QueryStringQueryBuilder organicQuery = QueryBuilders.queryStringQuery("foo");
PinnedQueryBuilder pqb = new PinnedQueryBuilder(organicQuery, "2");
SearchResponse searchResponse = client().prepareSearch().setQuery(pqb).setTrackTotalHits(true)
.setSearchType(DFS_QUERY_THEN_FETCH).get();
long numHits = searchResponse.getHits().getTotalHits().value;
assertThat(numHits, equalTo(2L));
}
public void testExplain() throws Exception {
assertAcked(prepareCreate("test").addMapping("type1",
jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("field1")