Fix window frames for window aggregates with FILTER

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

@@ -213,8 +213,8 @@ public abstract class AbstractAggregate extends DataAnalysisOperation {
 
     @Override
     protected void updateAggregate(Session session, SelectGroups groupData, int groupRowId) {
+        ArrayList<SelectOrderBy> orderBy;
         if (filterCondition == null || filterCondition.getBooleanValue(session)) {
-            ArrayList<SelectOrderBy> orderBy;
             if (over != null) {
                 if ((orderBy = over.getOrderBy()) != null) {
                     updateOrderedAggregate(session, groupData, groupRowId, orderBy);
@@ -224,6 +224,8 @@ public abstract class AbstractAggregate extends DataAnalysisOperation {
             } else {
                 updateAggregate(session, getGroupData(groupData, false));
             }
+        } else if (over != null && (orderBy = over.getOrderBy()) != null) {
+            updateOrderedAggregate(session, groupData, groupRowId, orderBy);
         }
     }
 

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

@@ -346,6 +346,9 @@ public class Aggregate extends AbstractAggregate {
         if (orderByList != null) {
             n += orderByList.size();
         }
+        if (filterCondition != null) {
+            n++;
+        }
         return n;
     }
 
@@ -360,13 +363,18 @@ public class Aggregate extends AbstractAggregate {
                 array[offset++] = o.expression.getValue(session);
             }
         }
+        if (filterCondition != null) {
+            array[offset] = ValueBoolean.get(filterCondition.getBooleanValue(session));
+        }
     }
 
     @Override
     protected void updateFromExpressions(Session session, Object aggregateData, Value[] array) {
-        AggregateData data = (AggregateData) aggregateData;
-        Value v = on == null ? null : array[0];
-        updateData(session, data, v, array);
+        if (filterCondition == null || array[getNumExpressions() - 1].getBoolean()) {
+            AggregateData data = (AggregateData) aggregateData;
+            Value v = on == null ? null : array[0];
+            updateData(session, data, v, array);
+        }
     }
 
     @Override

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

@@ -20,6 +20,7 @@ import org.h2.table.TableFilter;
 import org.h2.value.DataType;
 import org.h2.value.Value;
 import org.h2.value.ValueArray;
+import org.h2.value.ValueBoolean;
 import org.h2.value.ValueNull;
 
 /**
@@ -232,19 +233,29 @@ public class JavaAggregate extends AbstractAggregate {
 
     @Override
     protected int getNumExpressions() {
-        return args.length;
+        int n = args.length;
+        if (filterCondition != null) {
+            n++;
+        }
+        return n;
     }
 
     @Override
     protected void rememberExpressions(Session session, Value[] array) {
-        for (int i = 0; i < args.length; i++) {
+        int length = args.length;
+        for (int i = 0; i < length; i++) {
             array[i] = args[i].getValue(session);
         }
+        if (filterCondition != null) {
+            array[length] = ValueBoolean.get(filterCondition.getBooleanValue(session));
+        }
     }
 
     @Override
     protected void updateFromExpressions(Session session, Object aggregateData, Value[] array) {
-        updateData(session, aggregateData, array);
+        if (filterCondition == null || array[getNumExpressions() - 1].getBoolean()) {
+            updateData(session, aggregateData, array);
+        }
     }
 
     @Override

h2/src/test/org/h2/test/scripts/functions/aggregate/array-agg.sql

@@ -121,6 +121,20 @@ SELECT
 > [5, 6] [5, 6] 6  c
 > rows (ordered): 6
 
+SELECT
+    ARRAY_AGG(ID ORDER BY ID) FILTER (WHERE ID < 3 OR ID > 4)
+    OVER (ORDER BY ID ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) A,
+    ID FROM TEST ORDER BY ID;
+> A      ID
+> ------ --
+> [1, 2] 1
+> [1, 2] 2
+> [2]    3
+> [5]    4
+> [5, 6] 5
+> [5, 6] 6
+> rows (ordered): 6
+
 SELECT ARRAY_AGG(SUM(ID)) OVER () FROM TEST;
 > ARRAY_AGG(SUM(ID)) OVER ()
 > --------------------------