fixup

Author: pabloem

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Deriv.java

@@ -43,12 +43,11 @@ public Deriv(Source source, @Param(name = "field", type = { "long", "integer", "
     }
 
     public Deriv(Source source, Expression field, Expression timestamp) {
-        super(source, field, Literal.TRUE, NO_WINDOW, List.of(timestamp));
-        this.timestamp = timestamp;
+        this(source, field, Literal.TRUE, timestamp, NO_WINDOW);
     }
 
-    public Deriv(Source source, Expression field, Expression filter, Expression timestamp) {
-        super(source, field, filter, NO_WINDOW, List.of(timestamp));
+    public Deriv(Source source, Expression field, Expression filter, Expression window, Expression timestamp) {
+        super(source, field, filter, window, List.of(timestamp));
         this.timestamp = timestamp;
     }
 
@@ -57,6 +56,7 @@ private Deriv(org.elasticsearch.common.io.stream.StreamInput in) throws java.io.
             Source.readFrom((PlanStreamInput) in),
             in.readNamedWriteable(Expression.class),
             in.readNamedWriteable(Expression.class),
+            in.readNamedWriteable(Expression.class),
             in.readNamedWriteable(Expression.class)
         );
     }
@@ -68,7 +68,7 @@ public AggregateFunction perTimeSeriesAggregation() {
 
     @Override
     public AggregateFunction withFilter(Expression filter) {
-        return new Deriv(source(), field(), filter, timestamp);
+        return new Deriv(source(), field(), filter, timestamp, window());
     }
 
     @Override
@@ -78,17 +78,19 @@ public DataType dataType() {
 
     @Override
     public Expression replaceChildren(List<Expression> newChildren) {
-        if (newChildren.size() == 3) {
-            return new Deriv(source(), newChildren.get(0), newChildren.get(1), newChildren.get(2));
+        if (newChildren.size() == 4) {
+            return new Deriv(source(), newChildren.get(0), newChildren.get(1), newChildren.get(2), newChildren.get(3));
+        } else if (newChildren.size() == 3) {
+            return new Deriv(source(), newChildren.get(0), newChildren.get(1), newChildren.get(2), timestamp);
         } else {
-            assert newChildren.size() == 2;
+            assert newChildren.size() == 2 : "Expected 2, 3, 4 children but got " + newChildren.size();
             return new Deriv(source(), newChildren.get(0), newChildren.get(1));
         }
     }
 
     @Override
     protected NodeInfo<? extends Expression> info() {
-        return NodeInfo.create(this, Deriv::new, field(), filter(), timestamp);
+        return NodeInfo.create(this, Deriv::new, field(), filter(), window(), timestamp);
     }
 
     @Override