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

Correct rewritting of script_score query (#48425) 

Previously there was a bug when an query inside script_score query
was rewritten. If min_score was not set and was equal to null,
we were converting it to float value which resulted to NPE.
This commit corrects this.

Closes #48081
This commit is contained in:
Mayya Sharipova 2019-10-23 16:45:10 -04:00
parent 06dc1fbd96
commit 975dbecfa9
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java
View File

@ -183,7 +183,9 @@ public class ScriptScoreQueryBuilder extends AbstractQueryBuilder<ScriptScoreQue
QueryBuilder newQuery = this.query.rewrite(queryRewriteContext); QueryBuilder newQuery = this.query.rewrite(queryRewriteContext);
if (newQuery != query) { if (newQuery != query) {
ScriptScoreQueryBuilder newQueryBuilder = new ScriptScoreQueryBuilder(newQuery, script); ScriptScoreQueryBuilder newQueryBuilder = new ScriptScoreQueryBuilder(newQuery, script);
newQueryBuilder.setMinScore(minScore); if (minScore != null) {
newQueryBuilder.setMinScore(minScore);
}
return newQueryBuilder; return newQueryBuilder;
} }
return this; return this;

24
server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java
View File

@ -20,7 +20,9 @@
package org.elasticsearch.search.query; package org.elasticsearch.search.query;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.fielddata.ScriptDocValues; import org.elasticsearch.index.fielddata.ScriptDocValues;
import org.elasticsearch.index.query.RangeQueryBuilder;
import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.script.MockScriptPlugin; import org.elasticsearch.script.MockScriptPlugin;
import org.elasticsearch.script.Script; import org.elasticsearch.script.Script;
@ -101,4 +103,26 @@ public class ScriptScoreQueryIT extends ESIntegTestCase {
assertNoFailures(resp); assertNoFailures(resp);
assertOrderedSearchHits(resp, "10", "8", "6"); assertOrderedSearchHits(resp, "10", "8", "6");
} }
// test that when the internal query is rewritten script_score works well
public void testRewrittenQuery() {
assertAcked(
prepareCreate("test-index2")
.setSettings(Settings.builder().put("index.number_of_shards", 1))
.addMapping("_doc", "field1", "type=date", "field2", "type=double")
);
client().prepareIndex("test-index2", "_doc", "1").setSource("field1", "2019-09-01", "field2", 1).get();
client().prepareIndex("test-index2", "_doc", "2").setSource("field1", "2019-10-01", "field2", 2).get();
client().prepareIndex("test-index2", "_doc", "3").setSource("field1", "2019-11-01", "field2", 3).get();
refresh();
RangeQueryBuilder rangeQB = new RangeQueryBuilder("field1").from("2019-01-01"); // the query should be rewritten to from:null
Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['field2'].value * param1", Map.of("param1", 0.1));
SearchResponse resp = client()
.prepareSearch("test-index2")
.setQuery(scriptScoreQuery(rangeQB, script))
.get();
assertNoFailures(resp);
assertOrderedSearchHits(resp, "3", "2", "1");
}
} }