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, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
index 57c55d41209..fa645eb9141 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 
 /**
  * @author baldersheim
+ * @author bratseth
  */
 public class ZCurveYFunction extends FunctionNode {
     /**
@@ -13,6 +14,16 @@ public class ZCurveYFunction extends FunctionNode {
      * @param exp The expression to evaluate, must evaluate to a long or long[].
      */
     public ZCurveYFunction(GroupingExpression exp) {
-        super("zcurve.y", Arrays.asList(exp));
+        this(null, null, exp);
     }
+
+    private ZCurveYFunction(String label, Integer level, GroupingExpression exp) {
+        super("zcurve.y", label, level, Arrays.asList(exp));
+    }
+
+    @Override
+    public ZCurveYFunction copy() {
+        return new ZCurveYFunction(getLabel(), getLevelOrNull(), getArg(0).copy());
+    }
+
 }