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

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
index 2f6061a3aa2..8fdd2dc5839 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
@@ -2,12 +2,15 @@
 package com.yahoo.search.grouping.request;
 
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * This class represents an xor-function in a {@link GroupingExpression}. It evaluates to a long that equals the xor of
  * 'width' bits over the binary representation of the result of the argument.
  *
  * @author Simon Thoresen Hult
+ * @author bratseth
  */
 public class XorBitFunction extends FunctionNode {
 
@@ -18,7 +21,18 @@ public class XorBitFunction extends FunctionNode {
      * @param numBits The number of bits of the expression value to xor.
      */
     public XorBitFunction(GroupingExpression exp, int numBits) {
-        super("xorbit", Arrays.asList(exp, new LongValue(numBits)));
+        this(null, null, Arrays.asList(exp, new LongValue(numBits)));
+    }
+
+    private XorBitFunction(String label, Integer level, List<GroupingExpression> exp) {
+        super("xorbit", label, level, exp);
+    }
+
+    @Override
+    public XorBitFunction copy() {
+        return new XorBitFunction(getLabel(),
+                                  getLevelOrNull(),
+                                  args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**