Merge pull request #12799 from vespa-engine/bratseth/copy-groupingExpressionString

Copy the grouping expression string

2 files changed, 13 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/Select.java b/container-search/src/main/java/com/yahoo/search/query/Select.java
index cb662dcd671..65ffd29efe0 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Select.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Select.java
@@ -57,12 +57,13 @@ public class Select implements Cloneable {
     }
 
     public Select(String where, String grouping, Query query) {
-        this(where, grouping, query, Collections.emptyList());
+        this(where, grouping, null, query, Collections.emptyList());
     }
 
-    private Select(String where, String grouping, Query query, List<GroupingRequest> groupingRequests) {
+    private Select(String where, String grouping, String groupingExpressionString, Query query, List<GroupingRequest> groupingRequests) {
         this.where = Objects.requireNonNull(where, "A Select must have a where string (possibly the empty string)");
         this.grouping = Objects.requireNonNull(grouping, "A Select must have a select string (possibly the empty string)");
+        this.groupingExpressionString = groupingExpressionString;
         this.parent = Objects.requireNonNull(query, "A Select must have a parent query");
         this.groupingRequests = deepCopy(groupingRequests, this);
     }
@@ -136,11 +137,11 @@ public class Select implements Cloneable {
 
     @Override
     public Object clone() {
-        return new Select(where, grouping, parent, groupingRequests);
+        return new Select(where, grouping, groupingExpressionString, parent, groupingRequests);
     }
 
     public Select cloneFor(Query parent)  {
-        return new Select(where, grouping, parent, groupingRequests);
+        return new Select(where, grouping, groupingExpressionString, parent, groupingRequests);
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
index 7b1b4fe6362..1715ed38964 100644
--- a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
+++ b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
@@ -724,6 +724,7 @@ public class SelectTestCase {
         assertEquals("all(group(time.dayofmonth(a)) each(output(count())))", query.getSelect().getGrouping().get(0).toString());
 
         Query clone = query.clone();
+        assertEquals(clone.getSelect().getGroupingExpressionString(), query.getSelect().getGroupingExpressionString());
         assertNotSame(query.getSelect(), clone.getSelect());
         assertNotSame(query.getSelect().getGrouping(), clone.getSelect().getGrouping());
         assertNotSame(query.getSelect().getGrouping().get(0), clone.getSelect().getGrouping().get(0));
@@ -732,8 +733,15 @@ public class SelectTestCase {
         assertEquals(query.getSelect().getGroupingString(), clone.getSelect().getGroupingString());
         assertEquals(query.getSelect().getGrouping().get(0).toString(), clone.getSelect().getGrouping().get(0).toString());
         assertEquals(query.getSelect().getGrouping().get(1).toString(), clone.getSelect().getGrouping().get(1).toString());
+    }
 
+    @Test
+    public void testCloneWithGroupingExpressionString() {
+        Query query = new Query();
+        query.getSelect().setGroupingExpressionString("all(group(foo) each(output(count())))");
 
+        Query clone = query.clone();
+        assertEquals(clone.getSelect().getGroupingExpressionString(), query.getSelect().getGroupingExpressionString());
     }
 
     //------------------------------------------------------------------- Assert methods