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

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java
index 3c1c335b8ef..2f32b0fe139 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToRawFunction.java
@@ -8,7 +8,8 @@ import java.util.Arrays;
  * converts the result of the argument to a raw type. If the argument can not
  * be converted, this function returns null.
  *
- * @author <a href="mailto:lulf@yahoo-inc.com">Ulf Lilleengen</a>
+ * @author Ulf Lilleengen
+ * @author bratseth
  */
 public class ToRawFunction extends FunctionNode {
 
@@ -18,6 +19,16 @@ public class ToRawFunction extends FunctionNode {
      * @param exp The expression to evaluate.
      */
     public ToRawFunction(GroupingExpression exp) {
-        super("toraw", Arrays.asList(exp));
+        this(null, null, exp);
     }
+
+    private ToRawFunction(String label, Integer level, GroupingExpression exp) {
+        super("toraw", label, level, Arrays.asList(exp));
+    }
+
+    @Override
+    public ToRawFunction copy() {
+        return new ToRawFunction(getLabel(), getLevelOrNull(), getArg(0).copy());
+    }
+
 }