diff options
Diffstat (limited to 'searchlib/src/main/java')
4 files changed, 3 insertions, 78 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java index a9e2bc73d6a..c13bde4b633 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java @@ -209,7 +209,7 @@ public class Grouping extends Identifiable { * * @param level The level to add. * @return This, to allow chaining. - * @throws NullPointerException If <tt>level</tt> argument is null. + * @throws NullPointerException If <code>level</code> argument is null. */ public Grouping addLevel(GroupingLevel level) { level.getClass(); // throws NullPointerException @@ -231,7 +231,7 @@ public class Grouping extends Identifiable { * * @param root The group to set as root. * @return This, to allow chaining. - * @throws NullPointerException If <tt>root</tt> argument is null. + * @throws NullPointerException If <code>root</code> argument is null. */ public Grouping setRoot(Group root) { root.getClass(); // throws NullPointerException @@ -249,7 +249,7 @@ public class Grouping extends Identifiable { } /** - * <p>Sets whether or not grouping should be forced to execute in a single pass. If false, this <tt>Grouping</tt> + * <p>Sets whether or not grouping should be forced to execute in a single pass. If false, this <code>Grouping</code> * might still execute in a single pass due to other constraints.</p> * * @param forceSinglePass True to force execution in single pass. diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java index 1144b01f638..ca53c6133be 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java @@ -37,7 +37,6 @@ public class ForceLoad { "BitFunctionNode", "FixedWidthBucketFunctionNode", "RangeBucketPreDefFunctionNode", - "GetYMUMChecksumFunctionNode", "DocumentFieldNode", "NullResultNode", "FunctionNode", diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java deleted file mode 100644 index 9fb47d0401c..00000000000 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchlib.expression; - -import com.yahoo.vespa.objects.Deserializer; -import com.yahoo.vespa.objects.ObjectVisitor; -import com.yahoo.vespa.objects.Serializer; - -/** - * This node is a request to retrieve the YMUM checksum of a document. - * - * @author baldersheim - * @author Simon Thoresen Hult - */ -public class GetYMUMChecksumFunctionNode extends DocumentAccessorNode { - - public static final int classId = registerClass(0x4000 + 74, GetYMUMChecksumFunctionNode.class); - private IntegerResultNode result = new IntegerResultNode(0); - - @Override - public ResultNode getResult() { - return result; - } - - @Override - protected int onGetClassId() { - return classId; - } - - @Override - protected void onSerialize(Serializer buf) { - super.onSerialize(buf); - result.serialize(buf); - } - - @Override - protected void onDeserialize(Deserializer buf) { - super.onDeserialize(buf); - result.deserialize(buf); - } - - @Override - public GetYMUMChecksumFunctionNode clone() { - GetYMUMChecksumFunctionNode obj = (GetYMUMChecksumFunctionNode)super.clone(); - if (result != null) { - obj.result = (IntegerResultNode)result.clone(); - } - return obj; - } - - @Override - public void visitMembers(ObjectVisitor visitor) { - super.visitMembers(visitor); - visitor.visit("result", result); - } - - @Override - protected boolean equalsExpression(ExpressionNode obj) { - return equals(result, ((GetYMUMChecksumFunctionNode)obj).result); - } -} diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java index c432e49fe2b..dba0da7301d 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ExpressionNode.java @@ -45,20 +45,6 @@ public abstract class ExpressionNode implements Serializable { public abstract StringBuilder toString(StringBuilder builder, SerializationContext context, Deque<String> path, CompositeNode parent); /** - * Returns a script instance of this based on the supplied script functions. - * @deprecated use the faster one that takes and returns a StringBuilder instead. - * - * @param context the serialization context - * @param path the call path to this, used for cycle detection, or null if this is a root - * @param parent the parent node of this, or null if it a root - * @return the main script, referring to script instances. - */ - @Deprecated - public String toString(SerializationContext context, Deque<String> path, CompositeNode parent) { - return toString(new StringBuilder(), context, path, parent).toString(); - } - - /** * Returns the type this will return if evaluated with the given context. * * @param context the variable type bindings to use for this evaluation |