diff options
| -rw-r--r-- | model-evaluation/abi-spec.json | 1 | ||||
| -rw-r--r-- | searchlib/abi-spec.json | 2 | ||||
| -rwxr-xr-x | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java | 19 |
3 files changed, 3 insertions, 19 deletions
diff --git a/model-evaluation/abi-spec.json b/model-evaluation/abi-spec.json index 6728d5cd9b4..4ef00061852 100644 --- a/model-evaluation/abi-spec.json +++ b/model-evaluation/abi-spec.json @@ -85,7 +85,6 @@ "methods": [ "public void <init>(com.yahoo.filedistribution.fileacquirer.FileAcquirer)", "public java.util.Map importFrom(com.yahoo.vespa.config.search.RankProfilesConfig, com.yahoo.vespa.config.search.core.RankingConstantsConfig, com.yahoo.vespa.config.search.core.RankingExpressionsConfig, com.yahoo.vespa.config.search.core.OnnxModelsConfig)", - "public java.util.Map importFrom(com.yahoo.vespa.config.search.RankProfilesConfig, com.yahoo.vespa.config.search.core.RankingConstantsConfig, com.yahoo.vespa.config.search.core.OnnxModelsConfig)", "protected final java.lang.String readExpressionFromFile(java.io.File)", "protected com.yahoo.searchlib.rankingexpression.RankingExpression readExpressionFromFile(java.lang.String, com.yahoo.config.FileReference)", "protected com.yahoo.tensor.Tensor readTensorFromFile(java.lang.String, com.yahoo.tensor.TensorType, com.yahoo.config.FileReference)" diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json index cb1e4f83144..ecfdc6c6cad 100644 --- a/searchlib/abi-spec.json +++ b/searchlib/abi-spec.json @@ -1325,10 +1325,8 @@ ], "methods": [ "public void <init>(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public void <init>(com.yahoo.searchlib.rankingexpression.evaluation.Value, java.lang.String)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value getValue()", "public java.lang.StringBuilder toString(java.lang.StringBuilder, com.yahoo.searchlib.rankingexpression.rule.SerializationContext, java.util.Deque, com.yahoo.searchlib.rankingexpression.rule.CompositeNode)", - "public java.lang.String sourceString()", "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value evaluate(com.yahoo.searchlib.rankingexpression.evaluation.Context)", "public int hashCode()" diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java index a305c9c76af..453a7434469 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java @@ -2,7 +2,6 @@ package com.yahoo.searchlib.rankingexpression.rule; import com.yahoo.searchlib.rankingexpression.Reference; -import com.yahoo.searchlib.rankingexpression.evaluation.BooleanValue; import com.yahoo.searchlib.rankingexpression.evaluation.Context; import com.yahoo.searchlib.rankingexpression.evaluation.Value; import com.yahoo.tensor.TensorType; @@ -20,20 +19,14 @@ public final class ConstantNode extends ExpressionNode { private final Value value; - public ConstantNode(Value value) { - value.freeze(); - this.value = value; - } - /** * Creates a constant value * * @param value the value. Ownership of this value is transferred to this. - * @param sourceImage the source string image producing this value */ - @Deprecated - public ConstantNode(Value value, String sourceImage) { - this(value); + public ConstantNode(Value value) { + value.freeze(); + this.value = value; } public Value getValue() { return value; } @@ -43,12 +36,6 @@ public final class ConstantNode extends ExpressionNode { return string.append(value.toString()); } - /** Returns the string which created this, or the value.toString() if not known */ - @Deprecated - public String sourceString() { - return value.toString(); - } - @Override public TensorType type(TypeContext<Reference> context) { return value.type(); } |