diff --git a/plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/SumTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java
similarity index 51%
rename from plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/SumTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java
index 0eaaafb9603..d87de000108 100644
--- a/plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/SumTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java
@@ -16,21 +16,32 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.elasticsearch.messy.tests;
+package org.elasticsearch.search.aggregations.metrics;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.Scorer;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.script.CompiledScript;
+import org.elasticsearch.script.ExecutableScript;
+import org.elasticsearch.script.LeafSearchScript;
import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptEngineService;
+import org.elasticsearch.script.ScriptModule;
import org.elasticsearch.script.ScriptService.ScriptType;
-import org.elasticsearch.script.groovy.GroovyPlugin;
+import org.elasticsearch.script.SearchScript;
import org.elasticsearch.search.aggregations.bucket.global.Global;
import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
-import org.elasticsearch.search.aggregations.metrics.AbstractNumericTestCase;
import org.elasticsearch.search.aggregations.metrics.sum.Sum;
+import org.elasticsearch.search.lookup.LeafSearchLookup;
+import org.elasticsearch.search.lookup.SearchLookup;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
@@ -44,10 +55,11 @@ import static org.hamcrest.Matchers.notNullValue;
/**
*
*/
-public class SumTests extends AbstractNumericTestCase {
+public class SumIT extends AbstractNumericTestCase {
+
@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
- return Collections.singleton(GroovyPlugin.class);
+ return Arrays.asList(ExtractFieldScriptPlugin.class, FieldValueScriptPlugin.class);
}
@Override
@@ -157,7 +169,7 @@ public class SumTests extends AbstractNumericTestCase {
public void testSingleValuedFieldWithValueScript() throws Exception {
SearchResponse searchResponse = client().prepareSearch("idx")
.setQuery(matchAllQuery())
- .addAggregation(sum("sum").field("value").script(new Script("_value + 1")))
+ .addAggregation(sum("sum").field("value").script(new Script("", ScriptType.INLINE, FieldValueScriptEngine.NAME, null)))
.execute().actionGet();
assertHitCount(searchResponse, 10);
@@ -165,7 +177,7 @@ public class SumTests extends AbstractNumericTestCase {
Sum sum = searchResponse.getAggregations().get("sum");
assertThat(sum, notNullValue());
assertThat(sum.getName(), equalTo("sum"));
- assertThat(sum.getValue(), equalTo((double) 2+3+4+5+6+7+8+9+10+11));
+ assertThat(sum.getValue(), equalTo((double) 1+2+3+4+5+6+7+8+9+10));
}
@Override
@@ -174,7 +186,7 @@ public class SumTests extends AbstractNumericTestCase {
params.put("increment", 1);
SearchResponse searchResponse = client().prepareSearch("idx")
.setQuery(matchAllQuery())
- .addAggregation(sum("sum").field("value").script(new Script("_value + increment", ScriptType.INLINE, null, params)))
+ .addAggregation(sum("sum").field("value").script(new Script("", ScriptType.INLINE, FieldValueScriptEngine.NAME, params)))
.execute().actionGet();
assertHitCount(searchResponse, 10);
@@ -182,14 +194,14 @@ public class SumTests extends AbstractNumericTestCase {
Sum sum = searchResponse.getAggregations().get("sum");
assertThat(sum, notNullValue());
assertThat(sum.getName(), equalTo("sum"));
- assertThat(sum.getValue(), equalTo((double) 2+3+4+5+6+7+8+9+10+11));
+ assertThat(sum.getValue(), equalTo((double) 1+2+3+4+5+6+7+8+9+10));
}
@Override
public void testScriptSingleValued() throws Exception {
SearchResponse searchResponse = client().prepareSearch("idx")
.setQuery(matchAllQuery())
- .addAggregation(sum("sum").script(new Script("doc['value'].value")))
+ .addAggregation(sum("sum").script(new Script("value", ScriptType.INLINE, ExtractFieldScriptEngine.NAME, null)))
.execute().actionGet();
assertHitCount(searchResponse, 10);
@@ -206,7 +218,7 @@ public class SumTests extends AbstractNumericTestCase {
params.put("inc", 1);
SearchResponse searchResponse = client().prepareSearch("idx")
.setQuery(matchAllQuery())
- .addAggregation(sum("sum").script(new Script("doc['value'].value + inc", ScriptType.INLINE, null, params)))
+ .addAggregation(sum("sum").script(new Script("value", ScriptType.INLINE, ExtractFieldScriptEngine.NAME, params)))
.execute().actionGet();
assertHitCount(searchResponse, 10);
@@ -221,7 +233,7 @@ public class SumTests extends AbstractNumericTestCase {
public void testScriptMultiValued() throws Exception {
SearchResponse searchResponse = client().prepareSearch("idx")
.setQuery(matchAllQuery())
- .addAggregation(sum("sum").script(new Script("[ doc['value'].value, doc['value'].value + 1 ]")))
+ .addAggregation(sum("sum").script(new Script("values", ScriptType.INLINE, ExtractFieldScriptEngine.NAME, null)))
.execute().actionGet();
assertHitCount(searchResponse, 10);
@@ -229,7 +241,7 @@ public class SumTests extends AbstractNumericTestCase {
Sum sum = searchResponse.getAggregations().get("sum");
assertThat(sum, notNullValue());
assertThat(sum.getName(), equalTo("sum"));
- assertThat(sum.getValue(), equalTo((double) 1+2+2+3+3+4+4+5+5+6+6+7+7+8+8+9+9+10+10+11));
+ assertThat(sum.getValue(), equalTo((double) 2+3+3+4+4+5+5+6+6+7+7+8+8+9+9+10+10+11+11+12));
}
@Override
@@ -239,7 +251,7 @@ public class SumTests extends AbstractNumericTestCase {
SearchResponse searchResponse = client().prepareSearch("idx")
.setQuery(matchAllQuery())
.addAggregation(
- sum("sum").script(new Script("[ doc['value'].value, doc['value'].value + inc ]", ScriptType.INLINE, null, params)))
+ sum("sum").script(new Script("values", ScriptType.INLINE, ExtractFieldScriptEngine.NAME, params)))
.execute().actionGet();
assertHitCount(searchResponse, 10);
@@ -247,7 +259,7 @@ public class SumTests extends AbstractNumericTestCase {
Sum sum = searchResponse.getAggregations().get("sum");
assertThat(sum, notNullValue());
assertThat(sum.getName(), equalTo("sum"));
- assertThat(sum.getValue(), equalTo((double) 1+2+2+3+3+4+4+5+5+6+6+7+7+8+8+9+9+10+10+11));
+ assertThat(sum.getValue(), equalTo((double) 3+4+4+5+5+6+6+7+7+8+8+9+9+10+10+11+11+12+12+13));
}
@Override
@@ -271,22 +283,7 @@ public class SumTests extends AbstractNumericTestCase {
SearchResponse searchResponse = client().prepareSearch("idx")
.setQuery(matchAllQuery())
- .addAggregation(sum("sum").field("values").script(new Script("_value + 1"))).execute().actionGet();
-
- assertHitCount(searchResponse, 10);
-
- Sum sum = searchResponse.getAggregations().get("sum");
- assertThat(sum, notNullValue());
- assertThat(sum.getName(), equalTo("sum"));
- assertThat(sum.getValue(), equalTo((double) 3 + 4 + 4 + 5 + 5 + 6 + 6 + 7 + 7 + 8 + 8 + 9 + 9 + 10 + 10 + 11 + 11 + 12 + 12 + 13));
- }
-
- @Override
- public void testMultiValuedFieldWithValueScriptWithParams() throws Exception {
- Map<String, Object> params = new HashMap<>();
- params.put("increment", 1);
- SearchResponse searchResponse = client().prepareSearch("idx").setQuery(matchAllQuery())
- .addAggregation(sum("sum").field("values").script(new Script("_value + increment", ScriptType.INLINE, null, params)))
+ .addAggregation(sum("sum").field("values").script(new Script("", ScriptType.INLINE, FieldValueScriptEngine.NAME, null)))
.execute().actionGet();
assertHitCount(searchResponse, 10);
@@ -294,6 +291,296 @@ public class SumTests extends AbstractNumericTestCase {
Sum sum = searchResponse.getAggregations().get("sum");
assertThat(sum, notNullValue());
assertThat(sum.getName(), equalTo("sum"));
- assertThat(sum.getValue(), equalTo((double) 3 + 4 + 4 + 5 + 5 + 6 + 6 + 7 + 7 + 8 + 8 + 9 + 9 + 10 + 10 + 11 + 11 + 12 + 12 + 13));
+ assertThat(sum.getValue(), equalTo((double) 2 + 3 + 3 + 4 + 4 + 5 + 5 + 6 + 6 + 7 + 7 + 8 + 8 + 9 + 9 + 10 + 10 + 11 + 11 + 12));
+ }
+
+ @Override
+ public void testMultiValuedFieldWithValueScriptWithParams() throws Exception {
+ Map<String, Object> params = new HashMap<>();
+ params.put("increment", 1);
+ SearchResponse searchResponse = client().prepareSearch("idx").setQuery(matchAllQuery())
+ .addAggregation(sum("sum").field("values").script(new Script("", ScriptType.INLINE, FieldValueScriptEngine.NAME, params)))
+ .execute().actionGet();
+
+ assertHitCount(searchResponse, 10);
+
+ Sum sum = searchResponse.getAggregations().get("sum");
+ assertThat(sum, notNullValue());
+ assertThat(sum.getName(), equalTo("sum"));
+ assertThat(sum.getValue(), equalTo((double) 2 + 3 + 3 + 4 + 4 + 5 + 5 + 6 + 6 + 7 + 7 + 8 + 8 + 9 + 9 + 10 + 10 + 11 + 11 + 12));
+ }
+
+ /**
+ * Mock plugin for the {@link ExtractFieldScriptEngine}
+ */
+ public static class ExtractFieldScriptPlugin extends Plugin {
+
+ @Override
+ public String name() {
+ return ExtractFieldScriptEngine.NAME;
+ }
+
+ @Override
+ public String description() {
+ return "Mock script engine for " + SumIT.class;
+ }
+
+ public void onModule(ScriptModule module) {
+ module.addScriptEngine(ExtractFieldScriptEngine.class);
+ }
+
+ }
+
+ /**
+ * This mock script returns the field that is specified by name in the
+ * script body
+ */
+ public static class ExtractFieldScriptEngine implements ScriptEngineService {
+
+ public static final String NAME = "extract_field";
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ @Override
+ public String[] types() {
+ return new String[] { NAME };
+ }
+
+ @Override
+ public String[] extensions() {
+ return types();
+ }
+
+ @Override
+ public boolean sandboxed() {
+ return true;
+ }
+
+ @Override
+ public Object compile(String script) {
+ return script;
+ }
+
+ @Override
+ public ExecutableScript executable(CompiledScript compiledScript, Map<String, Object> params) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public SearchScript search(CompiledScript compiledScript, SearchLookup lookup, Map<String, Object> vars) {
+ final long inc;
+ if (vars == null || vars.containsKey("inc") == false) {
+ inc = 0;
+ } else {
+ inc = ((Number) vars.get("inc")).longValue();
+ }
+ return new SearchScript() {
+
+ @Override
+ public LeafSearchScript getLeafSearchScript(LeafReaderContext context) throws IOException {
+
+ final LeafSearchLookup leafLookup = lookup.getLeafSearchLookup(context);
+
+ return new LeafSearchScript() {
+
+ @Override
+ public Object unwrap(Object value) {
+ return null;
+ }
+
+ @Override
+ public void setNextVar(String name, Object value) {
+ }
+
+ @Override
+ public Object run() {
+ String fieldName = (String) compiledScript.compiled();
+ List<Long> values = new ArrayList<>();
+ for (Object v : (List<?>) leafLookup.doc().get(fieldName)) {
+ values.add(((Number) v).longValue() + inc);
+ }
+ return values;
+ }
+
+ @Override
+ public void setScorer(Scorer scorer) {
+ }
+
+ @Override
+ public void setSource(Map<String, Object> source) {
+ }
+
+ @Override
+ public void setDocument(int doc) {
+ if (leafLookup != null) {
+ leafLookup.setDocument(doc);
+ }
+ }
+
+ @Override
+ public long runAsLong() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public float runAsFloat() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public double runAsDouble() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+ @Override
+ public boolean needsScores() {
+ return false;
+ }
+ };
+ }
+
+ @Override
+ public void scriptRemoved(CompiledScript script) {
+ }
+ }
+
+ /**
+ * Mock plugin for the {@link FieldValueScriptEngine}
+ */
+ public static class FieldValueScriptPlugin extends Plugin {
+
+ @Override
+ public String name() {
+ return FieldValueScriptEngine.NAME;
+ }
+
+ @Override
+ public String description() {
+ return "Mock script engine for " + SumIT.class;
+ }
+
+ public void onModule(ScriptModule module) {
+ module.addScriptEngine(FieldValueScriptEngine.class);
+ }
+
+ }
+
+ /**
+ * This mock script returns the field value and adds one to the returned
+ * value
+ */
+ public static class FieldValueScriptEngine implements ScriptEngineService {
+
+ public static final String NAME = "field_value";
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ @Override
+ public String[] types() {
+ return new String[] { NAME };
+ }
+
+ @Override
+ public String[] extensions() {
+ return types();
+ }
+
+ @Override
+ public boolean sandboxed() {
+ return true;
+ }
+
+ @Override
+ public Object compile(String script) {
+ return script;
+ }
+
+ @Override
+ public ExecutableScript executable(CompiledScript compiledScript, Map<String, Object> params) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public SearchScript search(CompiledScript compiledScript, SearchLookup lookup, Map<String, Object> vars) {
+ final long inc;
+ if (vars == null || vars.containsKey("inc") == false) {
+ inc = 0;
+ } else {
+ inc = ((Number) vars.get("inc")).longValue();
+ }
+ return new SearchScript() {
+
+ private Map<String, Object> vars = new HashMap<>(2);
+
+ @Override
+ public LeafSearchScript getLeafSearchScript(LeafReaderContext context) throws IOException {
+
+ final LeafSearchLookup leafLookup = lookup.getLeafSearchLookup(context);
+
+ return new LeafSearchScript() {
+
+ @Override
+ public Object unwrap(Object value) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setNextVar(String name, Object value) {
+ vars.put(name, value);
+ }
+
+ @Override
+ public Object run() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setScorer(Scorer scorer) {
+ }
+
+ @Override
+ public void setSource(Map<String, Object> source) {
+ }
+
+ @Override
+ public void setDocument(int doc) {
+ if (leafLookup != null) {
+ leafLookup.setDocument(doc);
+ }
+ }
+
+ @Override
+ public long runAsLong() {
+ return ((Number) vars.get("_value")).longValue() + inc;
+ }
+
+ @Override
+ public float runAsFloat() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public double runAsDouble() {
+ return ((Number) vars.get("_value")).doubleValue() + inc;
+ }
+ };
+ }
+
+ @Override
+ public boolean needsScores() {
+ return false;
+ }
+ };
+ }
+
+ @Override
+ public void scriptRemoved(CompiledScript script) {
+ }
}
}
\ No newline at end of file