Scripting: Allow to define scripts within config/scripts, automatic…

…ally compiled and can be referenced by name, closes elastic#429.

modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptEngineService.java

@@ -28,6 +28,8 @@ public interface ScriptEngineService {
 
  String[] types();
 
+ String[] extensions();
+
  Object compile(String script);
 
  ExecutableScript executable(Object compiledScript, Map<String, Object> vars);

modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java

@@ -25,9 +25,15 @@
 import org.elasticsearch.common.collect.MapMaker;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
+import org.elasticsearch.env.Environment;
 import org.elasticsearch.script.mvel.MvelScriptEngineService;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
@@ -41,16 +47,18 @@ public class ScriptService extends AbstractComponent {
 
  private final ImmutableMap<String, ScriptEngineService> scriptEngines;
 
+ private final ConcurrentMap<String, CompiledScript> staticCache = ConcurrentCollections.newConcurrentMap();
+
  private final ConcurrentMap<String, CompiledScript> cache = new MapMaker().softValues().makeMap();
 
  public ScriptService(Settings settings) {
- this(settings, ImmutableSet.<ScriptEngineService>builder()
+ this(settings, new Environment(), ImmutableSet.<ScriptEngineService>builder()
  .add(new MvelScriptEngineService(settings))
  .build()
  );
  }
 
- @Inject public ScriptService(Settings settings, Set<ScriptEngineService> scriptEngines) {
+ @Inject public ScriptService(Settings settings, Environment env, Set<ScriptEngineService> scriptEngines) {
  super(settings);
 
  this.defaultLang = componentSettings.get("default_lang", "mvel");
@@ -62,6 +70,47 @@ public ScriptService(Settings settings) {
  }
  }
  this.scriptEngines = builder.build();
+
+ // compile static scripts
+ File scriptsFile = new File(env.configFile(), "scripts");
+ if (scriptsFile.exists()) {
+ processScriptsDirectory("", scriptsFile);
+ }
+ }
+
+ private void processScriptsDirectory(String prefix, File dir) {
+ for (File file : dir.listFiles()) {
+ if (file.isDirectory()) {
+ processScriptsDirectory(prefix + file.getName() + "_", file);
+ } else {
+ int extIndex = file.getName().lastIndexOf('.');
+ if (extIndex != -1) {
+ String ext = file.getName().substring(extIndex + 1);
+ String scriptName = prefix + file.getName().substring(0, extIndex);
+ boolean found = false;
+ for (ScriptEngineService engineService : scriptEngines.values()) {
+ for (String s : engineService.extensions()) {
+ if (s.equals(ext)) {
+ found = true;
+ try {
+ String script = Streams.copyToString(new InputStreamReader(new FileInputStream(file), "UTF-8"));
+ staticCache.put(scriptName, new CompiledScript(engineService.types()[0], engineService.compile(script)));
+ } catch (Exception e) {
+ logger.warn("failed to load/compile script [{}]", e, scriptName);
+ }
+ break;
+ }
+ }
+ if (found) {
+ break;
+ }
+ }
+ if (!found) {
+ logger.warn("no script engine found for [{}]", ext);
+ }
+ }
+ }
+ }
  }
 
  public void close() {
@@ -75,7 +124,11 @@ public CompiledScript compile(String script) {
  }
 
  public CompiledScript compile(String lang, String script) {
- CompiledScript compiled = cache.get(script);
+ CompiledScript compiled = staticCache.get(script);
+ if (compiled != null) {
+ return compiled;
+ }
+ compiled = cache.get(script);
  if (compiled != null) {
  return compiled;
  }

modules/elasticsearch/src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java

@@ -63,6 +63,10 @@ public class MvelScriptEngineService extends AbstractComponent implements Script
  return new String[]{"mvel"};
  }
 
+ @Override public String[] extensions() {
+ return new String[]{"mvel"};
+ }
+
  @Override public Object compile(String script) {
  return MVEL.compileExpression(script, parserContext);
  }

plugins/lang/groovy/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java

@@ -54,6 +54,10 @@ public class GroovyScriptEngineService extends AbstractComponent implements Scri
  return new String[]{"groovy"};
  }
 
+ @Override public String[] extensions() {
+ return new String[]{"groovy"};
+ }
+
  @Override public Object compile(String script) {
  return loader.parseClass(script, generateScriptName());
  }

plugins/lang/javascript/src/main/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineService.java

@@ -68,6 +68,10 @@ public class JavaScriptScriptEngineService extends AbstractComponent implements
  return new String[]{"js", "javascript"};
  }
 
+ @Override public String[] extensions() {
+ return new String[]{"js"};
+ }
+
  @Override public Object compile(String script) {
  Context ctx = Context.enter();
  try {

plugins/lang/python/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java

@@ -50,6 +50,10 @@ public class PythonScriptEngineService extends AbstractComponent implements Scri
  return new String[]{"python"};
  }
 
+ @Override public String[] extensions() {
+ return new String[]{"py"};
+ }
+
  @Override public Object compile(String script) {
  return interp.compile(script);
  }