Remove ymum from grouping

6 files changed, 0 insertions, 48 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java
deleted file mode 100644
index 8ca772b9188..00000000000
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java
+++ /dev/null
@@ -1,30 +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.search.grouping.request;
-
-/**
- * This class represents a document checksum in a {@link GroupingExpression}. It evaluates to the YMUM checksum of the
- * input {@link com.yahoo.search.result.Hit}.
- *
- * @author Simon Thoresen Hult
- * @author bratseth
- */
-public class YmumValue extends DocumentValue {
-
-    /**
-     * Constructs a new instance of this class.
-     */
-    public YmumValue() {
-        this(null, null);
-    }
-
-    private YmumValue(String label, Integer level) {
-        super("ymum()", label, level);
-    }
-
-    @Override
-    public YmumValue copy() {
-        return new YmumValue(getLabel(), getLevelOrNull());
-    }
-
-}
-
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java
index d017fe2edb3..d5d1bb5b18e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java
@@ -85,7 +85,6 @@ import com.yahoo.search.grouping.request.XorAggregator;
 import com.yahoo.search.grouping.request.XorBitFunction;
 import com.yahoo.search.grouping.request.XorFunction;
 import com.yahoo.search.grouping.request.YearFunction;
-import com.yahoo.search.grouping.request.YmumValue;
 import com.yahoo.search.grouping.request.ZCurveXFunction;
 import com.yahoo.search.grouping.request.ZCurveYFunction;
 import com.yahoo.searchlib.aggregation.AggregationResult;
@@ -115,7 +114,6 @@ import com.yahoo.searchlib.expression.FloatBucketResultNode;
 import com.yahoo.searchlib.expression.FloatBucketResultNodeVector;
 import com.yahoo.searchlib.expression.FloatResultNode;
 import com.yahoo.searchlib.expression.GetDocIdNamespaceSpecificFunctionNode;
-import com.yahoo.searchlib.expression.GetYMUMChecksumFunctionNode;
 import com.yahoo.searchlib.expression.IntegerBucketResultNode;
 import com.yahoo.searchlib.expression.IntegerBucketResultNodeVector;
 import com.yahoo.searchlib.expression.IntegerResultNode;
@@ -522,9 +520,6 @@ class ExpressionConverter {
             return new XorBitFunctionNode().setNumBits(((XorBitFunction)exp).getNumBits())
                                            .addArg(toExpressionNode(((XorBitFunction)exp).getArg(0)));
         }
-        if (exp instanceof YmumValue) {
-            return new GetYMUMChecksumFunctionNode();
-        }
         throw new UnsupportedOperationException("Can not convert '" + exp + "' of class " + exp.getClass().getName() +
                                                 " to an expression.");
     }
diff --git a/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj b/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj
index 6a55a32eb8a..e1df35bb24a 100644
--- a/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj
+++ b/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj
@@ -169,7 +169,6 @@ TOKEN :
     <XOR: "xor"> |
     <XORBIT: "xorbit"> |
     <Y: "y"> |
-    <YMUM: "ymum"> |
     <ZCURVE: "zcurve"> |
     <IDENTIFIER: ["A"-"Z","a"-"z"](["A"-"Z","a"-"z","0"-"9","_","@"])*>
 }
@@ -374,7 +373,6 @@ GroupingExpression value(GroupingOperation grp) :
                    exp = ucaFunction(grp)              |
                    exp = xorExpression(grp)            |
                    exp = xorBitFunction(grp)           |
-                   exp = ymumValue()                   |
                    exp = zcurveFunction(grp)           ) |
       (            exp = attributeValue()              ) )
     { return exp; }
@@ -912,12 +910,6 @@ XorBitFunction xorBitFunction(GroupingOperation grp) :
     { return new XorBitFunction(exp, num.intValue()); }
 }
 
-YmumValue ymumValue() : { }
-{
-    ( <YMUM> lbrace() rbrace() )
-    { return new YmumValue(); }
-}
-
 void bucket(GroupingOperation grp, BucketResolver resolver) :
 {
     ConstantValue from, to = null;
@@ -1076,7 +1068,6 @@ String identifier() :
         <XOR> |
         <XORBIT> |
         <Y> |
-        <YMUM> |
         <ZCURVE> ) { ret = token.image; } space() )
     { return ret; }
 }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java
index 60ada5124a0..326e37ede38 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java
@@ -203,7 +203,6 @@ public class GroupingParserBenchmarkTest {
                 "all(group(artist) max(2) each(each(output(summary()))))",
                 "all(group(artist) max(2) each(each(output(summary(simple)))))",
                 "all(group(artist) max(5) each(output(count()) each(output(summary()))))",
-                "all(group(ymum()))",
                 "all(group(strlen(attr)))",
                 "all(group(normalizesubject(attr)))",
                 "all(group(strcat(attr, attr2)))",
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java
index fcf1c3bcdd0..5d311361edf 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java
@@ -150,7 +150,6 @@ public class GroupingParserTestCase {
                                             "xor",
                                             "xorbit",
                                             "y",
-                                            "ymum",
                                             "zcurve");
         for (String image : images) {
             assertParse("all(group(" + image + "))", "all(group(" + image + "))");
@@ -512,7 +511,6 @@ public class GroupingParserTestCase {
         assertParse("all(group(artist) max(2) each(each(output(summary()))))");
         assertParse("all(group(artist) max(2) each(each(output(summary(simple)))))");
         assertParse("all(group(artist) max(5) each(output(count()) each(output(summary()))))");
-        assertParse("all(group(ymum()))");
         assertParse("all(group(strlen(attr)))");
         assertParse("all(group(normalizesubject(attr)))");
         assertParse("all(group(strcat(attr, attr2)))");
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java
index c64c4d624f2..f61299bd317 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java
@@ -160,7 +160,6 @@ public class RequestBuilderTestCase {
         assertLayout("all(group(time.year(a)) each(output(count())))", "[[{ TimeStamp, result = [Count] }]]");
         assertLayout("all(group(xor(a,b)) each(output(count())))", "[[{ Xor, result = [Count] }]]");
         assertLayout("all(group(xorbit(a,1)) each(output(count())))", "[[{ XorBit, result = [Count] }]]");
-        assertLayout("all(group(ymum()) each(output(count())))", "[[{ GetYMUMChecksum, result = [Count] }]]");
     }
 
     @Test