diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-09-17 11:20:05 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-09-17 11:20:05 +0200 |
commit | 938cae4d9818d713f2897ed3d3eed4c8772a0771 (patch) | |
tree | 3a2bd74cadc584782ef4223f0442240759aab3a2 /indexinglanguage | |
parent | 7c58282a55c5e5d080c5986520054fc8f35a4a30 (diff) |
Non-functional changes only
Diffstat (limited to 'indexinglanguage')
54 files changed, 93 insertions, 100 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java index e1ef6950e2a..662d221d3a6 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java @@ -50,7 +50,7 @@ public final class ScriptParser { }); } - private static interface ParserMethod<T extends Expression> { + private interface ParserMethod<T extends Expression> { T call(IndexingParser parser) throws ParseException; } 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 b4892a20a19..ee2d4e17a74 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 @@ -76,9 +76,9 @@ public final 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())); + DataType input = context.getValueType(); + context.setValueType(evaluate(context.setValueType(input).execute(lhs).getValueType(), + context.setValueType(input).execute(rhs).getValueType())); } private static DataType requiredInputType(Expression lhs, Expression rhs) { 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 c6375002ce1..c056c11a4c0 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 @@ -38,7 +38,7 @@ public final class Base64DecodeExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 7db415fe66b..940b75b4c99 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 @@ -29,7 +29,7 @@ public final class Base64EncodeExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 2998019b3b5..9f8a012770b 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 @@ -40,7 +40,7 @@ public final class CatExpression extends ExpressionList<Expression> { if (val != null) { type = val.getDataType(); } else { - type = ver.setValue(inputType).execute(this).getValue(); + type = ver.setValueType(inputType).execute(this).getValueType(); } types.add(type); } @@ -50,16 +50,16 @@ public final class CatExpression extends ExpressionList<Expression> { @Override protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + DataType input = context.getValueType(); List<DataType> types = new LinkedList<>(); for (Expression exp : this) { - DataType val = context.setValue(input).execute(exp).getValue(); + DataType val = context.setValueType(input).execute(exp).getValueType(); types.add(val); if (val == null) { throw new VerificationException(this, "Attempting to concatenate a null value (" + exp + ")."); } } - context.setValue(resolveOutputType(types)); + context.setValueType(resolveOutputType(types)); } private static DataType resolveInputType(Collection<? extends Expression> list) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java index 4da12bd0361..82e77192618 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java @@ -20,4 +20,5 @@ public abstract class CompositeExpression extends Expression { } return new ScriptExpression(new StatementExpression(exp)).toString(); } + } 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 b60695570db..da43ff2f2a3 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 @@ -101,7 +101,7 @@ public abstract class Expression extends Selectable { } public final DataType verify(DataType val) { - return verify(new VerificationContext().setValue(val)); + return verify(new VerificationContext().setValueType(val)); } public final Document verify(Document doc) { @@ -147,7 +147,7 @@ public abstract class Expression extends Selectable { public final DataType verify(VerificationContext context) { if (inputType != null) { - DataType input = context.getValue(); + DataType input = context.getValueType(); if (input == null) { throw new VerificationException(this, "Expected " + inputType.getName() + " input, got null."); } @@ -162,7 +162,7 @@ public abstract class Expression extends Selectable { doVerify(context); DataType outputType = createdOutputType(); if (outputType != null) { - DataType output = context.getValue(); + DataType output = context.getValueType(); if (output == null) { throw new VerificationException(this, "Expected " + outputType.getName() + " output, got null."); } @@ -174,7 +174,7 @@ public abstract class Expression extends Selectable { output.getName() + "."); } } - return context.getValue(); + return context.getValueType(); } protected abstract void doVerify(VerificationContext context); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java index ca929773a4c..2abed23b0d0 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java @@ -70,4 +70,5 @@ public abstract class ExpressionList<T extends Expression> extends CompositeExpr exp.select(predicate, operation); } } + } 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 ad94f26e64e..34fa42dcbca 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 @@ -70,7 +70,7 @@ public final class FlattenExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 dc3b03f5c7e..84dbe07d418 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 @@ -33,8 +33,8 @@ public final class ForEachExpression extends CompositeExpression { FieldValue next = new MyConverter(context, exp).convert(input); if (next == null) { VerificationContext vctx = new VerificationContext(context); - vctx.setValue(input.getDataType()).execute(this); - next = vctx.getValue().createFieldValue(); + vctx.setValueType(input.getDataType()).execute(this); + next = vctx.getValueType().createFieldValue(); } context.setValue(next); } else if (input instanceof Struct) { @@ -47,25 +47,25 @@ public final class ForEachExpression extends CompositeExpression { @Override protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + DataType input = context.getValueType(); if (input instanceof ArrayDataType || input instanceof WeightedSetDataType) { - context.setValue(((CollectionDataType)input).getNestedType()).execute(exp); + context.setValueType(((CollectionDataType)input).getNestedType()).execute(exp); if (input instanceof ArrayDataType) { - context.setValue(DataType.getArray(context.getValue())); + context.setValueType(DataType.getArray(context.getValueType())); } else { WeightedSetDataType wset = (WeightedSetDataType)input; - context.setValue(DataType.getWeightedSet(context.getValue(), wset.createIfNonExistent(), wset.removeIfZero())); + context.setValueType(DataType.getWeightedSet(context.getValueType(), 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 = context.setValueType(fieldType).execute(exp).getValueType(); if (!fieldType.isAssignableFrom(valueType)) { throw new VerificationException(this, "Expected " + fieldType.getName() + " output, got " + valueType.getName() + "."); } } - context.setValue(input); + context.setValueType(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 3f64e101246..470284d128b 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 @@ -40,7 +40,7 @@ public final class GetFieldExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + DataType input = context.getValueType(); if (!(input instanceof StructuredDataType)) { throw new VerificationException(this, "Expected structured input, got " + input.getName() + "."); } @@ -49,7 +49,7 @@ public final class GetFieldExpression extends Expression { throw new VerificationException(this, "Field '" + fieldName + "' not found in struct type '" + input.getName() + "'"); } - context.setValue(field.getDataType()); + context.setValueType(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 f9ac7469674..980cb4ff869 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 @@ -30,7 +30,7 @@ public final class GetVarExpression extends Expression { if (input == null) { throw new VerificationException(this, "Variable '" + varName + "' not found."); } - context.setValue(input); + context.setValueType(input); } @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 7a6f9c07782..f3bcef6fa3c 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 @@ -40,7 +40,7 @@ public final class HexDecodeExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 e88228c73d9..ebc9deb2b88 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 @@ -21,7 +21,7 @@ public final class HexEncodeExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 2903ab328e8..bb0c28580f0 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.datatypes.StringFieldValue; import static com.yahoo.vespa.defaults.Defaults.getDefaults; @@ -22,7 +21,7 @@ public final class HostNameExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 445c98b3077..a6dfa4dd13e 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.datatypes.FieldValue; import com.yahoo.document.datatypes.NumericFieldValue; import com.yahoo.vespa.objects.ObjectOperation; @@ -97,12 +96,12 @@ public final 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); + DataType input = context.getValueType(); + context.setValueType(input).execute(lhs); + context.setValueType(input).execute(rhs); + context.setValueType(input).execute(ifTrue); + context.setValueType(input).execute(ifFalse); + context.setValueType(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 48220d611c3..2ae43f8c12a 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 @@ -9,7 +9,6 @@ import com.yahoo.vespa.objects.ObjectPredicate; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.atomic.AtomicReference; /** * @author Simon Thoresen Hult @@ -43,7 +42,7 @@ public final class InputExpression extends Expression { if (val == null) { throw new VerificationException(this, "Field '" + fieldName + "' not found."); } - context.setValue(val); + context.setValueType(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 6ad9b18e658..0f7e8122c9d 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 @@ -45,11 +45,11 @@ public final class JoinExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + DataType input = context.getValueType(); if (!(input instanceof ArrayDataType)) { throw new VerificationException(this, "Expected Array input, got " + input.getName() + "."); } - context.setValue(createdOutputType()); + context.setValueType(createdOutputType()); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java index a989f1a57d2..f92bb9f9b7d 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java @@ -25,7 +25,7 @@ public class LiteralBoolExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 06c01d0d584..47d790e0b07 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 @@ -21,7 +21,7 @@ public final class LowerCaseExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(createdOutputType()); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java index 1a3037761c6..d1ca03f99ba 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java @@ -64,7 +64,7 @@ public final class NormalizeExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(createdOutputType()); } @Override 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 8d2d36f1890..2c59adb5e1d 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 @@ -31,7 +31,7 @@ public final class NowExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 93896749cbb..d4e913bb25b 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 @@ -47,7 +47,7 @@ public final class OptimizePredicateExpression extends Expression { checkVariable(context, "arity", DataType.INT, true); checkVariable(context, "lower_bound", DataType.LONG, false); checkVariable(context, "upper_bound", DataType.LONG, false); - context.setValue(DataType.PREDICATE); + context.setValueType(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 b79d55c3cd9..731aa5bf7c3 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; /** * @author Simon Thoresen Hult @@ -29,7 +28,7 @@ public abstract class OutputExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.tryOutputType(this, fieldName, context.getValue()); + context.tryOutputType(this, fieldName, context.getValueType()); } @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 d404a872a87..f97f5ca9ebc 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 @@ -39,7 +39,7 @@ public final class RandomExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 40b84aae653..035de999962 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 @@ -43,11 +43,11 @@ public final class ScriptExpression extends ExpressionList<StatementExpression> @Override protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + DataType input = context.getValueType(); for (Expression exp : this) { - context.setValue(input).execute(exp); + context.setValueType(input).execute(exp); } - context.setValue(input); + context.setValueType(input); } private static DataType resolveInputType(Collection<? extends StatementExpression> list) { 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 78122e25052..c711b92c7c1 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 @@ -3,7 +3,6 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.collections.Pair; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.datatypes.FieldValue; import com.yahoo.vespa.objects.ObjectOperation; import com.yahoo.vespa.objects.ObjectPredicate; @@ -44,15 +43,15 @@ public final class SelectInputExpression extends CompositeExpression { @Override protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + DataType input = context.getValueType(); for (Pair<String, Expression> entry : cases) { DataType val = context.getInputType(this, entry.getFirst()); if (val == null) { throw new VerificationException(this, "Field '" + entry.getFirst() + "' not found."); } - context.setValue(val).execute(entry.getSecond()); + context.setValueType(val).execute(entry.getSecond()); } - context.setValue(input); + context.setValueType(input); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java index 09a92c2c65b..8fc3aa48f6d 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 @@ -31,7 +31,7 @@ public final class SetValueExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(value.getDataType()); + context.setValueType(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 c8acbd8a325..184325c3c7e 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 @@ -26,7 +26,7 @@ public final class SetVarExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - DataType next = context.getValue(); + DataType next = context.getValueType(); DataType prev = context.getVariable(varName); if (prev != null && !prev.equals(next)) { throw new VerificationException(this, "Attempting to assign conflicting types to variable '" + varName + 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 d36a7efcd9d..092f07f8514 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 @@ -39,7 +39,7 @@ public final class SplitExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(createdOutputType()); } @Override 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 8d4debd2005..ce31c6f6408 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 @@ -45,7 +45,7 @@ public final class SubstringExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 2553f469fe2..9a8e8719461 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.datatypes.FieldValue; import com.yahoo.document.datatypes.StringFieldValue; import com.yahoo.text.StringUtilities; @@ -75,7 +74,7 @@ public final class SwitchExpression extends CompositeExpression { @Override protected void doVerify(VerificationContext context) { - DataType input = context.getValue(); + DataType input = context.getValueType(); if (input == null) { throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, got null."); } @@ -84,10 +83,10 @@ public final class SwitchExpression extends CompositeExpression { input.getName() + "."); } for (Expression exp : cases.values()) { - context.setValue(input).execute(exp); + context.setValueType(input).execute(exp); } - context.setValue(input).execute(defaultExp); - context.setValue(input); + context.setValueType(input).execute(defaultExp); + context.setValueType(input); } @Override 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 4e6c522a300..3069fc5906a 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 @@ -29,7 +29,7 @@ public final class ToArrayExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(DataType.getArray(context.getValue())); + context.setValueType(DataType.getArray(context.getValueType())); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java index d6d8ed54d26..da59df1fdd6 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java @@ -2,10 +2,8 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.NumericDataType; import com.yahoo.document.datatypes.BoolFieldValue; import com.yahoo.document.datatypes.FieldValue; -import com.yahoo.document.datatypes.LongFieldValue; import com.yahoo.document.datatypes.NumericFieldValue; import com.yahoo.document.datatypes.StringFieldValue; @@ -33,7 +31,7 @@ public final class ToBoolExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(createdOutputType()); } @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 93b1ce8e928..b43371a5dba 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 @@ -19,7 +19,7 @@ public final class ToByteExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 4246d4382fe..7d55de7b265 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 @@ -19,7 +19,7 @@ public final class ToDoubleExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 0d2c351ba80..b1d6a00a668 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 @@ -19,7 +19,7 @@ public final class ToFloatExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 c4003a4a41e..a63833e0882 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 @@ -19,7 +19,7 @@ public final class ToIntegerExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 729e098c092..0ef775614e5 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 @@ -19,7 +19,7 @@ public final class ToLongExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 37e4c6119a6..a16feec981f 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.PositionDataType; /** @@ -20,7 +19,7 @@ public final class ToPositionExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 ebbb4362126..64ed14618d7 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 @@ -19,7 +19,7 @@ public final class ToStringExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(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 3d7a7ee5c3a..dcc14e715e9 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 @@ -43,7 +43,7 @@ public final class ToWsetExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(DataType.getWeightedSet(context.getValue(), createIfNonExistent, removeIfZero)); + context.setValueType(DataType.getWeightedSet(context.getValueType(), createIfNonExistent, removeIfZero)); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java index 081d14d700f..7db04a2e595 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.datatypes.StringFieldValue; /** @@ -21,7 +20,7 @@ public final class TrimExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(createdOutputType()); } @Override diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java index c4419c4146b..601d751739d 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java @@ -49,11 +49,12 @@ public class VerificationContext implements FieldTypeAdapter, Cloneable { return this; } - public DataType getValue() { + /** Returns the output type that will result from executing the statement verified by this */ + public DataType getValueType() { return value; } - public VerificationContext setValue(DataType value) { + public VerificationContext setValueType(DataType value) { this.value = value; return this; } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java index edfeeecba54..955131e63b0 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 @@ -35,7 +35,7 @@ public final class ZCurveExpression extends Expression { @Override protected void doVerify(VerificationContext context) { - context.setValue(createdOutputType()); + context.setValueType(createdOutputType()); } @Override diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java index 1b9c546fa19..84b2a7ec856 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java @@ -243,6 +243,6 @@ public class CatTestCase { SimpleTestAdapter adapter = new SimpleTestAdapter(new Field("a", typeA), new Field("b", typeB)); VerificationContext ctx = new VerificationContext(adapter); new CatExpression(new InputExpression("a"), new InputExpression("b")).verify(ctx); - return ctx.getValue(); + return ctx.getValueType(); } } diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java index e837b30707d..818827fc53a 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java @@ -18,18 +18,18 @@ class ExpressionAssert { } public static void assertVerify(DataType valueBefore, Expression exp, DataType expectedValueAfter) { - assertVerifyCtx(new VerificationContext().setValue(valueBefore), exp, expectedValueAfter); + assertVerifyCtx(new VerificationContext().setValueType(valueBefore), exp, expectedValueAfter); } public static void assertVerifyThrows(DataType valueBefore, Expression exp, String expectedException) { - assertVerifyCtxThrows(new VerificationContext().setValue(valueBefore), exp, expectedException); + assertVerifyCtxThrows(new VerificationContext().setValueType(valueBefore), exp, expectedException); } interface CreateExpression { Expression create(); } public static void assertVerifyThrows(DataType valueBefore, CreateExpression createExp, String expectedException) { - assertVerifyCtxThrows(new VerificationContext().setValue(valueBefore), createExp, expectedException); + assertVerifyCtxThrows(new VerificationContext().setValueType(valueBefore), createExp, expectedException); } public static void assertVerifyCtxThrows(VerificationContext ctx, CreateExpression createExp, String expectedException) { 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 77567ec339f..e2af6b19704 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 @@ -209,7 +209,7 @@ public class ForEachTestCase { type.addField(new Field("my_int", DataType.INT)); VerificationContext ctx = new VerificationContext(new SimpleTestAdapter()); - ctx.setValue(type); + ctx.setValueType(type); try { new ForEachExpression(new ToArrayExpression()).verify(ctx); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java index 06d74a49ed6..b6ef12dba83 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java @@ -80,7 +80,7 @@ public class OptimizePredicateTestCase { assertVerifyThrows(DataType.INT, exp, "Expected predicate input, got int."); assertVerifyThrows(DataType.PREDICATE, exp, "Variable 'arity' must be set."); - VerificationContext context = new VerificationContext().setValue(DataType.PREDICATE); + VerificationContext context = new VerificationContext().setValueType(DataType.PREDICATE); context.setVariable("arity", DataType.STRING); assertVerifyCtxThrows(context, exp, "Variable 'arity' must have type int."); context.setVariable("arity", DataType.INT); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java index 810863478ec..56da13bb530 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java @@ -32,14 +32,14 @@ class OutputAssert { } public static void assertVerify(FieldTypeAdapter adapter, DataType value, Expression exp) { - assertEquals(value, new VerificationContext(adapter).setValue(value).execute(exp).getValue()); + assertEquals(value, new VerificationContext(adapter).setValueType(value).execute(exp).getValueType()); } public static void assertVerifyThrows(FieldTypeAdapter adapter, DataType value, Expression exp, String expectedException) { try { - new VerificationContext(adapter).setValue(value).execute(exp); + new VerificationContext(adapter).setValueType(value).execute(exp); fail(); } catch (VerificationException e) { assertEquals(expectedException, e.getMessage()); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java index 02644db25f0..2dc271769b6 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java @@ -74,7 +74,7 @@ public class SelectInputTestCase { } private static void assertVerify(FieldTypeAdapter adapter, DataType value, Expression exp) { - assertEquals(value, exp.verify(new VerificationContext(adapter).setValue(value))); + assertEquals(value, exp.verify(new VerificationContext(adapter).setValueType(value))); } private static void assertVerifyThrows(FieldTypeAdapter adapter, Expression exp, String expectedException) { diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java index 85039260cb0..495cdd7d383 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java @@ -39,7 +39,7 @@ public class SetVarTestCase { assertVerifyThrows(null, exp, "Expected any input, got null."); try { - new VerificationContext().setVariable("foo", DataType.INT).setValue(DataType.STRING).execute(exp); + new VerificationContext().setVariable("foo", DataType.INT).setValueType(DataType.STRING).execute(exp); fail(); } catch (VerificationException e) { assertEquals("Attempting to assign conflicting types to variable 'foo', int vs string.", e.getMessage()); @@ -60,11 +60,11 @@ public class SetVarTestCase { @Test public void requireThatVariableTypeCanNotChange() { VerificationContext ctx = new VerificationContext(new SimpleTestAdapter()); - ctx.setValue(DataType.INT); + ctx.setValueType(DataType.INT); new SetVarExpression("out").verify(ctx); try { - ctx.setValue(DataType.STRING); + ctx.setValueType(DataType.STRING); new SetVarExpression("out").verify(ctx); fail(); } catch (VerificationException e) { 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 aebb3a516d5..3ac4594854b 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 @@ -49,7 +49,7 @@ final class SimpleExpression extends Expression { @Override protected void doVerify(VerificationContext context) { if (hasVerifyValue) { - context.setValue(verifyValue); + context.setValueType(verifyValue); } } diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java index eb4aec37770..21580698787 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java @@ -16,8 +16,8 @@ public class VerificationContextTestCase { public void requireThatValueCanBeSet() { VerificationContext ctx = new VerificationContext(); DataType val = DataType.STRING; - ctx.setValue(val); - assertSame(val, ctx.getValue()); + ctx.setValueType(val); + assertSame(val, ctx.getValueType()); } @Test @@ -31,9 +31,9 @@ public class VerificationContextTestCase { @Test public void requireThatClearRemovesValue() { VerificationContext ctx = new VerificationContext(); - ctx.setValue(DataType.STRING); + ctx.setValueType(DataType.STRING); ctx.clear(); - assertNull(ctx.getValue()); + assertNull(ctx.getValueType()); } @Test |