Use ScoreScript instead of SearchScript (see elastic#30816)

martijnvg · May 25, 2018 · fd3fb41 · fd3fb41
1 parent f82c307
commit fd3fb41
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java
@@ -79,11 +79,11 @@
 import org.elasticsearch.rest.RestResponse;
 import org.elasticsearch.rest.action.RestBuilderListener;
 import org.elasticsearch.script.FilterScript;
+import org.elasticsearch.script.ScoreScript;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.script.SearchScript;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
@@ -148,7 +148,7 @@ public static class Request extends SingleShardRequest<Request> implements ToXCo
             Map<String, ScriptContext<?>> supportedContexts = new HashMap<>();
             supportedContexts.put("painless_test", PainlessTestScript.CONTEXT);
             supportedContexts.put("filter", FilterScript.CONTEXT);
-            supportedContexts.put("score", SearchScript.SCRIPT_SCORE_CONTEXT);
+            supportedContexts.put("score", ScoreScript.CONTEXT);
             SUPPORTED_CONTEXTS = Collections.unmodifiableMap(supportedContexts);
         }
 
@@ -415,7 +415,7 @@ public String toString() {
         static boolean needDocumentAndIndex(ScriptContext<?> scriptContext) {
             if (scriptContext == FilterScript.CONTEXT) {
                 return true;
-            } else if (scriptContext == SearchScript.SCRIPT_SCORE_CONTEXT) {
+            } else if (scriptContext == ScoreScript.CONTEXT) {
                 return true;
             } else {
                 return false;
@@ -585,13 +585,13 @@ static Response innerShardOperation(Request request, ScriptService scriptService
                     boolean result = filterScript.execute();
                     return new Response(result);
                 }, indexService);
-            } else if (scriptContext == SearchScript.SCRIPT_SCORE_CONTEXT) {
+            } else if (scriptContext == ScoreScript.CONTEXT) {
                 return prepareRamIndex(request, (context, leafReaderContext) -> {
-                    SearchScript.Factory factory = scriptService.compile(request.script, SearchScript.CONTEXT);
-                    SearchScript.LeafFactory leafFactory =
+                    ScoreScript.Factory factory = scriptService.compile(request.script, ScoreScript.CONTEXT);
+                    ScoreScript.LeafFactory leafFactory =
                         factory.newFactory(request.getScript().getParams(), context.lookup());
-                    SearchScript searchScript = leafFactory.newInstance(leafReaderContext);
-                    searchScript.setDocument(0);
+                    ScoreScript scoreScript = leafFactory.newInstance(leafReaderContext);
+                    scoreScript.setDocument(0);
 
                     if (request.executeScriptContext.query != null) {
                         Query luceneQuery = request.executeScriptContext.query.rewrite(context).toQuery(context);
@@ -602,10 +602,10 @@ static Response innerShardOperation(Request request, ScriptService scriptService
                         // Consume the first (and only) match.
                         int docID = scorer.iterator().nextDoc();
                         assert docID == scorer.docID();
-                        searchScript.setScorer(scorer);
+                        scoreScript.setScorer(scorer);
                     }
 
-                    double result = searchScript.runAsDouble();
+                    double result = scoreScript.execute();
                     return new Response(result);
                 }, indexService);
             } else {