Fix Select and grouping bugs

- Deep copy the grouping structure on query copy.
  It is mutable but we have neglected doing this right until now.
- Fix a bug in the previous commit where the last constructed Query.Model was shared between all instances.
- Fix a bug in the previous commit where the query string instead of the query tree was reset when a new select
  expression is set.
- Don't use deprecated method.
- Clean up Javadoc and formatting.

1 files changed, 12 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
index 84584270f58..7af8d22955e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
@@ -2,6 +2,7 @@
 package com.yahoo.search.grouping.request;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * This class represents a mul-function in a {@link GroupingExpression}. It evaluates to a number that equals the result
@@ -19,11 +20,18 @@ public class MulFunction extends FunctionNode {
      * @param argN The optional arguments, must evaluate to a number.
      */
     public MulFunction(GroupingExpression arg1, GroupingExpression arg2, GroupingExpression... argN) {
-        this(asList(arg1, arg2, argN));
+        this(null, null, asList(arg1, arg2, argN));
     }
 
-    private MulFunction(List<GroupingExpression> args) {
-        super("mul", args);
+    private MulFunction(String label, Integer level, List<GroupingExpression> args) {
+        super("mul", label, level, args);
+    }
+
+    @Override
+    public MulFunction copy() {
+        return new MulFunction(getLabel(),
+                               getLevelOrNull(),
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
@@ -37,6 +45,6 @@ public class MulFunction extends FunctionNode {
         if (args.size() < 2) {
             throw new IllegalArgumentException("Expected 2 or more arguments, got " + args.size() + ".");
         }
-        return new MulFunction(args);
+        return new MulFunction(null, null, args);
     }
 }