JavaScript Plugin: Allow to use javascript for scripts, closes elasti…

…c#401.

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

@@ -39,5 +39,5 @@ public interface ExecutableScript {
  /**
  * Executes the script.
  */
- Object run(Map vars);
+ Object run(Map<String, Object> vars);
 }

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

@@ -30,7 +30,7 @@ public interface ScriptEngineService {
 
  Object compile(String script);
 
- ExecutableScript executable(Object compiledScript, Map vars);
+ ExecutableScript executable(Object compiledScript, Map<String, Object> vars);
 
- Object execute(Object compiledScript, Map vars);
+ Object execute(Object compiledScript, Map<String, Object> vars);
 }

modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java

@@ -56,8 +56,7 @@ protected Client getClient() {
  return client("server1");
  }
 
- @Test
- public void testCustomScriptBoost() throws Exception {
+ @Test public void testCustomScriptBoost() throws Exception {
  // execute a search before we create an index
  try {
  client.prepareSearch().setQuery(termQuery("test", "value")).execute().actionGet();

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

@@ -54,7 +54,7 @@ public class GroovyScriptEngineService extends AbstractComponent implements Scri
  return loader.parseClass(script, generateScriptName());
  }
 
- @Override public ExecutableScript executable(Object compiledScript, Map vars) {
+ @Override public ExecutableScript executable(Object compiledScript, Map<String, Object> vars) {
  try {
  Class scriptClass = (Class) compiledScript;
  Script scriptObject = (Script) scriptClass.newInstance();
@@ -69,7 +69,7 @@ public class GroovyScriptEngineService extends AbstractComponent implements Scri
  }
  }
 
- @Override public Object execute(Object compiledScript, Map vars) {
+ @Override public Object execute(Object compiledScript, Map<String, Object> vars) {
  try {
  Class scriptClass = (Class) compiledScript;
  Script scriptObject = (Script) scriptClass.newInstance();
@@ -97,7 +97,7 @@ public GroovyExecutableScript(Script script) {
  return script.run();
  }
 
- @Override public Object run(Map vars) {
+ @Override public Object run(Map<String, Object> vars) {
  script.getBinding().getVariables().putAll(vars);
  return script.run();
  }

plugins/lang/groovy/src/test/java/org/elasticsearch/script/groovy/GroovyScriptSearchTests.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.script.groovy;
 
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
@@ -38,6 +39,7 @@
 import static org.elasticsearch.common.xcontent.XContentFactory.*;
 import static org.elasticsearch.index.query.xcontent.FilterBuilders.*;
 import static org.elasticsearch.index.query.xcontent.QueryBuilders.*;
+import static org.elasticsearch.search.builder.SearchSourceBuilder.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
@@ -155,4 +157,101 @@ public class GroovyScriptSearchTests {
  assertThat(sObj2Arr2.get(0).toString(), equalTo("arr_value1"));
  assertThat(sObj2Arr2.get(1).toString(), equalTo("arr_value2"));
  }
+
+ @Test public void testCustomScriptBoost() throws Exception {
+ // execute a search before we create an index
+ try {
+ client.prepareSearch().setQuery(termQuery("test", "value")).execute().actionGet();
+ assert false : "should fail";
+ } catch (Exception e) {
+ // ignore, no indices
+ }
+
+ try {
+ client.prepareSearch("test").setQuery(termQuery("test", "value")).execute().actionGet();
+ assert false : "should fail";
+ } catch (Exception e) {
+ // ignore, no indices
+ }
+
+ client.admin().indices().create(createIndexRequest("test")).actionGet();
+ client.index(indexRequest("test").type("type1").id("1")
+ .source(jsonBuilder().startObject().field("test", "value beck").field("num1", 1.0f).endObject())).actionGet();
+ client.index(indexRequest("test").type("type1").id("2")
+ .source(jsonBuilder().startObject().field("test", "value check").field("num1", 2.0f).endObject())).actionGet();
+ client.admin().indices().refresh(refreshRequest()).actionGet();
+
+ logger.info("--- QUERY_THEN_FETCH");
+
+ logger.info("running doc['num1'].value");
+ SearchResponse response = client.search(searchRequest()
+ .searchType(SearchType.QUERY_THEN_FETCH)
+ .source(searchSource().explain(true).query(customScoreQuery(termQuery("test", "value")).script("doc['num1'].value").lang("groovy")))
+ ).actionGet();
+
+ assertThat(response.hits().totalHits(), equalTo(2l));
+ logger.info("Hit[0] {} Explanation {}", response.hits().getAt(0).id(), response.hits().getAt(0).explanation());
+ logger.info("Hit[1] {} Explanation {}", response.hits().getAt(1).id(), response.hits().getAt(1).explanation());
+ assertThat(response.hits().getAt(0).id(), equalTo("2"));
+ assertThat(response.hits().getAt(1).id(), equalTo("1"));
+
+ logger.info("running -doc['num1'].value");
+ response = client.search(searchRequest()
+ .searchType(SearchType.QUERY_THEN_FETCH)
+ .source(searchSource().explain(true).query(customScoreQuery(termQuery("test", "value")).script("-doc['num1'].value").lang("groovy")))
+ ).actionGet();
+
+ assertThat(response.hits().totalHits(), equalTo(2l));
+ logger.info("Hit[0] {} Explanation {}", response.hits().getAt(0).id(), response.hits().getAt(0).explanation());
+ logger.info("Hit[1] {} Explanation {}", response.hits().getAt(1).id(), response.hits().getAt(1).explanation());
+ assertThat(response.hits().getAt(0).id(), equalTo("1"));
+ assertThat(response.hits().getAt(1).id(), equalTo("2"));
+
+
+ logger.info("running pow(doc['num1'].value, 2)");
+ response = client.search(searchRequest()
+ .searchType(SearchType.QUERY_THEN_FETCH)
+ .source(searchSource().explain(true).query(customScoreQuery(termQuery("test", "value")).script("Math.pow(doc['num1'].value, 2)").lang("groovy")))
+ ).actionGet();
+
+ assertThat(response.hits().totalHits(), equalTo(2l));
+ logger.info("Hit[0] {} Explanation {}", response.hits().getAt(0).id(), response.hits().getAt(0).explanation());
+ logger.info("Hit[1] {} Explanation {}", response.hits().getAt(1).id(), response.hits().getAt(1).explanation());
+ assertThat(response.hits().getAt(0).id(), equalTo("2"));
+ assertThat(response.hits().getAt(1).id(), equalTo("1"));
+
+ logger.info("running max(doc['num1'].value, 1)");
+ response = client.search(searchRequest()
+ .searchType(SearchType.QUERY_THEN_FETCH)
+ .source(searchSource().explain(true).query(customScoreQuery(termQuery("test", "value")).script("Math.max(doc['num1'].value, 1d)").lang("groovy")))
+ ).actionGet();
+
+ assertThat(response.hits().totalHits(), equalTo(2l));
+ logger.info("Hit[0] {} Explanation {}", response.hits().getAt(0).id(), response.hits().getAt(0).explanation());
+ logger.info("Hit[1] {} Explanation {}", response.hits().getAt(1).id(), response.hits().getAt(1).explanation());
+ assertThat(response.hits().getAt(0).id(), equalTo("2"));
+ assertThat(response.hits().getAt(1).id(), equalTo("1"));
+
+ logger.info("running doc['num1'].value * score");
+ response = client.search(searchRequest()
+ .searchType(SearchType.QUERY_THEN_FETCH)
+ .source(searchSource().explain(true).query(customScoreQuery(termQuery("test", "value")).script("doc['num1'].value * score").lang("groovy")))
+ ).actionGet();
+
+ assertThat(response.hits().totalHits(), equalTo(2l));
+ logger.info("Hit[0] {} Explanation {}", response.hits().getAt(0).id(), response.hits().getAt(0).explanation());
+ logger.info("Hit[1] {} Explanation {}", response.hits().getAt(1).id(), response.hits().getAt(1).explanation());
+ assertThat(response.hits().getAt(0).id(), equalTo("2"));
+ assertThat(response.hits().getAt(1).id(), equalTo("1"));
+
+ logger.info("running param1 * param2 * score");
+ response = client.search(searchRequest()
+ .searchType(SearchType.QUERY_THEN_FETCH)
+ .source(searchSource().explain(true).query(customScoreQuery(termQuery("test", "value")).script("param1 * param2 * score").param("param1", 2).param("param2", 2).lang("groovy")))
+ ).actionGet();
+
+ assertThat(response.hits().totalHits(), equalTo(2l));
+ logger.info("Hit[0] {} Explanation {}", response.hits().getAt(0).id(), response.hits().getAt(0).explanation());
+ logger.info("Hit[1] {} Explanation {}", response.hits().getAt(1).id(), response.hits().getAt(1).explanation());
+ }
 }

plugins/lang/groovy/src/test/java/org/elasticsearch/script/groovy/SimpleBench.java

@@ -35,7 +35,7 @@ public static void main(String[] args) {
  GroovyScriptEngineService se = new GroovyScriptEngineService(ImmutableSettings.Builder.EMPTY_SETTINGS);
  Object compiled = se.compile("x + y");
 
- Map<String, Integer> vars = new HashMap<String, Integer>();
+ Map<String, Object> vars = new HashMap<String, Object>();
  // warm up
  for (int i = 0; i < 1000; i++) {
  vars.put("x", i);

plugins/lang/javascript/build.gradle

@@ -0,0 +1,145 @@
+dependsOn(':elasticsearch')
+
+apply plugin: 'java'
+apply plugin: 'maven'
+
+archivesBaseName = "elasticsearch-lang-javascript"
+
+explodedDistDir = new File(distsDir, 'exploded')
+
+configurations.compile.transitive = true
+configurations.testCompile.transitive = true
+
+// no need to use the resource dir
+sourceSets.main.resources.srcDirs 'src/main/java'
+sourceSets.test.resources.srcDirs 'src/test/java'
+
+// add the source files to the dist jar
+//jar {
+// from sourceSets.main.allSource
+//}
+
+configurations {
+ dists
+ distLib {
+ visible = false
+ transitive = false
+ }
+}
+
+dependencies {
+ compile project(':elasticsearch')
+
+ compile('rhino:js:1.7R2')
+ distLib('rhino:js:1.7R2') { transitive = false }
+
+ testCompile project(':test-testng')
+ testCompile('org.testng:testng:5.10:jdk15') { transitive = false }
+ testCompile 'org.hamcrest:hamcrest-all:1.1'
+}
+
+test {
+ useTestNG()
+ jmvArgs = ["-ea", "-Xmx1024m"]
+ suiteName = project.name
+ listeners = ["org.elasticsearch.util.testng.Listeners"]
+ systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties")
+}
+
+task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') << {
+ [explodedDistDir]*.mkdirs()
+
+ copy {
+ from configurations.distLib
+ into explodedDistDir
+ }
+
+ // remove elasticsearch files (compile above adds the elasticsearch one)
+ ant.delete { fileset(dir: explodedDistDir, includes: "elasticsearch-*.jar") }
+
+ copy {
+ from libsDir
+ into explodedDistDir
+ }
+
+ ant.delete { fileset(dir: explodedDistDir, includes: "elasticsearch-*-javadoc.jar") }
+ ant.delete { fileset(dir: explodedDistDir, includes: "elasticsearch-*-sources.jar") }
+}
+
+task zip(type: Zip, dependsOn: ['explodedDist']) {
+ from(explodedDistDir) {
+ }
+}
+
+task release(dependsOn: [zip]) << {
+ ant.delete(dir: explodedDistDir)
+ copy {
+ from distsDir
+ into(new File(rootProject.distsDir, "plugins"))
+ }
+}
+
+configurations {
+ deployerJars
+}
+
+dependencies {
+ deployerJars "org.apache.maven.wagon:wagon-http:1.0-beta-2"
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+}
+
+jar {
+// from sourceSets.main.allJava
+ manifest {
+ attributes("Implementation-Title": "ElasticSearch", "Implementation-Version": rootProject.version, "Implementation-Date": buildTimeStr)
+ }
+}
+
+
+artifacts {
+ archives sourcesJar
+ archives javadocJar
+}
+
+uploadArchives {
+ repositories.mavenDeployer {
+ configuration = configurations.deployerJars
+ repository(url: rootProject.mavenRepoUrl) {
+ authentication(userName: rootProject.mavenRepoUser, password: rootProject.mavenRepoPass)
+ }
+ snapshotRepository(url: rootProject.mavenSnapshotRepoUrl) {
+ authentication(userName: rootProject.mavenRepoUser, password: rootProject.mavenRepoPass)
+ }
+
+ pom.project {
+ inceptionYear '2009'
+ name 'elasticsearch-plugins-lang-javascript'
+ description 'JavaScript Plugin for ElasticSearch'
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http:https://www.apache.org/licenses/LICENSE-2.0.txt'
+ distribution 'repo'
+ }
+ }
+ scm {
+ connection 'git:https://github.com/elasticsearch/elasticsearch.git'
+ developerConnection '[email protected]:elasticsearch/elasticsearch.git'
+ url 'http:https://github.com/elasticsearch/elasticsearch'
+ }
+ }
+
+ pom.whenConfigured {pom ->
+ pom.dependencies = pom.dependencies.findAll {dep -> dep.scope != 'test' } // removes the test scoped ones
+ }
+ }
+}

plugins/lang/javascript/src/main/java/es-plugin.properties

@@ -0,0 +1 @@
+plugin=org.elasticsearch.plugin.javascript.JavaScriptPlugin