Extract updateCollecting() from Aggregate.updateAggregate()

h2/src/main/org/h2/expression/aggregate/Aggregate.java

@@ -315,21 +315,22 @@ public class Aggregate extends Expression {
         Value v = on == null ? null : on.getValue(session);
         if (type == AggregateType.GROUP_CONCAT) {
             if (v != ValueNull.INSTANCE) {
-                v = v.convertTo(Value.STRING);
-                if (orderByList != null) {
-                    int size = orderByList.size();
-                    Value[] array = new Value[1 + size];
-                    array[0] = v;
-                    for (int i = 0; i < size; i++) {
-                        SelectOrderBy o = orderByList.get(i);
-                        array[i + 1] = o.expression.getValue(session);
+                v = updateCollecting(session, v.convertTo(Value.STRING));
             }
-                    v = ValueArray.get(array);
+        } else if (type == AggregateType.ARRAY_AGG) {
+            if (v != ValueNull.INSTANCE) {
+                v = updateCollecting(session, v);
             }
         }
+        if (filterCondition != null) {
+            if (!filterCondition.getBooleanValue(session)) {
+                return;
             }
-        if (type == AggregateType.ARRAY_AGG) {
-            if (v != ValueNull.INSTANCE) {
+        }
+        data.add(session.getDatabase(), dataType, distinct, v);
+    }
+
+    private Value updateCollecting(Session session, Value v) {
         if (orderByList != null) {
             int size = orderByList.size();
             Value[] array = new Value[1 + size];
@@ -340,14 +341,7 @@ public class Aggregate extends Expression {
             }
             v = ValueArray.get(array);
         }
-            }
-        }
-        if (filterCondition != null) {
-            if (!filterCondition.getBooleanValue(session)) {
-                return;
-            }
-        }
-        data.add(session.getDatabase(), dataType, distinct, v);
+        return v;
     }
 
     @Override