diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-16 23:16:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-16 23:16:32 +0100 |
commit | 9efbe90ee02b6b56f1a1208614c20d4b053a3135 (patch) | |
tree | 86dc5fcbd4e2244c7a82c2019a77635d33f7b87a /indexinglanguage | |
parent | 7305314406270fe663b7ef301cd6ad04714dcf9b (diff) |
Revert "Revert "Revert "Bratseth/tensor type info in documents"""
Diffstat (limited to 'indexinglanguage')
51 files changed, 144 insertions, 141 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 cd783999456..ce56597cc86 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 @@ -74,10 +74,10 @@ public class ArithmeticExpression extends CompositeExpression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); - context.setValue(evaluate(context.setValue(input).execute(lhs).getValue(), - context.setValue(input).execute(rhs).getValue())); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); + ctx.setValue(evaluate(ctx.setValue(input).execute(lhs).getValue(), + ctx.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 97034185a40..d40005bcba1 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 @@ -33,8 +33,8 @@ public class Base64DecodeExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 dc86c0480ea..b29971449e4 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 @@ -25,8 +25,8 @@ public class Base64EncodeExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 79576563504..fe7771f83ec 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 @@ -49,17 +49,17 @@ public class CatExpression extends ExpressionList<Expression> { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); List<DataType> types = new LinkedList<>(); for (Expression exp : this) { - DataType val = context.setValue(input).execute(exp).getValue(); + DataType val = ctx.setValue(input).execute(exp).getValue(); types.add(val); if (val == null) { throw new VerificationException(this, "Attempting to concatenate a null value (" + exp + ")."); } } - context.setValue(resolveOutputType(types)); + ctx.setValue(resolveOutputType(types)); } @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 a8af8f7b4fb..7fb4951bfd9 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 @@ -15,8 +15,8 @@ public class ClearStateExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.clear(); + protected void doVerify(VerificationContext ctx) { + ctx.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 93fbf4339bb..67f0c2faef4 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 @@ -31,7 +31,7 @@ public class EchoExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { // empty } 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 9727cc815cf..be70291cb70 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 @@ -39,7 +39,7 @@ public class ExactExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { // empty } 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 2ed288760e7..f94a100b31d 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 @@ -13,7 +13,7 @@ import com.yahoo.vespa.indexinglanguage.parser.ParseException; import com.yahoo.vespa.objects.Selectable; /** - * @author Simon Thoresen + * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public abstract class Expression extends Selectable { @@ -30,9 +30,9 @@ public abstract class Expression extends Selectable { return adapter.getFullOutput(); } - public static DocumentUpdate execute(Expression expression, AdapterFactory factory, DocumentUpdate update) { + public static DocumentUpdate execute(Expression expression, AdapterFactory factory, DocumentUpdate upd) { DocumentUpdate ret = null; - for (UpdateAdapter adapter : factory.newUpdateAdapterList(update)) { + for (UpdateAdapter adapter : factory.newUpdateAdapterList(upd)) { DocumentUpdate output = adapter.getExpression(expression).execute(adapter); if (output == null) { // ignore @@ -43,7 +43,7 @@ public abstract class Expression extends Selectable { } } if (ret != null) { - ret.setCreateIfNonExistent(update.getCreateIfNonExistent()); + ret.setCreateIfNonExistent(upd.getCreateIfNonExistent()); } return ret; } @@ -57,10 +57,10 @@ public abstract class Expression extends Selectable { return execute(new ExecutionContext(adapter)); } - public final FieldValue execute(ExecutionContext context) { + public final FieldValue execute(ExecutionContext ctx) { DataType inputType = requiredInputType(); if (inputType != null) { - FieldValue input = context.getValue(); + FieldValue input = ctx.getValue(); if (input == null) { return null; } @@ -69,16 +69,16 @@ public abstract class Expression extends Selectable { " input, got " + input.getDataType().getName() + "."); } } - doExecute(context); + doExecute(ctx); DataType outputType = createdOutputType(); if (outputType != null) { - FieldValue output = context.getValue(); + FieldValue output = ctx.getValue(); if (output != null && !outputType.isValueCompatible(output)) { throw new IllegalStateException("Expression '" + this + "' expected " + outputType.getName() + " output, got " + output.getDataType().getName() + "."); } } - return context.getValue(); + return ctx.getValue(); } protected abstract void doExecute(ExecutionContext ctx); @@ -132,10 +132,12 @@ public abstract class Expression extends Selectable { return verify(new VerificationContext(adapter)); } - public final DataType verify(VerificationContext context) { + public final DataType verify(VerificationContext ctx) { +// System.err.println("enter_verify(exp = '" + this + "', req = " + requiredInputType(ctx) + +// ", in = " + ctx.getValue() + ")"); DataType inputType = requiredInputType(); if (inputType != null) { - DataType input = context.getValue(); + DataType input = ctx.getValue(); if (input == null) { throw new VerificationException(this, "Expected " + inputType.getName() + " input, got null."); } @@ -147,10 +149,12 @@ public abstract class Expression extends Selectable { input.getName() + "."); } } - doVerify(context); + doVerify(ctx); DataType outputType = createdOutputType(); +// System.err.println("exit_verify(exp = '" + this + "', req = " + createdOutputType(ctx) + +// ", out = " + ctx.getValue() + ")"); if (outputType != null) { - DataType output = context.getValue(); + DataType output = ctx.getValue(); if (output == null) { throw new VerificationException(this, "Expected " + outputType.getName() + " output, got null."); } @@ -162,10 +166,10 @@ public abstract class Expression extends Selectable { output.getName() + "."); } } - return context.getValue(); + return ctx.getValue(); } - protected abstract void doVerify(VerificationContext context); + protected abstract void doVerify(VerificationContext ctx); public abstract DataType requiredInputType(); @@ -199,13 +203,12 @@ public abstract class Expression extends Selectable { } return true; } - // Convenience For testing public static Document execute(Expression expression, Document doc) { return expression.execute(new SimpleAdapterFactory(), doc); } - public static final DocumentUpdate execute(Expression expression, DocumentUpdate update) { - return expression.execute(expression, new SimpleAdapterFactory(), update); + public static final DocumentUpdate execute(Expression expression, DocumentUpdate upd) { + return expression.execute(expression, new SimpleAdapterFactory(), upd); } public final FieldValue execute() { return execute(new ExecutionContext()); 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 a0dc490d4a4..915092f5e02 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 @@ -58,8 +58,8 @@ public class FlattenExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 d634309ca9f..a74f02e9a4a 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 @@ -45,26 +45,26 @@ public class ForEachExpression extends CompositeExpression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); if (input instanceof ArrayDataType || input instanceof WeightedSetDataType) { - context.setValue(((CollectionDataType)input).getNestedType()).execute(exp); + ctx.setValue(((CollectionDataType)input).getNestedType()).execute(exp); if (input instanceof ArrayDataType) { - context.setValue(DataType.getArray(context.getValue())); + ctx.setValue(DataType.getArray(ctx.getValue())); } else { WeightedSetDataType wset = (WeightedSetDataType)input; - context.setValue(DataType.getWeightedSet(context.getValue(), wset.createIfNonExistent(), wset.removeIfZero())); + ctx.setValue(DataType.getWeightedSet(ctx.getValue(), wset.createIfNonExistent(), wset.removeIfZero())); } } else if (input instanceof StructDataType) { for (Field field : ((StructDataType)input).getFields()) { DataType fieldType = field.getDataType(); - DataType valueType = context.setValue(fieldType).execute(exp).getValue(); + DataType valueType = ctx.setValue(fieldType).execute(exp).getValue(); if (!fieldType.isAssignableFrom(valueType)) { throw new VerificationException(this, "Expected " + fieldType.getName() + " output, got " + valueType.getName() + "."); } } - context.setValue(input); + ctx.setValue(input); } else { throw new VerificationException(this, "Expected Array, Struct or WeightedSet input, got " + input.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 80fc5ad04f5..6cc06953437 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 @@ -38,8 +38,8 @@ public class GetFieldExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); if (!(input instanceof StructuredDataType)) { throw new VerificationException(this, "Expected structured input, got " + input.getName() + "."); } @@ -47,7 +47,7 @@ public class GetFieldExpression extends Expression { if (field == null) { throw new VerificationException(this, "Field '" + fieldName + "' not found."); } - context.setValue(field.getDataType()); + ctx.setValue(field.getDataType()); } @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 e18143fb2f4..34f0139037b 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 @@ -25,12 +25,12 @@ public class GetVarExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getVariable(varName); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getVariable(varName); if (input == null) { throw new VerificationException(this, "Variable '" + varName + "' not found."); } - context.setValue(input); + ctx.setValue(input); } @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 db187f0b5d1..b7a49e938b5 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 @@ -35,8 +35,8 @@ public class GuardExpression extends CompositeExpression { } @Override - protected void doVerify(VerificationContext context) { - exp.verify(context); + protected void doVerify(VerificationContext ctx) { + exp.verify(ctx); } @Override 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 b582218f958..11e58883b27 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 @@ -37,8 +37,8 @@ public class HexDecodeExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 18650837ad6..80c7b95308f 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 @@ -18,8 +18,8 @@ public class HexEncodeExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 b8fdfb0f26a..30007090b78 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 @@ -22,8 +22,8 @@ public class HostNameExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 d81672da371..eb7e1c9a005 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 @@ -95,13 +95,13 @@ public class IfThenExpression extends CompositeExpression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); - context.setValue(input).execute(lhs); - context.setValue(input).execute(rhs); - context.setValue(input).execute(ifTrue); - context.setValue(input).execute(ifFalse); - context.setValue(input); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); + ctx.setValue(input).execute(lhs); + ctx.setValue(input).execute(rhs); + ctx.setValue(input).execute(ifTrue); + ctx.setValue(input).execute(ifFalse); + ctx.setValue(input); } @Override 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 618c7787440..29957e440a4 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 @@ -38,12 +38,12 @@ public class InputExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - DataType val = context.getInputType(this, fieldName); + protected void doVerify(VerificationContext ctx) { + DataType val = ctx.getInputType(this, fieldName); if (val == null) { throw new VerificationException(this, "Field '" + fieldName + "' not found."); } - context.setValue(val); + ctx.setValue(val); } @Override 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 b73ac949cae..b440c2e68c8 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 @@ -44,12 +44,12 @@ public class JoinExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); if (!(input instanceof ArrayDataType)) { throw new VerificationException(this, "Expected Array input, got " + input.getName() + "."); } - context.setValue(createdOutputType()); + ctx.setValue(createdOutputType()); } @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 e64c3a21a31..272e2c3a3e5 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 @@ -18,8 +18,8 @@ public class LowerCaseExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 441c30dd9d9..74e2b30a799 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 @@ -73,7 +73,7 @@ public class NGramExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { // empty } 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 ec1ac5ee4ed..75fb355580c 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 @@ -30,8 +30,8 @@ public class NowExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 b3980cf71ad..838fb0b3c3b 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 @@ -42,11 +42,11 @@ public class OptimizePredicateExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - checkVariable(context, "arity", DataType.INT, true); - checkVariable(context, "lower_bound", DataType.LONG, false); - checkVariable(context, "upper_bound", DataType.LONG, false); - context.setValue(DataType.PREDICATE); + protected void doVerify(VerificationContext ctx) { + checkVariable(ctx, "arity", DataType.INT, true); + checkVariable(ctx, "lower_bound", DataType.LONG, false); + checkVariable(ctx, "upper_bound", DataType.LONG, false); + ctx.setValue(DataType.PREDICATE); } private void checkVariable(VerificationContext ctx, String var, DataType type, boolean required) { 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 fdda256eab2..063ec3a8955 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 @@ -27,8 +27,8 @@ public abstract class OutputExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.tryOutputType(this, fieldName, context.getValue()); + protected void doVerify(VerificationContext ctx) { + ctx.tryOutputType(this, fieldName, ctx.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 3b1f3bd234d..57d833a0748 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 @@ -27,8 +27,8 @@ public class ParenthesisExpression extends CompositeExpression { } @Override - protected void doVerify(VerificationContext context) { - innerExp.verify(context); + protected void doVerify(VerificationContext ctx) { + innerExp.verify(ctx); } @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 4aeeafb8ba6..8a5cfc1bb88 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 @@ -38,8 +38,8 @@ public class RandomExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 d536127f123..79ac7590cac 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 @@ -41,12 +41,12 @@ public class ScriptExpression extends ExpressionList<StatementExpression> { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); for (Expression exp : this) { - context.setValue(input).execute(exp); + ctx.setValue(input).execute(exp); } - context.setValue(input); + ctx.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 fd079812cfc..8663dcf7a9d 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 @@ -42,16 +42,16 @@ public class SelectInputExpression extends CompositeExpression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); for (Pair<String, Expression> entry : cases) { - DataType val = context.getInputType(this, entry.getFirst()); + DataType val = ctx.getInputType(this, entry.getFirst()); if (val == null) { throw new VerificationException(this, "Field '" + entry.getFirst() + "' not found."); } - context.setValue(val).execute(entry.getSecond()); + ctx.setValue(val).execute(entry.getSecond()); } - context.setValue(input); + ctx.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 59a4d2a42b5..35f02ccb05b 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 @@ -16,7 +16,7 @@ public class SetLanguageExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { // empty } 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 59091dc06c0..edc1fcfa9ee 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 @@ -30,8 +30,8 @@ public class SetValueExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(value.getDataType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(value.getDataType()); } @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 61267f32e33..d92831fd6b3 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 @@ -25,14 +25,14 @@ public class SetVarExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - DataType next = context.getValue(); - DataType prev = context.getVariable(varName); + protected void doVerify(VerificationContext ctx) { + DataType next = ctx.getValue(); + DataType prev = ctx.getVariable(varName); if (prev != null && !prev.equals(next)) { throw new VerificationException(this, "Attempting to assign conflicting types to variable '" + varName + "', " + prev.getName() + " vs " + next.getName() + "."); } - context.setVariable(varName, next); + ctx.setVariable(varName, next); } @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 1fea4029c3b..c2cfcd0cd0e 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 @@ -38,8 +38,8 @@ public class SplitExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 0595165c5ba..012ca87ed37 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 @@ -35,9 +35,9 @@ public class StatementExpression extends ExpressionList<Expression> { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { for (Expression exp : this) { - context.execute(exp); + ctx.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 fabfc1f742e..bb4351bee77 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 @@ -44,8 +44,8 @@ public class SubstringExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 45ec5c45b74..21f633c3aba 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 @@ -73,8 +73,8 @@ public class SwitchExpression extends CompositeExpression { } @Override - protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + protected void doVerify(VerificationContext ctx) { + DataType input = ctx.getValue(); if (input == null) { throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, got null."); } @@ -83,10 +83,10 @@ public class SwitchExpression extends CompositeExpression { input.getName() + "."); } for (Expression exp : cases.values()) { - context.setValue(input).execute(exp); + ctx.setValue(input).execute(exp); } - context.setValue(input).execute(defaultExp); - context.setValue(input); + ctx.setValue(input).execute(defaultExp); + ctx.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 ffea3f9ac92..8ad37b98f4c 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 @@ -15,7 +15,7 @@ public class ThisExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { // 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 4f072b9c820..197ed431955 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 @@ -26,8 +26,8 @@ public class ToArrayExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(DataType.getArray(context.getValue())); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(DataType.getArray(ctx.getValue())); } @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 c537fcb5e45..cd01f8251b0 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 @@ -16,8 +16,8 @@ public class ToByteExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 3cf7a1d14d7..fb54aefe696 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 @@ -16,8 +16,8 @@ public class ToDoubleExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 1bac0df2020..ebd866abfa9 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 @@ -16,8 +16,8 @@ public class ToFloatExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 b39a3803ba0..0c900c7756a 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 @@ -16,8 +16,8 @@ public class ToIntegerExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 efb914fb203..63b8b446437 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 @@ -16,8 +16,8 @@ public class ToLongExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 1b2bb923ae1..2b89e05b7b2 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 @@ -16,8 +16,8 @@ public class ToPositionExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 997bd01646b..0db289a6b6b 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 @@ -15,8 +15,8 @@ public class ToStringExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @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 8dcb5336dc7..f15bac00031 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 @@ -42,8 +42,8 @@ public class ToWsetExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(DataType.getWeightedSet(context.getValue(), createIfNonExistent, removeIfZero)); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(DataType.getWeightedSet(ctx.getValue(), createIfNonExistent, removeIfZero)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java index 1617b715c68..272fbde342c 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java @@ -46,7 +46,7 @@ public class TokenizeExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { // empty } 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 4b23be7fe91..d544b9218e4 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 @@ -16,8 +16,8 @@ public class TrimExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @Override 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 65e06c970a8..cdf795ea7d5 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 @@ -32,8 +32,8 @@ public class ZCurveExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + protected void doVerify(VerificationContext ctx) { + ctx.setValue(createdOutputType()); } @Override 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 068ebedc4fc..cd5f17c3b98 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionConverterTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionConverterTestCase.java @@ -264,7 +264,7 @@ public class ExpressionConverterTestCase { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { } 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 a13cc2125e5..2bf00c98490 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 @@ -237,7 +237,7 @@ public class ForEachTestCase { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { } 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 9f3b431ff75..11f269b4d01 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 @@ -47,9 +47,9 @@ class SimpleExpression extends Expression { } @Override - protected void doVerify(VerificationContext context) { + protected void doVerify(VerificationContext ctx) { if (hasVerifyValue) { - context.setValue(verifyValue); + ctx.setValue(verifyValue); } } |