From 975dbecfa9ab964a9a0f0bfc76017cd0daba1333 Mon Sep 17 00:00:00 2001
From: Mayya Sharipova <mayya.sharipova@elastic.co>
Date: Wed, 23 Oct 2019 16:45:10 -0400
Subject: [PATCH] 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
---
 .../ScriptScoreQueryBuilder.java              |  4 +++-
 .../search/query/ScriptScoreQueryIT.java      | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java
index 4872e92e2d7..59086f163a1 100644
--- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreQueryBuilder.java
@@ -183,7 +183,9 @@ public class ScriptScoreQueryBuilder extends AbstractQueryBuilder<ScriptScoreQue
         QueryBuilder newQuery = this.query.rewrite(queryRewriteContext);
         if (newQuery != query) {
             ScriptScoreQueryBuilder newQueryBuilder = new ScriptScoreQueryBuilder(newQuery, script);
-            newQueryBuilder.setMinScore(minScore);
+            if (minScore != null) {
+                newQueryBuilder.setMinScore(minScore);
+            }
             return newQueryBuilder;
         }
         return this;
diff --git a/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java b/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java
index 8f6a60f99e0..843318a544a 100644
--- a/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java
+++ b/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java
@@ -20,7 +20,9 @@
 package org.elasticsearch.search.query;
 
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.fielddata.ScriptDocValues;
+import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.MockScriptPlugin;
 import org.elasticsearch.script.Script;
@@ -101,4 +103,26 @@ public class ScriptScoreQueryIT extends ESIntegTestCase {
         assertNoFailures(resp);
         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");
+    }
 }