diff options
Diffstat (limited to 'indexinglanguage')
53 files changed, 162 insertions, 152 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java index 68b9e79e092..b4892a20a19 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java @@ -68,10 +68,10 @@ public final class ArithmeticExpression extends CompositeExpression { } @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); - ctx.setValue(evaluate(ctx.setValue(input).execute(lhs).getValue(), - ctx.setValue(input).execute(rhs).getValue())); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); + context.setValue(evaluate(context.setValue(input).execute(lhs).getValue(), + context.setValue(input).execute(rhs).getValue())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java index 463c009e0a3..c6375002ce1 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java @@ -16,10 +16,10 @@ public final class Base64DecodeExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - String input = String.valueOf(ctx.getValue()); + protected void doExecute(ExecutionContext context) { + String input = String.valueOf(context.getValue()); if (input.isEmpty()) { - ctx.setValue(new LongFieldValue(Long.MIN_VALUE)); + context.setValue(new LongFieldValue(Long.MIN_VALUE)); return; } if (input.length() > 12) { @@ -33,7 +33,7 @@ public final class Base64DecodeExpression extends Expression { for (int i = decoded.length; --i >= 0;) { output = (output << 8) + (((int)decoded[i]) & 0xff); } - ctx.setValue(new LongFieldValue(output)); + context.setValue(new LongFieldValue(output)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java index e61ac7051c1..7db415fe66b 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java @@ -16,15 +16,15 @@ public final class Base64EncodeExpression extends Expression { super(DataType.LONG); } @Override - protected void doExecute(ExecutionContext ctx) { - long input = ((LongFieldValue)ctx.getValue()).getLong(); + protected void doExecute(ExecutionContext context) { + long input = ((LongFieldValue) context.getValue()).getLong(); byte[] output = new byte[8]; for (int i = 0; i < output.length; ++i) { output[i] = (byte)(input & 0xffL); input >>>= 8; } String encoded = Base64.getEncoder().encodeToString(output); - ctx.setValue(new StringFieldValue(encoded)); + context.setValue(new StringFieldValue(encoded)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java index f395446cb10..2998019b3b5 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java @@ -26,14 +26,14 @@ public final class CatExpression extends ExpressionList<Expression> { } @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); DataType inputType = input != null ? input.getDataType() : null; - VerificationContext ver = new VerificationContext(ctx); + VerificationContext ver = new VerificationContext(context); List<FieldValue> values = new LinkedList<>(); List<DataType> types = new LinkedList<>(); for (Expression exp : this) { - FieldValue val = ctx.setValue(input).execute(exp).getValue(); + FieldValue val = context.setValue(input).execute(exp).getValue(); values.add(val); DataType type; @@ -45,7 +45,7 @@ public final class CatExpression extends ExpressionList<Expression> { types.add(type); } DataType type = resolveOutputType(types); - ctx.setValue(type == DataType.STRING ? asString(values) : asCollection(type, values)); + context.setValue(type == DataType.STRING ? asString(values) : asCollection(type, values)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java index 68aff396c54..02abd13f5db 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java @@ -13,8 +13,8 @@ public final class ClearStateExpression extends Expression { super(null); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.clear(); + protected void doExecute(ExecutionContext context) { + context.clear(); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java index 8d5504b2b1c..b0c2a52b027 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java @@ -26,8 +26,8 @@ public final class EchoExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - out.println(String.valueOf(ctx.getValue())); + protected void doExecute(ExecutionContext context) { + out.println(String.valueOf(context.getValue())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java index 31633cdc88b..06f2d66f3fb 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java @@ -25,12 +25,12 @@ public final class ExactExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - StringFieldValue input = (StringFieldValue)ctx.getValue(); + protected void doExecute(ExecutionContext context) { + StringFieldValue input = (StringFieldValue) context.getValue(); if (input.getString().isEmpty()) return; StringFieldValue output = input.clone(); - ctx.setValue(output); + context.setValue(output); String prev = output.getString(); String next = toLowerCase(prev); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java index b23fe4d0ebd..b60695570db 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java @@ -19,6 +19,13 @@ public abstract class Expression extends Selectable { private final DataType inputType; + /** + * Creates an expression + * + * @param inputType the type of the input this expression can work with. + * UnresolvedDataType.INSTANCE if it works with any type, + * and null if it does not consume any input. + */ protected Expression(DataType inputType) { this.inputType = inputType; } @@ -87,7 +94,7 @@ public abstract class Expression extends Selectable { return context.getValue(); } - protected abstract void doExecute(ExecutionContext ctx); + protected abstract void doExecute(ExecutionContext context); public final DataType verify() { return verify(new VerificationContext()); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java index 1e8c9e430ab..a24501823af 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java @@ -8,7 +8,8 @@ import com.yahoo.document.DataType; */ public interface FieldTypeAdapter { - public DataType getInputType(Expression exp, String fieldName); + DataType getInputType(Expression exp, String fieldName); + + void tryOutputType(Expression exp, String fieldName, DataType valueType); - public void tryOutputType(Expression exp, String fieldName, DataType valueType); } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java index db3cabf8b4c..036e421e6d7 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java @@ -9,8 +9,9 @@ import com.yahoo.document.datatypes.FieldValue; */ public interface FieldValueAdapter extends FieldTypeAdapter { - public FieldValue getInputValue(String fieldName); - public FieldValue getInputValue(FieldPath fieldPath); + FieldValue getInputValue(String fieldName); + FieldValue getInputValue(FieldPath fieldPath); + + FieldValueAdapter setOutputValue(Expression exp, String fieldName, FieldValue fieldValue); - public FieldValueAdapter setOutputValue(Expression exp, String fieldName, FieldValue fieldValue); } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java index 91f46381def..ad94f26e64e 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java @@ -26,8 +26,8 @@ public final class FlattenExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - StringFieldValue input = (StringFieldValue)ctx.getValue(); + protected void doExecute(ExecutionContext context) { + StringFieldValue input = (StringFieldValue) context.getValue(); SpanTree tree = input.getSpanTree(SpanTrees.LINGUISTICS); Map<Integer, List<String>> map = new HashMap<>(); for (Annotation anno : tree) { @@ -65,7 +65,7 @@ public final class FlattenExpression extends Expression { output.append(inputVal.charAt(i)); } } - ctx.setValue(new StringFieldValue(output.toString())); + context.setValue(new StringFieldValue(output.toString())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java index 4dc2fdd0343..dc3b03f5c7e 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java @@ -27,18 +27,18 @@ public final class ForEachExpression extends CompositeExpression { } @Override - protected void doExecute(final ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(final ExecutionContext context) { + FieldValue input = context.getValue(); if (input instanceof Array || input instanceof WeightedSet) { - FieldValue next = new MyConverter(ctx, exp).convert(input); + FieldValue next = new MyConverter(context, exp).convert(input); if (next == null) { - VerificationContext vctx = new VerificationContext(ctx); + VerificationContext vctx = new VerificationContext(context); vctx.setValue(input.getDataType()).execute(this); next = vctx.getValue().createFieldValue(); } - ctx.setValue(next); + context.setValue(next); } else if (input instanceof Struct) { - ctx.setValue(new MyConverter(ctx, exp).convert(input)); + context.setValue(new MyConverter(context, exp).convert(input)); } else { throw new IllegalArgumentException("Expected Array, Struct or WeightedSet input, got " + input.getDataType().getName() + "."); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java index 35bdbce1fd2..3f64e101246 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java @@ -24,8 +24,8 @@ public final class GetFieldExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); if (!(input instanceof StructuredFieldValue)) { throw new IllegalArgumentException("Expected structured input, got " + input.getDataType().getName() + "."); } @@ -35,7 +35,7 @@ public final class GetFieldExpression extends Expression { throw new IllegalArgumentException("Field '" + fieldName + "' not found in struct type '" + struct.getDataType().getName() + "'"); } - ctx.setValue(struct.getFieldValue(field)); + context.setValue(struct.getFieldValue(field)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java index 50b502049dc..f9ac7469674 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java @@ -20,8 +20,8 @@ public final class GetVarExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(ctx.getVariable(varName)); + protected void doExecute(ExecutionContext context) { + context.setValue(context.getVariable(varName)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java index 3973dd8b317..179f202788c 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java @@ -27,11 +27,11 @@ public final class GuardExpression extends CompositeExpression { } @Override - protected void doExecute(ExecutionContext ctx) { - if (!shouldExecute && ctx.getAdapter() instanceof UpdateAdapter) { - ctx.setValue(null); + protected void doExecute(ExecutionContext context) { + if (!shouldExecute && context.getAdapter() instanceof UpdateAdapter) { + context.setValue(null); } else { - exp.execute(ctx); + exp.execute(context); } } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java index c97771943b7..7a6f9c07782 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java @@ -17,10 +17,10 @@ public final class HexDecodeExpression extends Expression { super(DataType.STRING); } @Override - protected void doExecute(ExecutionContext ctx) { - String input = String.valueOf(ctx.getValue()); + protected void doExecute(ExecutionContext context) { + String input = String.valueOf(context.getValue()); if (input.isEmpty()) { - ctx.setValue(new LongFieldValue(Long.MIN_VALUE)); + context.setValue(new LongFieldValue(Long.MIN_VALUE)); return; } BigInteger output; @@ -35,7 +35,7 @@ public final class HexDecodeExpression extends Expression { if (output.compareTo(BigInteger.ZERO) == 1 && output.bitLength() == 64) { output = output.subtract(ULONG_MAX); // flip to negative } - ctx.setValue(new LongFieldValue(output.longValue())); + context.setValue(new LongFieldValue(output.longValue())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java index cf91115caad..e88228c73d9 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java @@ -14,9 +14,9 @@ public final class HexEncodeExpression extends Expression { super(DataType.LONG); } @Override - protected void doExecute(ExecutionContext ctx) { - long input = ((LongFieldValue)ctx.getValue()).getLong(); - ctx.setValue(new StringFieldValue(Long.toHexString(input))); + protected void doExecute(ExecutionContext context) { + long input = ((LongFieldValue) context.getValue()).getLong(); + context.setValue(new StringFieldValue(Long.toHexString(input))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java index 0c614c7368d..2903ab328e8 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java @@ -16,8 +16,8 @@ public final class HostNameExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new StringFieldValue(normalizeHostName(getDefaults().vespaHostname()))); + protected void doExecute(ExecutionContext context) { + context.setValue(new StringFieldValue(normalizeHostName(getDefaults().vespaHostname()))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java index 9e7f60aa3e3..445c98b3077 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java @@ -75,23 +75,23 @@ public final class IfThenExpression extends CompositeExpression { } @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); - FieldValue lhsVal = ctx.setValue(input).execute(lhs).getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); + FieldValue lhsVal = context.setValue(input).execute(lhs).getValue(); if (lhsVal == null) { - ctx.setValue(null); + context.setValue(null); return; } - FieldValue rhsVal = ctx.setValue(input).execute(rhs).getValue(); + FieldValue rhsVal = context.setValue(input).execute(rhs).getValue(); if (rhsVal == null) { - ctx.setValue(null); + context.setValue(null); return; } - ctx.setValue(input); + context.setValue(input); if (isTrue(lhsVal, cmp, rhsVal)) { - ifTrue.execute(ctx); + ifTrue.execute(context); } else if (ifFalse != null) { - ifFalse.execute(ctx); + ifFalse.execute(context); } } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java index d707a50fbd8..48220d611c3 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java @@ -29,11 +29,11 @@ public final class InputExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { + protected void doExecute(ExecutionContext context) { if (fieldPath != null) { - ctx.setValue(ctx.getInputValue(fieldPath)); + context.setValue(context.getInputValue(fieldPath)); } else { - ctx.setValue(ctx.getInputValue(fieldName)); + context.setValue(context.getInputValue(fieldName)); } } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java index 5cff622f033..6ad9b18e658 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java @@ -28,8 +28,8 @@ public final class JoinExpression extends Expression { @SuppressWarnings({ "unchecked" }) @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); if (!(input instanceof Array)) { throw new IllegalArgumentException("Expected Array input, got " + input.getDataType().getName() + "."); } @@ -40,7 +40,7 @@ public final class JoinExpression extends Expression { output.append(delimiter); } } - ctx.setValue(new StringFieldValue(output.toString())); + context.setValue(new StringFieldValue(output.toString())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java index 106045591e2..06c01d0d584 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java @@ -15,8 +15,8 @@ public final class LowerCaseExpression extends Expression { super(DataType.STRING); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new StringFieldValue(toLowerCase(String.valueOf(ctx.getValue())))); + protected void doExecute(ExecutionContext context) { + context.setValue(new StringFieldValue(toLowerCase(String.valueOf(context.getValue())))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java index 0aa4e4eb772..3ff218f1fc4 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java @@ -16,7 +16,7 @@ import com.yahoo.vespa.indexinglanguage.linguistics.LinguisticsAnnotator; import java.util.Iterator; /** - * A filter which splits incoming text into n-grams + * A filter which splits incoming text into n-grams. * * @author bratseth */ @@ -28,7 +28,7 @@ public final class NGramExpression extends Expression { /** * Creates an executable ngram expression * - * @param linguistics the gram splitter to use, or null if this is used for representation and will not be executed + * @param linguistics the gram splitter to use, or null if this is used for representation and will not be executed * @param gramSize the gram size */ public NGramExpression(Linguistics linguistics, int gramSize) { @@ -46,14 +46,14 @@ public final class NGramExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - StringFieldValue input = (StringFieldValue)ctx.getValue(); + protected void doExecute(ExecutionContext context) { + StringFieldValue input = (StringFieldValue) context.getValue(); if (input.getSpanTree(SpanTrees.LINGUISTICS) != null) { // This expression is already executed for this input instance return; } StringFieldValue output = input.clone(); - ctx.setValue(output); + context.setValue(output); SpanList spanList = output.setSpanTree(new SpanTree(SpanTrees.LINGUISTICS)).spanList(); int lastPosition = 0; diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java index c8df0c0d667..8d2d36f1890 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java @@ -25,8 +25,8 @@ public final class NowExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new LongFieldValue(timer.currentTimeSeconds())); + protected void doExecute(ExecutionContext context) { + context.setValue(new LongFieldValue(timer.currentTimeSeconds())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java index 8ba129b92c1..93896749cbb 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java @@ -30,16 +30,16 @@ public final class OptimizePredicateExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - PredicateFieldValue predicate = ((PredicateFieldValue)ctx.getValue()).clone(); - IntegerFieldValue arity = (IntegerFieldValue)ctx.getVariable("arity"); - LongFieldValue lower_bound = (LongFieldValue)ctx.getVariable("lower_bound"); - LongFieldValue upper_bound = (LongFieldValue)ctx.getVariable("upper_bound"); + protected void doExecute(ExecutionContext context) { + PredicateFieldValue predicate = ((PredicateFieldValue) context.getValue()).clone(); + IntegerFieldValue arity = (IntegerFieldValue) context.getVariable("arity"); + LongFieldValue lower_bound = (LongFieldValue) context.getVariable("lower_bound"); + LongFieldValue upper_bound = (LongFieldValue) context.getVariable("upper_bound"); Long lower = lower_bound != null? lower_bound.getLong() : null; Long upper = upper_bound != null? upper_bound.getLong() : null; PredicateOptions options = new PredicateOptions(arity.getInteger(), lower, upper); predicate.setPredicate(optimizer.process(predicate.getPredicate(), options)); - ctx.setValue(predicate); + context.setValue(predicate); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java index 2e39c45203d..b79d55c3cd9 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java @@ -23,8 +23,8 @@ public abstract class OutputExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setOutputValue(this, fieldName, ctx.getValue()); + protected void doExecute(ExecutionContext context) { + context.setOutputValue(this, fieldName, context.getValue()); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java index 70c9463eb85..8f7e6bc7040 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java @@ -23,8 +23,8 @@ public class ParenthesisExpression extends CompositeExpression { } @Override - protected void doExecute(ExecutionContext ctx) { - innerExp.execute(ctx); + protected void doExecute(ExecutionContext context) { + innerExp.execute(context); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java index a00714798cf..d404a872a87 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java @@ -27,14 +27,14 @@ public final class RandomExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { + protected void doExecute(ExecutionContext context) { int max; if (this.max != null) { max = this.max; } else { - max = Integer.parseInt(String.valueOf(ctx.getValue())); + max = Integer.parseInt(String.valueOf(context.getValue())); } - ctx.setValue(new IntegerFieldValue(ThreadLocalRandom.current().nextInt(max))); + context.setValue(new IntegerFieldValue(ThreadLocalRandom.current().nextInt(max))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java index 320c47103aa..40b84aae653 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java @@ -33,12 +33,12 @@ public final class ScriptExpression extends ExpressionList<StatementExpression> } @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); for (Expression exp : this) { - ctx.setValue(input).execute(exp); + context.setValue(input).execute(exp); } - ctx.setValue(input); + context.setValue(input); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java index b511410dd10..78122e25052 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java @@ -30,16 +30,16 @@ public final class SelectInputExpression extends CompositeExpression { } @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); for (Pair<String, Expression> entry : cases) { - FieldValue val = ctx.getInputValue(entry.getFirst()); + FieldValue val = context.getInputValue(entry.getFirst()); if (val != null) { - ctx.setValue(val).execute(entry.getSecond()); + context.setValue(val).execute(entry.getSecond()); break; } } - ctx.setValue(input); + context.setValue(input); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java index 8ec766cd1e1..f8e2462b41d 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java @@ -15,8 +15,8 @@ public final class SetLanguageExpression extends Expression { super(DataType.STRING); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setLanguage(Language.fromLanguageTag(String.valueOf(ctx.getValue()))); + protected void doExecute(ExecutionContext context) { + context.setLanguage(Language.fromLanguageTag(String.valueOf(context.getValue()))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java index f013e22ebc3..09a92c2c65b 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java @@ -25,8 +25,8 @@ public final class SetValueExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(value); + protected void doExecute(ExecutionContext context) { + context.setValue(value); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java index f15982796ce..c8acbd8a325 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java @@ -20,8 +20,8 @@ public final class SetVarExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setVariable(varName, ctx.getValue()); + protected void doExecute(ExecutionContext context) { + context.setVariable(varName, context.getValue()); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java index b436775b151..d36a7efcd9d 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java @@ -25,8 +25,8 @@ public final class SplitExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - String input = String.valueOf(ctx.getValue()); + protected void doExecute(ExecutionContext context) { + String input = String.valueOf(context.getValue()); Array<StringFieldValue> output = new Array<>(DataType.getArray(DataType.STRING)); if (!input.isEmpty()) { String[] splits = splitPattern.split(input); @@ -34,7 +34,7 @@ public final class SplitExpression extends Expression { output.add(new StringFieldValue(split)); } } - ctx.setValue(output); + context.setValue(output); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java index cf1e808946d..599ab6cb755 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java @@ -33,9 +33,9 @@ public final class StatementExpression extends ExpressionList<Expression> { } @Override - protected void doExecute(ExecutionContext ctx) { + protected void doExecute(ExecutionContext context) { for (Expression exp : this) { - ctx.execute(exp); + context.execute(exp); } } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java index 4b30d646d53..8d4debd2005 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java @@ -30,8 +30,8 @@ public final class SubstringExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - String input = String.valueOf(ctx.getValue()); + protected void doExecute(ExecutionContext context) { + String input = String.valueOf(context.getValue()); int len = input.length(); if (from >= len) { input = ""; @@ -40,7 +40,7 @@ public final class SubstringExpression extends Expression { } else { input = input.substring(from, to); } - ctx.setValue(new StringFieldValue(input)); + context.setValue(new StringFieldValue(input)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java index 72dec19ef4e..2553f469fe2 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java @@ -46,8 +46,8 @@ public final class SwitchExpression extends CompositeExpression { } @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); Expression exp = null; if (input != null) { if (!(input instanceof StringFieldValue)) { @@ -60,9 +60,9 @@ public final class SwitchExpression extends CompositeExpression { exp = defaultExp; } if (exp != null) { - exp.execute(ctx); + exp.execute(context); } - ctx.setValue(input); + context.setValue(input); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java index 04ce7d2be39..8fc582a01af 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java @@ -13,7 +13,7 @@ public final class ThisExpression extends Expression { super(UnresolvedDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { + protected void doExecute(ExecutionContext context) { // empty } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java index cad3f1f9c04..4e6c522a300 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java @@ -16,15 +16,15 @@ public final class ToArrayExpression extends Expression { } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); DataType inputType = input.getDataType(); ArrayDataType outputType = DataType.getArray(inputType); Array output = outputType.createFieldValue(); output.add(input); - ctx.setValue(output); + context.setValue(output); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java index 5348493a8fd..93b1ce8e928 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java @@ -13,8 +13,8 @@ public final class ToByteExpression extends Expression { super(UnresolvedDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new ByteFieldValue(Byte.valueOf(String.valueOf(ctx.getValue())))); + protected void doExecute(ExecutionContext context) { + context.setValue(new ByteFieldValue(Byte.valueOf(String.valueOf(context.getValue())))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java index c9a04693a25..4246d4382fe 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java @@ -13,8 +13,8 @@ public final class ToDoubleExpression extends Expression { super(UnresolvedDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new DoubleFieldValue(Double.valueOf(String.valueOf(ctx.getValue())))); + protected void doExecute(ExecutionContext context) { + context.setValue(new DoubleFieldValue(Double.valueOf(String.valueOf(context.getValue())))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java index b255702ada3..0d2c351ba80 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java @@ -13,8 +13,8 @@ public final class ToFloatExpression extends Expression { super(UnresolvedDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new FloatFieldValue(Float.valueOf(String.valueOf(ctx.getValue())))); + protected void doExecute(ExecutionContext context) { + context.setValue(new FloatFieldValue(Float.valueOf(String.valueOf(context.getValue())))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java index 7efc25d8400..c4003a4a41e 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java @@ -13,8 +13,8 @@ public final class ToIntegerExpression extends Expression { super(UnresolvedDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new IntegerFieldValue(Integer.valueOf(String.valueOf(ctx.getValue())))); + protected void doExecute(ExecutionContext context) { + context.setValue(new IntegerFieldValue(Integer.valueOf(String.valueOf(context.getValue())))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java index 74d43fc1693..729e098c092 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java @@ -13,8 +13,8 @@ public final class ToLongExpression extends Expression { super(UnresolvedDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new LongFieldValue(Long.valueOf(String.valueOf(ctx.getValue())))); + protected void doExecute(ExecutionContext context) { + context.setValue(new LongFieldValue(Long.valueOf(String.valueOf(context.getValue())))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java index 4c7cd348fbb..37e4c6119a6 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java @@ -14,8 +14,8 @@ public final class ToPositionExpression extends Expression { super(DataType.STRING); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(PositionDataType.fromString(String.valueOf(ctx.getValue()))); + protected void doExecute(ExecutionContext context) { + context.setValue(PositionDataType.fromString(String.valueOf(context.getValue()))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java index 36f896a0b7f..ebbb4362126 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java @@ -13,8 +13,8 @@ public final class ToStringExpression extends Expression { super(UnresolvedDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new StringFieldValue(String.valueOf(ctx.getValue()))); + protected void doExecute(ExecutionContext context) { + context.setValue(new StringFieldValue(String.valueOf(context.getValue()))); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java index 8d511d442df..3d7a7ee5c3a 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java @@ -30,15 +30,15 @@ public final class ToWsetExpression extends Expression { @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - protected void doExecute(ExecutionContext ctx) { - FieldValue input = ctx.getValue(); + protected void doExecute(ExecutionContext context) { + FieldValue input = context.getValue(); DataType inputType = input.getDataType(); WeightedSetDataType outputType = DataType.getWeightedSet(inputType, createIfNonExistent, removeIfZero); WeightedSet output = outputType.createFieldValue(); output.add(input); - ctx.setValue(output); + context.setValue(output); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java index 8dcf360a6ee..081d14d700f 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java @@ -15,8 +15,8 @@ public final class TrimExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { - ctx.setValue(new StringFieldValue(String.valueOf(ctx.getValue()).trim())); + protected void doExecute(ExecutionContext context) { + context.setValue(new StringFieldValue(String.valueOf(context.getValue()).trim())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java index 38b8b82f9e9..c4419c4146b 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java @@ -63,5 +63,6 @@ public class VerificationContext implements FieldTypeAdapter, Cloneable { value = null; return this; } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java index ed56cdfb604..edfeeecba54 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java @@ -17,14 +17,14 @@ public final class ZCurveExpression extends Expression { super(PositionDataType.INSTANCE); } @Override - protected void doExecute(ExecutionContext ctx) { - Struct input = ((Struct)ctx.getValue()); + protected void doExecute(ExecutionContext context) { + Struct input = ((Struct) context.getValue()); Integer x = getFieldValue(input, PositionDataType.FIELD_X); Integer y = getFieldValue(input, PositionDataType.FIELD_Y); if (x != null && y != null) { - ctx.setValue(new LongFieldValue(ZCurve.encode(x, y))); + context.setValue(new LongFieldValue(ZCurve.encode(x, y))); } else { - ctx.setValue(DataType.LONG.createFieldValue()); + context.setValue(DataType.LONG.createFieldValue()); } } diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionConverterTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionConverterTestCase.java index 5c86d0fe836..644da80191d 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionConverterTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionConverterTestCase.java @@ -260,7 +260,7 @@ public class ExpressionConverterTestCase { super(null); } @Override - protected void doExecute(ExecutionContext ctx) { + protected void doExecute(ExecutionContext context) { } diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java index b7b4a5cce1a..77567ec339f 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java @@ -246,8 +246,8 @@ public class ForEachTestCase { super(null); } @Override - protected void doExecute(ExecutionContext ctx) { - lst.add(ctx.getValue()); + protected void doExecute(ExecutionContext context) { + lst.add(context.getValue()); } @Override diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java index 462189384c6..aebb3a516d5 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java @@ -40,9 +40,9 @@ final class SimpleExpression extends Expression { } @Override - protected void doExecute(ExecutionContext ctx) { + protected void doExecute(ExecutionContext context) { if (hasExecuteValue) { - ctx.setValue(executeValue); + context.setValue(executeValue); } } |