Evaluate filterCondition earlier in updateAggregate()

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

@@ -307,6 +307,11 @@ public class Aggregate extends Expression {
         }
         lastGroupRowId = groupRowId;
 
+        if (filterCondition != null) {
+            if (!filterCondition.getBooleanValue(session)) {
+                return;
+            }
+        }
         AggregateData data = (AggregateData) select.getCurrentGroupExprData(this);
         if (data == null) {
             data = AggregateData.create(type);
@@ -322,11 +327,6 @@ public class Aggregate extends Expression {
                 v = updateCollecting(session, v);
             }
         }
-        if (filterCondition != null) {
-            if (!filterCondition.getBooleanValue(session)) {
-                return;
-            }
-        }
         data.add(session.getDatabase(), dataType, distinct, v);
     }