Add ScriptFactory#isParsedFromSource()

Author: martijnvg

server/src/main/java/org/elasticsearch/index/mapper/AbstractScriptFieldType.java

@@ -49,18 +49,21 @@ public abstract class AbstractScriptFieldType<LeafFactory> extends MappedFieldTy
     protected final Script script;
     private final Function<SearchLookup, LeafFactory> factory;
     private final boolean isResultDeterministic;
+    private final boolean isParsedFromSource;
 
     protected AbstractScriptFieldType(
         String name,
         Function<SearchLookup, LeafFactory> factory,
         Script script,
         boolean isResultDeterministic,
-        Map<String, String> meta
+        Map<String, String> meta,
+        boolean isParsedFromSource
     ) {
         super(name, false, false, false, TextSearchInfo.SIMPLE_MATCH_WITHOUT_TERMS, meta);
         this.factory = factory;
         this.script = Objects.requireNonNull(script);
         this.isResultDeterministic = isResultDeterministic;
+        this.isParsedFromSource = isParsedFromSource;
     }
 
     @Override
@@ -191,9 +194,13 @@ public ValueFetcher valueFetcher(SearchExecutionContext context, String format)
      * Create a script leaf factory.
      */
     protected final LeafFactory leafFactory(SearchLookup searchLookup) {
-        String include = name();
-        var copy = searchLookup.optimizedSourceProvider(new SourceFilter(new String[] { include }, new String[0]));
-        return factory.apply(copy);
+        if (isParsedFromSource) {
+            String include = name();
+            var copy = searchLookup.optimizedSourceProvider(new SourceFilter(new String[] { include }, new String[0]));
+            return factory.apply(copy);
+        } else {
+            return factory.apply(searchLookup);
+        }
     }
 
     /**

server/src/main/java/org/elasticsearch/index/mapper/BooleanScriptFieldType.java

@@ -83,7 +83,8 @@ public static RuntimeField sourceOnly(String name) {
             searchLookup -> scriptFactory.newFactory(name, script.getParams(), searchLookup, onScriptError),
             script,
             scriptFactory.isResultDeterministic(),
-            meta
+            meta,
+            scriptFactory.isParsedFromSource()
         );
     }
 

server/src/main/java/org/elasticsearch/index/mapper/DateScriptFieldType.java

@@ -148,7 +148,8 @@ public static RuntimeField sourceOnly(String name, DateFormatter dateTimeFormatt
             searchLookup -> scriptFactory.newFactory(name, script.getParams(), searchLookup, dateTimeFormatter, onScriptError),
             script,
             scriptFactory.isResultDeterministic(),
-            meta
+            meta,
+            scriptFactory.isParsedFromSource()
         );
         this.dateTimeFormatter = dateTimeFormatter;
         this.dateMathParser = dateTimeFormatter.toDateMathParser();

server/src/main/java/org/elasticsearch/index/mapper/DoubleScriptFieldType.java

@@ -83,7 +83,8 @@ public static RuntimeField sourceOnly(String name) {
             searchLookup -> scriptFactory.newFactory(name, script.getParams(), searchLookup, onScriptError),
             script,
             scriptFactory.isResultDeterministic(),
-            meta
+            meta,
+            scriptFactory.isParsedFromSource()
         );
     }
 

server/src/main/java/org/elasticsearch/index/mapper/GeoPointScriptFieldType.java

@@ -83,7 +83,8 @@ protected GeoPointFieldScript.Factory getCompositeLeafFactory(
             searchLookup -> scriptFactory.newFactory(name, script.getParams(), searchLookup, onScriptError),
             script,
             scriptFactory.isResultDeterministic(),
-            meta
+            meta,
+            scriptFactory.isParsedFromSource()
         );
     }
 

server/src/main/java/org/elasticsearch/index/mapper/IpScriptFieldType.java

@@ -81,7 +81,8 @@ protected IpFieldScript.Factory getCompositeLeafFactory(
             searchLookup -> scriptFactory.newFactory(name, script.getParams(), searchLookup, onScriptError),
             script,
             scriptFactory.isResultDeterministic(),
-            meta
+            meta,
+            scriptFactory.isParsedFromSource()
         );
     }
 

server/src/main/java/org/elasticsearch/index/mapper/KeywordScriptFieldType.java

@@ -92,7 +92,8 @@ public KeywordScriptFieldType(
             searchLookup -> scriptFactory.newFactory(name, script.getParams(), searchLookup, onScriptError),
             script,
             scriptFactory.isResultDeterministic(),
-            meta
+            meta,
+            scriptFactory.isParsedFromSource()
         );
     }
 

server/src/main/java/org/elasticsearch/index/mapper/LongScriptFieldType.java

@@ -83,7 +83,8 @@ public LongScriptFieldType(
             searchLookup -> scriptFactory.newFactory(name, script.getParams(), searchLookup, onScriptError),
             script,
             scriptFactory.isResultDeterministic(),
-            meta
+            meta,
+            scriptFactory.isParsedFromSource()
         );
     }
 

server/src/main/java/org/elasticsearch/script/BooleanFieldScript.java

@@ -37,6 +37,11 @@ public void execute() {
         public boolean isResultDeterministic() {
             return true;
         }
+
+        @Override
+        public boolean isParsedFromSource() {
+            return true;
+        }
     };
 
     public static Factory leafAdapter(Function<SearchLookup, CompositeFieldScript.LeafFactory> parentFactory) {

server/src/main/java/org/elasticsearch/script/DateFieldScript.java

@@ -42,6 +42,11 @@ public void execute() {
         public boolean isResultDeterministic() {
             return true;
         }
+
+        @Override
+        public boolean isParsedFromSource() {
+            return true;
+        }
     };
 
     public static Factory leafAdapter(Function<SearchLookup, CompositeFieldScript.LeafFactory> parentFactory) {