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

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
index 812fd98faa9..ef2a53d90b0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
@@ -5,14 +5,26 @@ import java.util.Arrays;
 
 /**
  * @author baldersheim
+ * @author bratseth
  */
 public class MathExpFunction extends FunctionNode {
+
     /**
      * Constructs a new instance of this class.
      *
      * @param exp The expression to evaluate, double value will be requested.
      */
     public MathExpFunction(GroupingExpression exp) {
-        super("math.exp", Arrays.asList(exp));
+        this(null, null, exp);
+    }
+
+    private MathExpFunction(String label, Integer level, GroupingExpression exp) {
+        super("math.exp", label, level, Arrays.asList(exp));
     }
+
+    @Override
+    public MathExpFunction copy() {
+        return new MathExpFunction(getLabel(), getLevelOrNull(), getArg(0).copy());
+    }
+
 }