Revert "Merge pull request #6582 from vespa-engine/revert-6557-revert-6553-revert-6512-henrhoi/object-structured-grouping"

This reverts commit 506ea9c1367748ddd4ff20203fc13211d635f5a6, reversing
changes made to 4f6b34dcf9ad904f0ddb89eb506f5920360d5344.

1 files changed, 16 insertions, 3 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StandardDeviationAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StandardDeviationAggregator.java
index 62bc0085422..d96b840dde9 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StandardDeviationAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StandardDeviationAggregator.java
@@ -6,13 +6,26 @@ package com.yahoo.search.grouping.request;
  * of the values that the contained expression evaluated to over all the inputs.
  *
  * @author bjorncs
+ * @author bratseth
  */
 public class StandardDeviationAggregator extends AggregatorNode {
 
     /**
-     * @param exp The expression to aggregate on.
+     * Constructs a new instance of this class.
+     *
+     * @param expression the expression to aggregate on.
      */
-    public StandardDeviationAggregator(GroupingExpression exp) {
-        super("stddev", exp);
+    public StandardDeviationAggregator(GroupingExpression expression) {
+        this(null, null, expression);
     }
+
+    private StandardDeviationAggregator(String label, Integer level, GroupingExpression expression) {
+        super("stddev", label, level, expression);
+    }
+
+    @Override
+    public StandardDeviationAggregator copy() {
+        return new StandardDeviationAggregator(getLabel(), getLevelOrNull(), getExpression().copy());
+    }
+
 }