From fd4b4f5bf5169430ce7394b46d7392f391ef1afc Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 12 Jan 2017 11:33:39 +0100 Subject: Tensor type information in tensor document fields --- .../expressions/ArithmeticExpression.java | 8 ++--- .../expressions/Base64DecodeExpression.java | 4 +-- .../expressions/Base64EncodeExpression.java | 4 +-- .../expressions/CatExpression.java | 8 ++--- .../expressions/ClearStateExpression.java | 4 +-- .../expressions/EchoExpression.java | 2 +- .../expressions/ExactExpression.java | 2 +- .../indexinglanguage/expressions/Expression.java | 39 ++++++++++------------ .../expressions/FlattenExpression.java | 4 +-- .../expressions/ForEachExpression.java | 14 ++++---- .../expressions/GetFieldExpression.java | 6 ++-- .../expressions/GetVarExpression.java | 6 ++-- .../expressions/GuardExpression.java | 4 +-- .../expressions/HexDecodeExpression.java | 4 +-- .../expressions/HexEncodeExpression.java | 4 +-- .../expressions/HostNameExpression.java | 4 +-- .../expressions/IfThenExpression.java | 14 ++++---- .../expressions/InputExpression.java | 6 ++-- .../expressions/JoinExpression.java | 6 ++-- .../expressions/LowerCaseExpression.java | 4 +-- .../expressions/NGramExpression.java | 2 +- .../expressions/NowExpression.java | 4 +-- .../expressions/OptimizePredicateExpression.java | 10 +++--- .../expressions/OutputExpression.java | 4 +-- .../expressions/ParenthesisExpression.java | 4 +-- .../expressions/RandomExpression.java | 4 +-- .../expressions/ScriptExpression.java | 8 ++--- .../expressions/SelectInputExpression.java | 10 +++--- .../expressions/SetLanguageExpression.java | 2 +- .../expressions/SetValueExpression.java | 4 +-- .../expressions/SetVarExpression.java | 8 ++--- .../expressions/SplitExpression.java | 4 +-- .../expressions/StatementExpression.java | 4 +-- .../expressions/SubstringExpression.java | 4 +-- .../expressions/SwitchExpression.java | 10 +++--- .../expressions/ThisExpression.java | 2 +- .../expressions/ToArrayExpression.java | 4 +-- .../expressions/ToByteExpression.java | 4 +-- .../expressions/ToDoubleExpression.java | 4 +-- .../expressions/ToFloatExpression.java | 4 +-- .../expressions/ToIntegerExpression.java | 4 +-- .../expressions/ToLongExpression.java | 4 +-- .../expressions/ToPositionExpression.java | 4 +-- .../expressions/ToStringExpression.java | 4 +-- .../expressions/ToWsetExpression.java | 4 +-- .../expressions/TokenizeExpression.java | 2 +- .../expressions/TrimExpression.java | 4 +-- .../expressions/ZCurveExpression.java | 4 +-- .../ExpressionConverterTestCase.java | 2 +- .../expressions/ForEachTestCase.java | 2 +- .../expressions/SimpleExpression.java | 4 +-- 51 files changed, 141 insertions(+), 144 deletions(-) (limited to 'indexinglanguage/src') 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 ce56597cc86..cd783999456 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 ctx) { - DataType input = ctx.getValue(); - ctx.setValue(evaluate(ctx.setValue(input).execute(lhs).getValue(), - ctx.setValue(input).execute(rhs).getValue())); + protected void doVerify(VerificationContext context) { + DataType 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 d40005bcba1..97034185a40 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 b29971449e4..dc86c0480ea 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 fe7771f83ec..79576563504 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 { } @Override - protected void doVerify(VerificationContext ctx) { - DataType input = ctx.getValue(); + protected void doVerify(VerificationContext context) { + DataType input = context.getValue(); List types = new LinkedList<>(); for (Expression exp : this) { - DataType val = ctx.setValue(input).execute(exp).getValue(); + DataType val = context.setValue(input).execute(exp).getValue(); types.add(val); if (val == null) { throw new VerificationException(this, "Attempting to concatenate a null value (" + exp + ")."); } } - ctx.setValue(resolveOutputType(types)); + context.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 7fb4951bfd9..a8af8f7b4fb 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 ctx) { - ctx.clear(); + protected void doVerify(VerificationContext 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 67f0c2faef4..93fbf4339bb 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 ctx) { + protected void doVerify(VerificationContext context) { // 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 be70291cb70..9727cc815cf 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 ctx) { + protected void doVerify(VerificationContext context) { // 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 f94a100b31d..2ed288760e7 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 Simon Thoresen */ 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 upd) { + public static DocumentUpdate execute(Expression expression, AdapterFactory factory, DocumentUpdate update) { DocumentUpdate ret = null; - for (UpdateAdapter adapter : factory.newUpdateAdapterList(upd)) { + for (UpdateAdapter adapter : factory.newUpdateAdapterList(update)) { 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(upd.getCreateIfNonExistent()); + ret.setCreateIfNonExistent(update.getCreateIfNonExistent()); } return ret; } @@ -57,10 +57,10 @@ public abstract class Expression extends Selectable { return execute(new ExecutionContext(adapter)); } - public final FieldValue execute(ExecutionContext ctx) { + public final FieldValue execute(ExecutionContext context) { DataType inputType = requiredInputType(); if (inputType != null) { - FieldValue input = ctx.getValue(); + FieldValue input = context.getValue(); if (input == null) { return null; } @@ -69,16 +69,16 @@ public abstract class Expression extends Selectable { " input, got " + input.getDataType().getName() + "."); } } - doExecute(ctx); + doExecute(context); DataType outputType = createdOutputType(); if (outputType != null) { - FieldValue output = ctx.getValue(); + FieldValue output = context.getValue(); if (output != null && !outputType.isValueCompatible(output)) { throw new IllegalStateException("Expression '" + this + "' expected " + outputType.getName() + " output, got " + output.getDataType().getName() + "."); } } - return ctx.getValue(); + return context.getValue(); } protected abstract void doExecute(ExecutionContext ctx); @@ -132,12 +132,10 @@ public abstract class Expression extends Selectable { return verify(new VerificationContext(adapter)); } - public final DataType verify(VerificationContext ctx) { -// System.err.println("enter_verify(exp = '" + this + "', req = " + requiredInputType(ctx) + -// ", in = " + ctx.getValue() + ")"); + public final DataType verify(VerificationContext context) { DataType inputType = requiredInputType(); if (inputType != null) { - DataType input = ctx.getValue(); + DataType input = context.getValue(); if (input == null) { throw new VerificationException(this, "Expected " + inputType.getName() + " input, got null."); } @@ -149,12 +147,10 @@ public abstract class Expression extends Selectable { input.getName() + "."); } } - doVerify(ctx); + doVerify(context); DataType outputType = createdOutputType(); -// System.err.println("exit_verify(exp = '" + this + "', req = " + createdOutputType(ctx) + -// ", out = " + ctx.getValue() + ")"); if (outputType != null) { - DataType output = ctx.getValue(); + DataType output = context.getValue(); if (output == null) { throw new VerificationException(this, "Expected " + outputType.getName() + " output, got null."); } @@ -166,10 +162,10 @@ public abstract class Expression extends Selectable { output.getName() + "."); } } - return ctx.getValue(); + return context.getValue(); } - protected abstract void doVerify(VerificationContext ctx); + protected abstract void doVerify(VerificationContext context); public abstract DataType requiredInputType(); @@ -203,12 +199,13 @@ 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 upd) { - return expression.execute(expression, new SimpleAdapterFactory(), upd); + public static final DocumentUpdate execute(Expression expression, DocumentUpdate update) { + return expression.execute(expression, new SimpleAdapterFactory(), update); } 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 915092f5e02..a0dc490d4a4 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 a74f02e9a4a..d634309ca9f 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 ctx) { - DataType input = ctx.getValue(); + protected void doVerify(VerificationContext context) { + DataType input = context.getValue(); if (input instanceof ArrayDataType || input instanceof WeightedSetDataType) { - ctx.setValue(((CollectionDataType)input).getNestedType()).execute(exp); + context.setValue(((CollectionDataType)input).getNestedType()).execute(exp); if (input instanceof ArrayDataType) { - ctx.setValue(DataType.getArray(ctx.getValue())); + context.setValue(DataType.getArray(context.getValue())); } else { WeightedSetDataType wset = (WeightedSetDataType)input; - ctx.setValue(DataType.getWeightedSet(ctx.getValue(), wset.createIfNonExistent(), wset.removeIfZero())); + context.setValue(DataType.getWeightedSet(context.getValue(), wset.createIfNonExistent(), wset.removeIfZero())); } } else if (input instanceof StructDataType) { for (Field field : ((StructDataType)input).getFields()) { DataType fieldType = field.getDataType(); - DataType valueType = ctx.setValue(fieldType).execute(exp).getValue(); + DataType valueType = context.setValue(fieldType).execute(exp).getValue(); if (!fieldType.isAssignableFrom(valueType)) { throw new VerificationException(this, "Expected " + fieldType.getName() + " output, got " + valueType.getName() + "."); } } - ctx.setValue(input); + context.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 6cc06953437..80fc5ad04f5 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 ctx) { - DataType input = ctx.getValue(); + protected void doVerify(VerificationContext context) { + DataType input = context.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."); } - ctx.setValue(field.getDataType()); + context.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 34f0139037b..e18143fb2f4 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 ctx) { - DataType input = ctx.getVariable(varName); + protected void doVerify(VerificationContext context) { + DataType input = context.getVariable(varName); if (input == null) { throw new VerificationException(this, "Variable '" + varName + "' not found."); } - ctx.setValue(input); + context.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 b7a49e938b5..db187f0b5d1 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 ctx) { - exp.verify(ctx); + protected void doVerify(VerificationContext context) { + exp.verify(context); } @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 11e58883b27..b582218f958 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 80c7b95308f..18650837ad6 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 30007090b78..b8fdfb0f26a 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 eb7e1c9a005..d81672da371 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 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); + 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); } @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 29957e440a4..618c7787440 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 ctx) { - DataType val = ctx.getInputType(this, fieldName); + protected void doVerify(VerificationContext context) { + DataType val = context.getInputType(this, fieldName); if (val == null) { throw new VerificationException(this, "Field '" + fieldName + "' not found."); } - ctx.setValue(val); + context.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 b440c2e68c8..b73ac949cae 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 ctx) { - DataType input = ctx.getValue(); + protected void doVerify(VerificationContext context) { + DataType input = context.getValue(); if (!(input instanceof ArrayDataType)) { throw new VerificationException(this, "Expected Array input, got " + input.getName() + "."); } - ctx.setValue(createdOutputType()); + context.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 272e2c3a3e5..e64c3a21a31 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 74e2b30a799..441c30dd9d9 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 ctx) { + protected void doVerify(VerificationContext context) { // 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 75fb355580c..ec1ac5ee4ed 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 838fb0b3c3b..b3980cf71ad 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 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); + 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); } 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 063ec3a8955..fdda256eab2 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 ctx) { - ctx.tryOutputType(this, fieldName, ctx.getValue()); + protected void doVerify(VerificationContext context) { + context.tryOutputType(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 57d833a0748..3b1f3bd234d 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 ctx) { - innerExp.verify(ctx); + protected void doVerify(VerificationContext context) { + innerExp.verify(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 8a5cfc1bb88..4aeeafb8ba6 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 79ac7590cac..d536127f123 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 { } @Override - protected void doVerify(VerificationContext ctx) { - DataType input = ctx.getValue(); + protected void doVerify(VerificationContext context) { + DataType 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 8663dcf7a9d..fd079812cfc 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 ctx) { - DataType input = ctx.getValue(); + protected void doVerify(VerificationContext context) { + DataType input = context.getValue(); for (Pair entry : cases) { - DataType val = ctx.getInputType(this, entry.getFirst()); + DataType val = context.getInputType(this, entry.getFirst()); if (val == null) { throw new VerificationException(this, "Field '" + entry.getFirst() + "' not found."); } - ctx.setValue(val).execute(entry.getSecond()); + context.setValue(val).execute(entry.getSecond()); } - 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 35f02ccb05b..59a4d2a42b5 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 ctx) { + protected void doVerify(VerificationContext context) { // 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 edc1fcfa9ee..59091dc06c0 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 ctx) { - ctx.setValue(value.getDataType()); + protected void doVerify(VerificationContext context) { + context.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 d92831fd6b3..61267f32e33 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 ctx) { - DataType next = ctx.getValue(); - DataType prev = ctx.getVariable(varName); + protected void doVerify(VerificationContext context) { + DataType next = context.getValue(); + DataType prev = context.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() + "."); } - ctx.setVariable(varName, next); + context.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 c2cfcd0cd0e..1fea4029c3b 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 012ca87ed37..0595165c5ba 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 { } @Override - protected void doVerify(VerificationContext ctx) { + protected void doVerify(VerificationContext 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 bb4351bee77..fabfc1f742e 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 21f633c3aba..45ec5c45b74 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 ctx) { - DataType input = ctx.getValue(); + protected void doVerify(VerificationContext context) { + DataType input = context.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()) { - ctx.setValue(input).execute(exp); + context.setValue(input).execute(exp); } - ctx.setValue(input).execute(defaultExp); - ctx.setValue(input); + context.setValue(input).execute(defaultExp); + 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 8ad37b98f4c..ffea3f9ac92 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 ctx) { + protected void doVerify(VerificationContext 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 197ed431955..4f072b9c820 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 ctx) { - ctx.setValue(DataType.getArray(ctx.getValue())); + protected void doVerify(VerificationContext context) { + context.setValue(DataType.getArray(context.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 cd01f8251b0..c537fcb5e45 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 fb54aefe696..3cf7a1d14d7 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 ebd866abfa9..1bac0df2020 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 0c900c7756a..b39a3803ba0 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 63b8b446437..efb914fb203 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 2b89e05b7b2..1b2bb923ae1 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 0db289a6b6b..997bd01646b 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 f15bac00031..8dcb5336dc7 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 ctx) { - ctx.setValue(DataType.getWeightedSet(ctx.getValue(), createIfNonExistent, removeIfZero)); + protected void doVerify(VerificationContext context) { + context.setValue(DataType.getWeightedSet(context.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 272fbde342c..1617b715c68 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 ctx) { + protected void doVerify(VerificationContext context) { // 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 d544b9218e4..4b23be7fe91 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 cdf795ea7d5..65e06c970a8 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 ctx) { - ctx.setValue(createdOutputType()); + protected void doVerify(VerificationContext context) { + context.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 cd5f17c3b98..068ebedc4fc 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 ctx) { + protected void doVerify(VerificationContext 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 2bf00c98490..a13cc2125e5 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 ctx) { + protected void doVerify(VerificationContext context) { } 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 11f269b4d01..9f3b431ff75 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 ctx) { + protected void doVerify(VerificationContext context) { if (hasVerifyValue) { - ctx.setValue(verifyValue); + context.setValue(verifyValue); } } -- cgit v1.2.3