|
@@ -37,7 +37,6 @@ import org.elasticsearch.index.fielddata.IndexNumericFieldData;
|
|
|
import org.elasticsearch.index.mapper.DateFieldMapper;
|
|
|
import org.elasticsearch.index.mapper.GeoPointFieldMapper.GeoPointFieldType;
|
|
|
import org.elasticsearch.index.mapper.MappedFieldType;
|
|
|
-import org.elasticsearch.index.mapper.MapperService;
|
|
|
import org.elasticsearch.script.BucketAggregationScript;
|
|
|
import org.elasticsearch.script.BucketAggregationSelectorScript;
|
|
|
import org.elasticsearch.script.ClassPermission;
|
|
@@ -47,6 +46,7 @@ import org.elasticsearch.script.ScriptContext;
|
|
|
import org.elasticsearch.script.ScriptEngine;
|
|
|
import org.elasticsearch.script.ScriptException;
|
|
|
import org.elasticsearch.script.SearchScript;
|
|
|
+import org.elasticsearch.script.TermsSetQueryScript;
|
|
|
import org.elasticsearch.search.lookup.SearchLookup;
|
|
|
|
|
|
import java.io.IOException;
|
|
@@ -128,6 +128,9 @@ public class ExpressionScriptEngine extends AbstractComponent implements ScriptE
|
|
|
} else if (context.instanceClazz.equals(ScoreScript.class)) {
|
|
|
ScoreScript.Factory factory = (p, lookup) -> newScoreScript(expr, lookup, p);
|
|
|
return context.factoryClazz.cast(factory);
|
|
|
+ } else if (context.instanceClazz.equals(TermsSetQueryScript.class)) {
|
|
|
+ TermsSetQueryScript.Factory factory = (p, lookup) -> newTermsSetQueryScript(expr, lookup, p);
|
|
|
+ return context.factoryClazz.cast(factory);
|
|
|
}
|
|
|
throw new IllegalArgumentException("expression engine does not know how to handle script context [" + context.name + "]");
|
|
|
}
|
|
@@ -164,7 +167,6 @@ public class ExpressionScriptEngine extends AbstractComponent implements ScriptE
|
|
|
}
|
|
|
|
|
|
private SearchScript.LeafFactory newSearchScript(Expression expr, SearchLookup lookup, @Nullable Map<String, Object> vars) {
|
|
|
- MapperService mapper = lookup.doc().mapperService();
|
|
|
// NOTE: if we need to do anything complicated with bindings in the future, we can just extend Bindings,
|
|
|
// instead of complicating SimpleBindings (which should stay simple)
|
|
|
SimpleBindings bindings = new SimpleBindings();
|
|
@@ -183,100 +185,11 @@ public class ExpressionScriptEngine extends AbstractComponent implements ScriptE
|
|
|
// way to know this is for aggregations and so _value is ok to have...
|
|
|
|
|
|
} else if (vars != null && vars.containsKey(variable)) {
|
|
|
- // TODO: document and/or error if vars contains _score?
|
|
|
- // NOTE: by checking for the variable in vars first, it allows masking document fields with a global constant,
|
|
|
- // but if we were to reverse it, we could provide a way to supply dynamic defaults for documents missing the field?
|
|
|
- Object value = vars.get(variable);
|
|
|
- if (value instanceof Number) {
|
|
|
- bindings.add(variable, new DoubleConstValueSource(((Number) value).doubleValue()).asDoubleValuesSource());
|
|
|
- } else {
|
|
|
- throw new ParseException("Parameter [" + variable + "] must be a numeric type", 0);
|
|
|
- }
|
|
|
-
|
|
|
+ bindFromParams(vars, bindings, variable);
|
|
|
} else {
|
|
|
- String fieldname = null;
|
|
|
- String methodname = null;
|
|
|
- String variablename = "value"; // .value is the default for doc['field'], its optional.
|
|
|
- boolean dateAccessor = false; // true if the variable is of type doc['field'].date.xxx
|
|
|
- VariableContext[] parts = VariableContext.parse(variable);
|
|
|
- if (parts[0].text.equals("doc") == false) {
|
|
|
- throw new ParseException("Unknown variable [" + parts[0].text + "]", 0);
|
|
|
- }
|
|
|
- if (parts.length < 2 || parts[1].type != VariableContext.Type.STR_INDEX) {
|
|
|
- throw new ParseException("Variable 'doc' must be used with a specific field like: doc['myfield']", 3);
|
|
|
- } else {
|
|
|
- fieldname = parts[1].text;
|
|
|
- }
|
|
|
- if (parts.length == 3) {
|
|
|
- if (parts[2].type == VariableContext.Type.METHOD) {
|
|
|
- methodname = parts[2].text;
|
|
|
- } else if (parts[2].type == VariableContext.Type.MEMBER) {
|
|
|
- variablename = parts[2].text;
|
|
|
- } else {
|
|
|
- throw new IllegalArgumentException("Only member variables or member methods may be accessed on a field when not accessing the field directly");
|
|
|
- }
|
|
|
- }
|
|
|
- if (parts.length > 3) {
|
|
|
- // access to the .date "object" within the field
|
|
|
- if (parts.length == 4 && ("date".equals(parts[2].text) || "getDate".equals(parts[2].text))) {
|
|
|
- if (parts[3].type == VariableContext.Type.METHOD) {
|
|
|
- methodname = parts[3].text;
|
|
|
- dateAccessor = true;
|
|
|
- } else if (parts[3].type == VariableContext.Type.MEMBER) {
|
|
|
- variablename = parts[3].text;
|
|
|
- dateAccessor = true;
|
|
|
- }
|
|
|
- }
|
|
|
- if (!dateAccessor) {
|
|
|
- throw new IllegalArgumentException("Variable [" + variable + "] does not follow an allowed format of either doc['field'] or doc['field'].method()");
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- MappedFieldType fieldType = mapper.fullName(fieldname);
|
|
|
-
|
|
|
- if (fieldType == null) {
|
|
|
- throw new ParseException("Field [" + fieldname + "] does not exist in mappings", 5);
|
|
|
- }
|
|
|
-
|
|
|
- IndexFieldData<?> fieldData = lookup.doc().getForField(fieldType);
|
|
|
-
|
|
|
// delegate valuesource creation based on field's type
|
|
|
// there are three types of "fields" to expressions, and each one has a different "api" of variables and methods.
|
|
|
-
|
|
|
- final ValueSource valueSource;
|
|
|
- if (fieldType instanceof GeoPointFieldType) {
|
|
|
- // geo
|
|
|
- if (methodname == null) {
|
|
|
- valueSource = GeoField.getVariable(fieldData, fieldname, variablename);
|
|
|
- } else {
|
|
|
- valueSource = GeoField.getMethod(fieldData, fieldname, methodname);
|
|
|
- }
|
|
|
- } else if (fieldType instanceof DateFieldMapper.DateFieldType) {
|
|
|
- if (dateAccessor) {
|
|
|
- // date object
|
|
|
- if (methodname == null) {
|
|
|
- valueSource = DateObject.getVariable(fieldData, fieldname, variablename);
|
|
|
- } else {
|
|
|
- valueSource = DateObject.getMethod(fieldData, fieldname, methodname);
|
|
|
- }
|
|
|
- } else {
|
|
|
- // date field itself
|
|
|
- if (methodname == null) {
|
|
|
- valueSource = DateField.getVariable(fieldData, fieldname, variablename);
|
|
|
- } else {
|
|
|
- valueSource = DateField.getMethod(fieldData, fieldname, methodname);
|
|
|
- }
|
|
|
- }
|
|
|
- } else if (fieldData instanceof IndexNumericFieldData) {
|
|
|
- // number
|
|
|
- if (methodname == null) {
|
|
|
- valueSource = NumericField.getVariable(fieldData, fieldname, variablename);
|
|
|
- } else {
|
|
|
- valueSource = NumericField.getMethod(fieldData, fieldname, methodname);
|
|
|
- }
|
|
|
- } else {
|
|
|
- throw new ParseException("Field [" + fieldname + "] must be numeric, date, or geopoint", 5);
|
|
|
- }
|
|
|
+ final ValueSource valueSource = getDocValueSource(variable, lookup);
|
|
|
needsScores |= valueSource.getSortField(false).needsScores();
|
|
|
bindings.add(variable, valueSource.asDoubleValuesSource());
|
|
|
}
|
|
@@ -288,6 +201,30 @@ public class ExpressionScriptEngine extends AbstractComponent implements ScriptE
|
|
|
return new ExpressionSearchScript(expr, bindings, specialValue, needsScores);
|
|
|
}
|
|
|
|
|
|
+ private TermsSetQueryScript.LeafFactory newTermsSetQueryScript(Expression expr, SearchLookup lookup,
|
|
|
+ @Nullable Map<String, Object> vars) {
|
|
|
+ // NOTE: if we need to do anything complicated with bindings in the future, we can just extend Bindings,
|
|
|
+ // instead of complicating SimpleBindings (which should stay simple)
|
|
|
+ SimpleBindings bindings = new SimpleBindings();
|
|
|
+ for (String variable : expr.variables) {
|
|
|
+ try {
|
|
|
+ if (vars != null && vars.containsKey(variable)) {
|
|
|
+ bindFromParams(vars, bindings, variable);
|
|
|
+ } else {
|
|
|
+ // delegate valuesource creation based on field's type
|
|
|
+ // there are three types of "fields" to expressions, and each one has a different "api" of variables and methods.
|
|
|
+ final ValueSource valueSource = getDocValueSource(variable, lookup);
|
|
|
+ bindings.add(variable, valueSource.asDoubleValuesSource());
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ // we defer "binding" of variables until here: give context for that variable
|
|
|
+ throw convertToScriptException("link error", expr.sourceText, variable, e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ ReplaceableConstDoubleValueSource specialValue = null;
|
|
|
+ return new ExpressionTermSetQueryScript(expr, bindings, specialValue);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* This is a hack for filter scripts, which must return booleans instead of doubles as expression do.
|
|
|
* See https://github.com/elastic/elasticsearch/issues/26429.
|
|
@@ -362,4 +299,106 @@ public class ExpressionScriptEngine extends AbstractComponent implements ScriptE
|
|
|
stack.add(pointer.toString());
|
|
|
throw new ScriptException(message, cause, stack, source, NAME);
|
|
|
}
|
|
|
+
|
|
|
+ private static ValueSource getDocValueSource(String variable, SearchLookup lookup) throws ParseException {
|
|
|
+ VariableContext[] parts = VariableContext.parse(variable);
|
|
|
+ if (parts[0].text.equals("doc") == false) {
|
|
|
+ throw new ParseException("Unknown variable [" + parts[0].text + "]", 0);
|
|
|
+ }
|
|
|
+ if (parts.length < 2 || parts[1].type != VariableContext.Type.STR_INDEX) {
|
|
|
+ throw new ParseException("Variable 'doc' must be used with a specific field like: doc['myfield']", 3);
|
|
|
+ }
|
|
|
+
|
|
|
+ // .value is the default for doc['field'], its optional.
|
|
|
+ String variablename = "value";
|
|
|
+ String methodname = null;
|
|
|
+ if (parts.length == 3) {
|
|
|
+ if (parts[2].type == VariableContext.Type.METHOD) {
|
|
|
+ methodname = parts[2].text;
|
|
|
+ } else if (parts[2].type == VariableContext.Type.MEMBER) {
|
|
|
+ variablename = parts[2].text;
|
|
|
+ } else {
|
|
|
+ throw new IllegalArgumentException(
|
|
|
+ "Only member variables or member methods may be accessed on a field when not accessing the field directly"
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // true if the variable is of type doc['field'].date.xxx
|
|
|
+ boolean dateAccessor = false;
|
|
|
+ if (parts.length > 3) {
|
|
|
+ // access to the .date "object" within the field
|
|
|
+ if (parts.length == 4 && ("date".equals(parts[2].text) || "getDate".equals(parts[2].text))) {
|
|
|
+ if (parts[3].type == VariableContext.Type.METHOD) {
|
|
|
+ methodname = parts[3].text;
|
|
|
+ dateAccessor = true;
|
|
|
+ } else if (parts[3].type == VariableContext.Type.MEMBER) {
|
|
|
+ variablename = parts[3].text;
|
|
|
+ dateAccessor = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!dateAccessor) {
|
|
|
+ throw new IllegalArgumentException(
|
|
|
+ "Variable [" + variable + "] does not follow an allowed format of either doc['field'] or doc['field'].method()"
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ String fieldname = parts[1].text;
|
|
|
+ MappedFieldType fieldType = lookup.doc().mapperService().fullName(fieldname);
|
|
|
+
|
|
|
+ if (fieldType == null) {
|
|
|
+ throw new ParseException("Field [" + fieldname + "] does not exist in mappings", 5);
|
|
|
+ }
|
|
|
+
|
|
|
+ IndexFieldData<?> fieldData = lookup.doc().getForField(fieldType);
|
|
|
+ final ValueSource valueSource;
|
|
|
+ if (fieldType instanceof GeoPointFieldType) {
|
|
|
+ // geo
|
|
|
+ if (methodname == null) {
|
|
|
+ valueSource = GeoField.getVariable(fieldData, fieldname, variablename);
|
|
|
+ } else {
|
|
|
+ valueSource = GeoField.getMethod(fieldData, fieldname, methodname);
|
|
|
+ }
|
|
|
+ } else if (fieldType instanceof DateFieldMapper.DateFieldType) {
|
|
|
+ if (dateAccessor) {
|
|
|
+ // date object
|
|
|
+ if (methodname == null) {
|
|
|
+ valueSource = DateObject.getVariable(fieldData, fieldname, variablename);
|
|
|
+ } else {
|
|
|
+ valueSource = DateObject.getMethod(fieldData, fieldname, methodname);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ // date field itself
|
|
|
+ if (methodname == null) {
|
|
|
+ valueSource = DateField.getVariable(fieldData, fieldname, variablename);
|
|
|
+ } else {
|
|
|
+ valueSource = DateField.getMethod(fieldData, fieldname, methodname);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (fieldData instanceof IndexNumericFieldData) {
|
|
|
+ // number
|
|
|
+ if (methodname == null) {
|
|
|
+ valueSource = NumericField.getVariable(fieldData, fieldname, variablename);
|
|
|
+ } else {
|
|
|
+ valueSource = NumericField.getMethod(fieldData, fieldname, methodname);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ throw new ParseException("Field [" + fieldname + "] must be numeric, date, or geopoint", 5);
|
|
|
+ }
|
|
|
+ return valueSource;
|
|
|
+ }
|
|
|
+
|
|
|
+ // TODO: document and/or error if params contains _score?
|
|
|
+ // NOTE: by checking for the variable in params first, it allows masking document fields with a global constant,
|
|
|
+ // but if we were to reverse it, we could provide a way to supply dynamic defaults for documents missing the field?
|
|
|
+ private static void bindFromParams(@Nullable final Map<String, Object> params, final SimpleBindings bindings, final String variable) throws ParseException {
|
|
|
+ // NOTE: by checking for the variable in vars first, it allows masking document fields with a global constant,
|
|
|
+ // but if we were to reverse it, we could provide a way to supply dynamic defaults for documents missing the field?
|
|
|
+ Object value = params.get(variable);
|
|
|
+ if (value instanceof Number) {
|
|
|
+ bindings.add(variable, new DoubleConstValueSource(((Number) value).doubleValue()).asDoubleValuesSource());
|
|
|
+ } else {
|
|
|
+ throw new ParseException("Parameter [" + variable + "] must be a numeric type", 0);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|