fixup

Author: pabloem

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

@@ -57,11 +57,11 @@ public PredictLinear(
     }
 
     public PredictLinear(Source source, Expression field, Expression timestamp, Expression t) {
-        this(source, field, Literal.TRUE, timestamp, t);
+        this(source, field, Literal.TRUE, NO_WINDOW, timestamp, t);
     }
 
-    public PredictLinear(Source source, Expression field, Expression filter, Expression timestamp, Expression t) {
-        super(source, field, filter, NO_WINDOW, List.of(timestamp, t));
+    public PredictLinear(Source source, Expression field, Expression filter, Expression window, Expression timestamp, Expression t) {
+        super(source, field, filter, window, List.of(timestamp, t));
         this.timestamp = timestamp;
         this.t = t;
     }
@@ -72,6 +72,7 @@ private PredictLinear(org.elasticsearch.common.io.stream.StreamInput in) throws
             in.readNamedWriteable(Expression.class),
             in.readNamedWriteable(Expression.class),
             in.readNamedWriteable(Expression.class),
+            in.readNamedWriteable(Expression.class),
             in.readNamedWriteable(Expression.class)
         );
     }
@@ -83,7 +84,7 @@ public AggregateFunction perTimeSeriesAggregation() {
 
     @Override
     public AggregateFunction withFilter(Expression filter) {
-        return new PredictLinear(source(), field(), filter, timestamp, t);
+        return new PredictLinear(source(), field(), filter, window(), timestamp, t);
     }
 
     @Override
@@ -93,19 +94,19 @@ public DataType dataType() {
 
     @Override
     public Expression replaceChildren(List<Expression> newChildren) {
-        if (newChildren.size() == 4) {
-            return new PredictLinear(source(), newChildren.get(0), newChildren.get(1), newChildren.get(2), newChildren.get(3));
-        } else if (newChildren.size() == 3) {
-            return new PredictLinear(source(), newChildren.get(0), newChildren.get(1), newChildren.get(2));
+        if (newChildren.size() == 5) {
+            return new PredictLinear(source(), newChildren.get(0), newChildren.get(1), newChildren.get(2), newChildren.get(3), newChildren.get(4));
+        } else if (newChildren.size() == 4) {
+            return new PredictLinear(source(), newChildren.get(0), newChildren.get(1), newChildren.get(2), timestamp, newChildren.get(3));
         } else {
-            assert newChildren.size() == 2;
+            assert newChildren.size() == 2 : "Received unexpected number of child expressionst " + newChildren.size();
             return new PredictLinear(source(), newChildren.get(0), newChildren.get(1));
         }
     }
 
     @Override
     protected NodeInfo<? extends Expression> info() {
-        return NodeInfo.create(this, PredictLinear::new, field(), filter(), timestamp, t);
+        return NodeInfo.create(this, PredictLinear::new, field(), filter(), window(), timestamp, t);
     }
 
     @Override