Remove ymum from grouping

6 files changed, 6 insertions, 86 deletions

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/test/files/testSpecialNodes b/searchlib/src/test/files/testSpecialNodes
index 149cc17f99b..d1a65b16666 100644
--- a/searchlib/src/test/files/testSpecialNodes
+++ b/searchlib/src/test/files/testSpecialNodes
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
index 969bc318391..b9d3bc3bd4d 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
@@ -72,7 +72,6 @@ public class GroupingSerializationTest {
             t.assertMatch(new AttributeNode("testattribute"));
             t.assertMatch(new DocumentFieldNode("testdocumentfield"));
             t.assertMatch(new GetDocIdNamespaceSpecificFunctionNode(new IntegerResultNode(7)));
-            t.assertMatch(new GetYMUMChecksumFunctionNode());
         }
     }
 
@@ -363,11 +362,13 @@ public class GroupingSerializationTest {
 
         @Override
         public void close() throws IOException {
-            boolean moreDataAvailable = in.read() != -1;
+            int bytesLeft = 0;
+            while (in.read() != -1)
+                bytesLeft++;
             in.close();
-            if (moreDataAvailable) {
-                fail("The file was not fully consumed. Did you forget to deserialize an object on Java side?");
-            }
+            if (bytesLeft > 0)
+                fail(FILE_PATH + "/" + fileName + " has " + bytesLeft + " bytes left. " +
+                     "Did you forget to deserialize an object on Java side?");
         }
 
         private static String toHexString(byte[] data) {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
index 1fa012c83f7..d282dc17aaa 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
@@ -401,25 +401,6 @@ public class ExpressionTestCase {
     }
 
     @Test
-    public void testGetYMUMChecksumFunctionNode() {
-        GetYMUMChecksumFunctionNode a = new GetYMUMChecksumFunctionNode();
-        assertTrue(a.getResult() instanceof IntegerResultNode);
-        assertSerialize(a);
-        try {
-            new GetYMUMChecksumFunctionNode().prepare();
-            fail("Should not be able to prepare documentfieldnode");
-        } catch (RuntimeException e) {
-            // expected
-        }
-        try {
-            new GetYMUMChecksumFunctionNode().execute();
-            fail("Should not be able to execute documentfieldnode");
-        } catch (RuntimeException e) {
-            // expected
-        }
-    }
-
-    @Test
     public void testIntegerResultNode() {
         IntegerResultNode a = new IntegerResultNode(7);
         assertEquals(a.getInteger(), 7);
diff --git a/searchlib/src/tests/grouping/grouping_serialization_test.cpp b/searchlib/src/tests/grouping/grouping_serialization_test.cpp
index cdf8eb61381..e430559d74e 100644
--- a/searchlib/src/tests/grouping/grouping_serialization_test.cpp
+++ b/searchlib/src/tests/grouping/grouping_serialization_test.cpp
@@ -146,7 +146,6 @@ TEST_F("testSpecialNodes", Fixture("testSpecialNodes")) {
         f.checkObject(GetDocIdNamespaceSpecificFunctionNode(
                         ResultNode::UP(new Int64ResultNode(7))));
     }
-    f.checkObject(GetYMUMChecksumFunctionNode());
 }
 
 TEST_F("testFunctionNodes", Fixture("testFunctionNodes")) {