Begin to break templates away from scripts

buildSrc/src/main/resources/checkstyle_suppressions.xml

@@ -2988,7 +2988,6 @@
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]ingest[/\\]IngestDocumentTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]ingest[/\\]IngestMetadataTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]ingest[/\\]IngestProcessorNotInstalledOnAllNodesIT.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]ingest[/\\]IngestServiceTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]ingest[/\\]IngestStatsTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]ingest[/\\]PipelineConfigurationTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]ingest[/\\]PipelineExecutionServiceTests.java" checks="LineLength" />
@@ -3048,7 +3047,6 @@
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]ScriptMetaDataTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]ScriptModesTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]ScriptServiceTests.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]ScriptSettingsTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]ScriptTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]StoredScriptTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]StoredScriptsIT.java" checks="LineLength" />

core/src/main/java/org/elasticsearch/index/IndexModule.java

@@ -21,7 +21,6 @@
 
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.TriFunction;
 import org.elasticsearch.common.settings.Setting;
@@ -50,6 +49,7 @@
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.elasticsearch.indices.mapper.MapperRegistry;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.TemplateService;
 import org.elasticsearch.threadpool.ThreadPool;
 
 import java.io.IOException;
@@ -320,20 +320,19 @@ public interface IndexSearcherWrapperFactory {
     }
 
     public IndexService newIndexService(
-        NodeEnvironment environment,
-        NamedXContentRegistry xContentRegistry,
-        IndexService.ShardStoreDeleter shardStoreDeleter,
-        CircuitBreakerService circuitBreakerService,
-        BigArrays bigArrays,
-        ThreadPool threadPool,
-        ScriptService scriptService,
-        ClusterService clusterService,
-        Client client,
-        IndicesQueryCache indicesQueryCache,
-        MapperRegistry mapperRegistry,
-        Consumer<ShardId> globalCheckpointSyncer,
-        IndicesFieldDataCache indicesFieldDataCache)
-        throws IOException {
+                NodeEnvironment environment,
+                NamedXContentRegistry xContentRegistry,
+                IndexService.ShardStoreDeleter shardStoreDeleter,
+                CircuitBreakerService circuitBreakerService,
+                BigArrays bigArrays,
+                ThreadPool threadPool,
+                ScriptService scriptService,
+                TemplateService templateService,
+                Client client,
+                IndicesQueryCache indicesQueryCache,
+                MapperRegistry mapperRegistry,
+                Consumer<ShardId> globalCheckpointSyncer,
+                IndicesFieldDataCache indicesFieldDataCache) throws IOException {
         final IndexEventListener eventListener = freeze();
         IndexSearcherWrapperFactory searcherWrapperFactory = indexSearcherWrapper.get() == null
             ? (shard) -> null : indexSearcherWrapper.get();
@@ -365,7 +364,7 @@ public IndexService newIndexService(
         }
         return new IndexService(indexSettings, environment, xContentRegistry, new SimilarityService(indexSettings, similarities),
                 shardStoreDeleter, analysisRegistry, engineFactory.get(), circuitBreakerService, bigArrays, threadPool, scriptService,
-                clusterService, client, queryCache, store, eventListener, searcherWrapperFactory, mapperRegistry,
+                templateService, client, queryCache, store, eventListener, searcherWrapperFactory, mapperRegistry,
                 indicesFieldDataCache, globalCheckpointSyncer, searchOperationListeners, indexOperationListeners);
     }
 

core/src/main/java/org/elasticsearch/index/IndexService.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
@@ -68,6 +67,7 @@
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.elasticsearch.indices.mapper.MapperRegistry;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.TemplateService;
 import org.elasticsearch.threadpool.ThreadPool;
 
 import java.io.Closeable;
@@ -118,7 +118,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust
     private final BigArrays bigArrays;
     private final AsyncGlobalCheckpointTask globalCheckpointTask;
     private final ScriptService scriptService;
-    private final ClusterService clusterService;
+    private final TemplateService templateService;
     private final Client client;
 
     public IndexService(IndexSettings indexSettings, NodeEnvironment nodeEnv,
@@ -131,7 +131,7 @@ public IndexService(IndexSettings indexSettings, NodeEnvironment nodeEnv,
                         BigArrays bigArrays,
                         ThreadPool threadPool,
                         ScriptService scriptService,
-                        ClusterService clusterService,
+                        TemplateService templateService,
                         Client client,
                         QueryCache queryCache,
                         IndexStore indexStore,
@@ -158,7 +158,7 @@ public IndexService(IndexSettings indexSettings, NodeEnvironment nodeEnv,
         this.bigArrays = bigArrays;
         this.threadPool = threadPool;
         this.scriptService = scriptService;
-        this.clusterService = clusterService;
+        this.templateService = templateService;
         this.client = client;
         this.eventListener = eventListener;
         this.nodeEnv = nodeEnv;
@@ -473,7 +473,7 @@ public IndexSettings getIndexSettings() {
     public QueryShardContext newQueryShardContext(int shardId, IndexReader indexReader, LongSupplier nowInMillis) {
         return new QueryShardContext(
             shardId, indexSettings, indexCache.bitsetFilterCache(), indexFieldData, mapperService(),
-                similarityService(), scriptService, xContentRegistry,
+                similarityService(), scriptService, templateService, xContentRegistry,
                 client, indexReader,
             nowInMillis);
     }
@@ -499,6 +499,13 @@ public ScriptService getScriptService() {
         return scriptService;
     }
 
+    /**
+     * The {@link TemplateService} to use for this index.
+     */
+    public TemplateService getTemplateService() {
+        return templateService;
+    }
+
     List<IndexingOperationListener> getIndexOperationListeners() { // pkg private for testing
         return indexingOperationListeners;
     }

core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java

@@ -25,10 +25,10 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.TemplateService;
 
 import java.util.function.LongSupplier;
 
@@ -38,17 +38,19 @@
 public class QueryRewriteContext {
     protected final MapperService mapperService;
     protected final ScriptService scriptService;
+    private final TemplateService templateService;
     protected final IndexSettings indexSettings;
     private final NamedXContentRegistry xContentRegistry;
     protected final Client client;
     protected final IndexReader reader;
     protected final LongSupplier nowInMillis;
 
     public QueryRewriteContext(IndexSettings indexSettings, MapperService mapperService, ScriptService scriptService,
-            NamedXContentRegistry xContentRegistry, Client client, IndexReader reader,
+            TemplateService templateService, NamedXContentRegistry xContentRegistry, Client client, IndexReader reader,
             LongSupplier nowInMillis) {
         this.mapperService = mapperService;
         this.scriptService = scriptService;
+        this.templateService = templateService;
         this.indexSettings = indexSettings;
         this.xContentRegistry = xContentRegistry;
         this.client = client;
@@ -104,7 +106,17 @@ public long nowInMillis() {
     }
 
     public BytesReference getTemplateBytes(Script template) {
-        ExecutableScript executable = scriptService.executable(template, ScriptContext.Standard.SEARCH);
-        return (BytesReference) executable.run();
+        return templateService
+                .template(template.getIdOrCode(), template.getType(),
+                        ScriptContext.Standard.SEARCH, null)
+                .apply(template.getParams());
+    }
+
+    public ScriptService getScriptService() {
+        return scriptService;
+    }
+
+    public TemplateService getTemplateService() {
+        return templateService;
     }
 }

core/src/main/java/org/elasticsearch/index/query/QueryShardContext.java

@@ -56,6 +56,7 @@
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.SearchScript;
+import org.elasticsearch.script.TemplateService;
 import org.elasticsearch.search.lookup.SearchLookup;
 
 import java.io.IOException;
@@ -100,9 +101,9 @@ public String[] getTypes() {
 
     public QueryShardContext(int shardId, IndexSettings indexSettings, BitsetFilterCache bitsetFilterCache,
             IndexFieldDataService indexFieldDataService, MapperService mapperService, SimilarityService similarityService,
-            ScriptService scriptService, NamedXContentRegistry xContentRegistry,
+            ScriptService scriptService, TemplateService templateService, NamedXContentRegistry xContentRegistry,
             Client client, IndexReader reader, LongSupplier nowInMillis) {
-        super(indexSettings, mapperService, scriptService, xContentRegistry, client, reader, nowInMillis);
+        super(indexSettings, mapperService, scriptService, templateService, xContentRegistry, client, reader, nowInMillis);
         this.shardId = shardId;
         this.indexSettings = indexSettings;
         this.similarityService = similarityService;
@@ -116,7 +117,7 @@ public QueryShardContext(int shardId, IndexSettings indexSettings, BitsetFilterC
 
     public QueryShardContext(QueryShardContext source) {
         this(source.shardId, source.indexSettings, source.bitsetFilterCache, source.indexFieldDataService, source.mapperService,
-                source.similarityService, source.scriptService, source.getXContentRegistry(), source.client,
+                source.similarityService, source.scriptService, source.getTemplateService(), source.getXContentRegistry(), source.client,
                 source.reader, source.nowInMillis);
         this.types = source.getTypes();
     }
@@ -355,13 +356,14 @@ public final ExecutableScript getExecutableScript(Script script, ScriptContext c
     }
 
     /**
-     * Returns a lazily created {@link ExecutableScript} that is compiled immediately but can be pulled later once all
-     * parameters are available.
+     * Returns {@link Function} representing a script that is compiled immediately but can be pulled
+     * later once all parameters are available.
      */
-    public final Function<Map<String, Object>, ExecutableScript> getLazyExecutableScript(Script script, ScriptContext context) {
+    public final Function<Map<String, Object>, ExecutableScript> getLazyExecutableScript(
+            Script script, ScriptContext context) {
         failIfFrozen();
         CompiledScript executable = scriptService.compile(script, context);
-        return (p) ->  scriptService.executable(executable, p);
+        return (p) -> scriptService.executable(executable, p);
     }
 
     /**

core/src/main/java/org/elasticsearch/indices/IndicesService.java

@@ -41,7 +41,6 @@
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.routing.RecoverySource;
 import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.CheckedFunction;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.breaker.CircuitBreaker;
@@ -110,6 +109,7 @@
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.TemplateService;
 import org.elasticsearch.search.internal.AliasFilter;
 import org.elasticsearch.search.internal.SearchContext;
 import org.elasticsearch.search.internal.ShardSearchRequest;
@@ -121,7 +121,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -162,7 +161,7 @@ public class IndicesService extends AbstractLifecycleComponent
     private final CircuitBreakerService circuitBreakerService;
     private final BigArrays bigArrays;
     private final ScriptService scriptService;
-    private final ClusterService clusterService;
+    private final TemplateService templateService;
     private final Client client;
     private volatile Map<String, IndexService> indices = emptyMap();
     private final Map<Index, List<PendingDelete>> pendingDeletes = new HashMap<>();
@@ -187,7 +186,7 @@ public IndicesService(Settings settings, PluginsService pluginsService, NodeEnvi
                           IndexNameExpressionResolver indexNameExpressionResolver,
                           MapperRegistry mapperRegistry, NamedWriteableRegistry namedWriteableRegistry,
                           ThreadPool threadPool, IndexScopedSettings indexScopedSettings, CircuitBreakerService circuitBreakerService,
-                          BigArrays bigArrays, ScriptService scriptService, ClusterService clusterService, Client client,
+                          BigArrays bigArrays, ScriptService scriptService, TemplateService templateService, Client client,
                           MetaStateService metaStateService) {
         super(settings);
         this.threadPool = threadPool;
@@ -208,7 +207,7 @@ public IndicesService(Settings settings, PluginsService pluginsService, NodeEnvi
         this.circuitBreakerService = circuitBreakerService;
         this.bigArrays = bigArrays;
         this.scriptService = scriptService;
-        this.clusterService = clusterService;
+        this.templateService = templateService;
         this.client = client;
         this.indicesFieldDataCache = new IndicesFieldDataCache(settings, new IndexFieldDataCache.Listener() {
             @Override
@@ -447,7 +446,7 @@ private synchronized IndexService createIndexService(final String reason,
             bigArrays,
             threadPool,
             scriptService,
-            clusterService,
+            templateService,
             client,
             indicesQueryCache,
             mapperRegistry,

core/src/main/java/org/elasticsearch/ingest/IngestService.java

@@ -40,11 +40,12 @@ public class IngestService {
     private final PipelineStore pipelineStore;
     private final PipelineExecutionService pipelineExecutionService;
 
-    public IngestService(Settings settings, ThreadPool threadPool,
-                         Environment env, ScriptService scriptService, AnalysisRegistry analysisRegistry,
+    public IngestService(Settings settings, ThreadPool threadPool, Environment env,
+                         org.elasticsearch.script.TemplateService esTemplateService,
+                         ScriptService scriptService, AnalysisRegistry analysisRegistry,
                          List<IngestPlugin> ingestPlugins) {
 
-        final TemplateService templateService = new InternalTemplateService(scriptService);
+        final TemplateService templateService = new InternalTemplateService(esTemplateService);
         Processor.Parameters parameters = new Processor.Parameters(env, scriptService, templateService,
             analysisRegistry, threadPool.getThreadContext());
         Map<String, Processor.Factory> processorFactories = new HashMap<>();

core/src/main/java/org/elasticsearch/ingest/InternalTemplateService.java

@@ -20,40 +20,31 @@
 package org.elasticsearch.ingest;
 
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptContext;
-import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.ScriptType;
 
-import java.util.Collections;
 import java.util.Map;
+import java.util.function.Function;
 
 public class InternalTemplateService implements TemplateService {
 
-    private final ScriptService scriptService;
+    private final org.elasticsearch.script.TemplateService templateService;
 
-    InternalTemplateService(ScriptService scriptService) {
-        this.scriptService = scriptService;
+    InternalTemplateService(org.elasticsearch.script.TemplateService templateService) {
+        this.templateService = templateService;
     }
 
     @Override
     public Template compile(String template) {
         int mustacheStart = template.indexOf("{{");
         int mustacheEnd = template.indexOf("}}");
         if (mustacheStart != -1 && mustacheEnd != -1 && mustacheStart < mustacheEnd) {
-            Script script = new Script(ScriptType.INLINE, "mustache", template, Collections.emptyMap());
-            CompiledScript compiledScript = scriptService.compile(script, ScriptContext.Standard.INGEST);
+            Function<Map<String, Object>, BytesReference> compiled = templateService.template(
+                    template, ScriptType.INLINE, ScriptContext.Standard.INGEST, null);
             return new Template() {
                 @Override
                 public String execute(Map<String, Object> model) {
-                    ExecutableScript executableScript = scriptService.executable(compiledScript, model);
-                    Object result = executableScript.run();
-                    if (result instanceof BytesReference) {
-                        return ((BytesReference) result).utf8ToString();
-                    }
-                    return String.valueOf(result);
+                    return compiled.apply(model).utf8ToString();
                 }
 
                 @Override