Remove channels from ToAggregator method

ivancea · ivancea · commit 8aba64fdcbdd · 2025-02-07T14:08:28.000+01:00
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountAggregatorFunction.java
@@ -19,7 +19,7 @@
 import java.util.List;
 
 public class CountAggregatorFunction implements AggregatorFunction {
-    public static AggregatorFunctionSupplier supplier(List<Integer> channels) {
+    public static AggregatorFunctionSupplier supplier() {
         return new AggregatorFunctionSupplier() {
             @Override
             public List<IntermediateStateDesc> nonGroupingIntermediateStateDesc() {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Count.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Count.java
@@ -126,8 +126,8 @@ public DataType dataType() {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
-        return CountAggregatorFunction.supplier(inputChannels);
+    public AggregatorFunctionSupplier supplier() {
+        return CountAggregatorFunction.supplier();
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountDistinct.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountDistinct.java
@@ -209,7 +209,7 @@ protected TypeResolution resolveType() {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         int precision = this.precision == null
             ? DEFAULT_PRECISION
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/FromPartial.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/FromPartial.java
@@ -111,13 +111,8 @@ public FromPartial withFilter(Expression filter) {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
-        final ToAggregator toAggregator = (ToAggregator) function;
-        if (inputChannels.size() != 1) {
-            assert false : "from_partial aggregation requires exactly one input channel; got " + inputChannels;
-            throw new IllegalArgumentException("from_partial aggregation requires exactly one input channel; got " + inputChannels);
-        }
-        final int inputChannel = inputChannels.get(0);
+    public AggregatorFunctionSupplier supplier() {
+        final AggregatorFunctionSupplier supplier = ((ToAggregator) function).supplier();
         return new AggregatorFunctionSupplier() {
             @Override
             public List<IntermediateStateDesc> nonGroupingIntermediateStateDesc() {
@@ -143,17 +138,17 @@ public GroupingAggregatorFunction groupingAggregator(DriverContext driverContext
 
             @Override
             public Aggregator.Factory aggregatorFactory(AggregatorMode mode, List<Integer> channels) {
-                final AggregatorFunctionSupplier supplier;
-                // TODO: Improve this code; We don't need to create an aggregator now
-                try (var dummy = toAggregator.supplier(inputChannels).aggregator(DriverContext.getLocalDriver(), channels)) {
-                    var intermediateChannels = IntStream.range(0, dummy.intermediateBlockCount()).boxed().toList();
-                    supplier = toAggregator.supplier(intermediateChannels);
+                if (channels.size() != 1) {
+                    assert false : "from_partial aggregation requires exactly one input channel; got " + channels;
+                    throw new IllegalArgumentException("from_partial aggregation requires exactly one input channel; got " + channels);
                 }
+                final int inputChannel = channels.get(0);
+                var intermediateChannels = IntStream.range(0, supplier.nonGroupingIntermediateStateDesc().size()).boxed().toList();
                 return new Aggregator.Factory() {
                     @Override
                     public Aggregator apply(DriverContext driverContext) {
                         // use groupingAggregator since we can receive intermediate output from a grouping aggregate
-                        final var groupingAggregator = supplier.groupingAggregator(driverContext, channels);
+                        final var groupingAggregator = supplier.groupingAggregator(driverContext, intermediateChannels);
                         return new Aggregator(new FromPartialAggregatorFunction(driverContext, groupingAggregator, inputChannel), mode);
                     }
 
@@ -166,15 +161,16 @@ public String describe() {
 
             @Override
             public GroupingAggregator.Factory groupingAggregatorFactory(AggregatorMode mode, List<Integer> channels) {
-                final AggregatorFunctionSupplier supplier;
-                try (var dummy = toAggregator.supplier(inputChannels).aggregator(DriverContext.getLocalDriver(), channels)) {
-                    var intermediateChannels = IntStream.range(0, dummy.intermediateBlockCount()).boxed().toList();
-                    supplier = toAggregator.supplier(intermediateChannels);
+                if (channels.size() != 1) {
+                    assert false : "from_partial aggregation requires exactly one input channel; got " + channels;
+                    throw new IllegalArgumentException("from_partial aggregation requires exactly one input channel; got " + channels);
                 }
+                final int inputChannel = channels.get(0);
+                var intermediateChannels = IntStream.range(0, supplier.nonGroupingIntermediateStateDesc().size()).boxed().toList();
                 return new GroupingAggregator.Factory() {
                     @Override
                     public GroupingAggregator apply(DriverContext driverContext) {
-                        final GroupingAggregatorFunction aggregator = supplier.groupingAggregator(driverContext, channels);
+                        final GroupingAggregatorFunction aggregator = supplier.groupingAggregator(driverContext, intermediateChannels);
                         return new GroupingAggregator(new FromPartialGroupingAggregatorFunction(aggregator, inputChannel), mode);
                     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Max.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Max.java
@@ -141,7 +141,7 @@ public DataType dataType() {
     }
 
     @Override
-    public final AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public final AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         if (SUPPLIERS.containsKey(type) == false) {
             // If the type checking did its job, this should never happen
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/MedianAbsoluteDeviation.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/MedianAbsoluteDeviation.java
@@ -99,17 +99,17 @@ public MedianAbsoluteDeviation withFilter(Expression filter) {
     }
 
     @Override
-    protected AggregatorFunctionSupplier longSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier longSupplier() {
         return new MedianAbsoluteDeviationLongAggregatorFunctionSupplier();
     }
 
     @Override
-    protected AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier intSupplier() {
         return new MedianAbsoluteDeviationIntAggregatorFunctionSupplier();
     }
 
     @Override
-    protected AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier doubleSupplier() {
         return new MedianAbsoluteDeviationDoubleAggregatorFunctionSupplier();
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Min.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Min.java
@@ -141,7 +141,7 @@ public DataType dataType() {
     }
 
     @Override
-    public final AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public final AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         if (SUPPLIERS.containsKey(type) == false) {
             // If the type checking did its job, this should never happen
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/NumericAggregate.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/NumericAggregate.java
@@ -92,26 +92,26 @@ public DataType dataType() {
     }
 
     @Override
-    public final AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public final AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         if (supportsDates() && type == DataType.DATETIME) {
-            return longSupplier(inputChannels);
+            return longSupplier();
         }
         if (type == DataType.LONG) {
-            return longSupplier(inputChannels);
+            return longSupplier();
         }
         if (type == DataType.INTEGER) {
-            return intSupplier(inputChannels);
+            return intSupplier();
         }
         if (type == DataType.DOUBLE) {
-            return doubleSupplier(inputChannels);
+            return doubleSupplier();
         }
         throw EsqlIllegalArgumentException.illegalDataType(type);
     }
 
-    protected abstract AggregatorFunctionSupplier longSupplier(List<Integer> inputChannels);
+    protected abstract AggregatorFunctionSupplier longSupplier();
 
-    protected abstract AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels);
+    protected abstract AggregatorFunctionSupplier intSupplier();
 
-    protected abstract AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels);
+    protected abstract AggregatorFunctionSupplier doubleSupplier();
 }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Percentile.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Percentile.java
@@ -156,17 +156,17 @@ protected TypeResolution resolveType() {
     }
 
     @Override
-    protected AggregatorFunctionSupplier longSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier longSupplier() {
         return new PercentileLongAggregatorFunctionSupplier(percentileValue());
     }
 
     @Override
-    protected AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier intSupplier() {
         return new PercentileIntAggregatorFunctionSupplier(percentileValue());
     }
 
     @Override
-    protected AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier doubleSupplier() {
         return new PercentileDoubleAggregatorFunctionSupplier(percentileValue());
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Rate.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Rate.java
@@ -168,10 +168,7 @@ long unitInMillis() {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
-        if (inputChannels.size() != 2 && inputChannels.size() != 3) {
-            throw new IllegalArgumentException("rate requires two for raw input or three channels for partial input; got " + inputChannels);
-        }
+    public AggregatorFunctionSupplier supplier() {
         final long unitInMillis = unitInMillis();
         final DataType type = field().dataType();
         return switch (type) {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialCentroid.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialCentroid.java
@@ -98,7 +98,7 @@ public SpatialCentroid replaceChildren(List<Expression> newChildren) {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         return switch (type) {
             case DataType.GEO_POINT -> switch (fieldExtractPreference) {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialExtent.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialExtent.java
@@ -102,7 +102,7 @@ public SpatialExtent replaceChildren(List<Expression> newChildren) {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         return switch (type) {
             case DataType.GEO_POINT -> switch (fieldExtractPreference) {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/StdDev.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/StdDev.java
@@ -96,7 +96,7 @@ public StdDev withFilter(Expression filter) {
     }
 
     @Override
-    public final AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public final AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         if (type == DataType.LONG) {
             return new StdDevLongAggregatorFunctionSupplier();
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Sum.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Sum.java
@@ -98,17 +98,17 @@ public DataType dataType() {
     }
 
     @Override
-    protected AggregatorFunctionSupplier longSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier longSupplier() {
         return new SumLongAggregatorFunctionSupplier();
     }
 
     @Override
-    protected AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier intSupplier() {
         return new SumIntAggregatorFunctionSupplier();
     }
 
     @Override
-    protected AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels) {
+    protected AggregatorFunctionSupplier doubleSupplier() {
         return new SumDoubleAggregatorFunctionSupplier();
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ToPartial.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ToPartial.java
@@ -128,8 +128,8 @@ protected NodeInfo<ToPartial> info() {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
-        final ToAggregator toAggregator = (ToAggregator) function;
+    public AggregatorFunctionSupplier supplier() {
+        final AggregatorFunctionSupplier supplier = ((ToAggregator) function).supplier();
         return new AggregatorFunctionSupplier() {
             @Override
             public List<IntermediateStateDesc> nonGroupingIntermediateStateDesc() {
@@ -155,20 +155,14 @@ public GroupingAggregatorFunction groupingAggregator(DriverContext driverContext
 
             @Override
             public Aggregator.Factory aggregatorFactory(AggregatorMode mode, List<Integer> channels) {
-                final AggregatorFunctionSupplier supplier;
-                if (mode.isInputPartial()) {
-                    try (var dummy = toAggregator.supplier(inputChannels).aggregator(DriverContext.getLocalDriver(), channels)) {
-                        var intermediateChannels = IntStream.range(0, dummy.intermediateBlockCount()).boxed().toList();
-                        supplier = toAggregator.supplier(intermediateChannels);
-                    }
-                } else {
-                    supplier = toAggregator.supplier(inputChannels);
-                }
+                List<Integer> intermediateChannels = mode.isInputPartial()
+                    ? IntStream.range(0, supplier.nonGroupingIntermediateStateDesc().size()).boxed().toList()
+                    : channels;
                 return new Aggregator.Factory() {
                     @Override
                     public Aggregator apply(DriverContext driverContext) {
-                        final AggregatorFunction aggregatorFunction = supplier.aggregator(driverContext, channels);
-                        return new Aggregator(new ToPartialAggregatorFunction(aggregatorFunction, inputChannels), mode);
+                        final AggregatorFunction aggregatorFunction = supplier.aggregator(driverContext, intermediateChannels);
+                        return new Aggregator(new ToPartialAggregatorFunction(aggregatorFunction, channels), mode);
                     }
 
                     @Override
@@ -180,21 +174,17 @@ public String describe() {
 
             @Override
             public GroupingAggregator.Factory groupingAggregatorFactory(AggregatorMode mode, List<Integer> channels) {
-                final AggregatorFunctionSupplier supplier;
-                // TODO: Improve this; now we don't have to create the aggregator
-                if (mode.isInputPartial()) {
-                    try (var dummy = toAggregator.supplier(inputChannels).aggregator(DriverContext.getLocalDriver(), channels)) {
-                        var intermediateChannels = IntStream.range(0, dummy.intermediateBlockCount()).boxed().toList();
-                        supplier = toAggregator.supplier(intermediateChannels);
-                    }
-                } else {
-                    supplier = toAggregator.supplier(inputChannels);
-                }
+                List<Integer> intermediateChannels = mode.isInputPartial()
+                    ? IntStream.range(0, supplier.nonGroupingIntermediateStateDesc().size()).boxed().toList()
+                    : channels;
                 return new GroupingAggregator.Factory() {
                     @Override
                     public GroupingAggregator apply(DriverContext driverContext) {
-                        final GroupingAggregatorFunction aggregatorFunction = supplier.groupingAggregator(driverContext, channels);
-                        return new GroupingAggregator(new ToPartialGroupingAggregatorFunction(aggregatorFunction, inputChannels), mode);
+                        final GroupingAggregatorFunction aggregatorFunction = supplier.groupingAggregator(
+                            driverContext,
+                            intermediateChannels
+                        );
+                        return new GroupingAggregator(new ToPartialGroupingAggregatorFunction(aggregatorFunction, channels), mode);
                     }
 
                     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Top.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Top.java
@@ -188,7 +188,7 @@ public Top replaceChildren(List<Expression> newChildren) {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         if (type == DataType.LONG || type == DataType.DATETIME) {
             return new TopLongAggregatorFunctionSupplier(limitValue(), orderValue());
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Values.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Values.java
@@ -124,7 +124,7 @@ protected TypeResolution resolveType() {
     }
 
     @Override
-    public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {
+    public AggregatorFunctionSupplier supplier() {
         DataType type = field().dataType();
         if (SUPPLIERS.containsKey(type) == false) {
             // If the type checking did its job, this should never happen
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AbstractPhysicalOperationProviders.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AbstractPhysicalOperationProviders.java
@@ -308,11 +308,12 @@ else if (mode == AggregatorMode.FINAL || mode == AggregatorMode.INTERMEDIATE) {
                     } else {
                         throw new EsqlIllegalArgumentException("illegal aggregation mode");
                     }
+
+                    AggregatorFunctionSupplier aggSupplier = supplier(aggregateFunction);
+
                     List<Integer> inputChannels = sourceAttr.stream().map(attr -> layout.get(attr.id()).channel()).toList();
                     assert inputChannels.stream().allMatch(i -> i >= 0) : inputChannels;
 
-                    AggregatorFunctionSupplier aggSupplier = supplier(aggregateFunction, inputChannels);
-
                     // apply the filter only in the initial phase - as the rest of the data is already filtered
                     if (aggregateFunction.hasFilter() && mode.isInputPartial() == false) {
                         EvalOperator.ExpressionEvaluator.Factory evalFactory = EvalMapper.toEvaluator(
@@ -328,9 +329,9 @@ else if (mode == AggregatorMode.FINAL || mode == AggregatorMode.INTERMEDIATE) {
         }
     }
 
-    private static AggregatorFunctionSupplier supplier(AggregateFunction aggregateFunction, List<Integer> inputChannels) {
+    private static AggregatorFunctionSupplier supplier(AggregateFunction aggregateFunction) {
         if (aggregateFunction instanceof ToAggregator delegate) {
-            return delegate.supplier(inputChannels);
+            return delegate.supplier();
         }
         throw new EsqlIllegalArgumentException("aggregate functions must extend ToAggregator");
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/ToAggregator.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/ToAggregator.java
@@ -9,11 +9,9 @@
 
 import org.elasticsearch.compute.aggregation.AggregatorFunctionSupplier;
 
-import java.util.List;
-
 /**
  * Expressions that have a mapping to an {@link AggregatorFunctionSupplier}.
  */
 public interface ToAggregator {
-    AggregatorFunctionSupplier supplier(List<Integer> inputChannels);
+    AggregatorFunctionSupplier supplier();
 }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractAggregationTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractAggregationTestCase.java
@@ -410,13 +410,13 @@ private Expression resolveSurrogates(Expression expression) {
     }
 
     private Aggregator aggregator(Expression expression, List<Integer> inputChannels, AggregatorMode mode) {
-        AggregatorFunctionSupplier aggregatorFunctionSupplier = ((ToAggregator) expression).supplier(inputChannels);
+        AggregatorFunctionSupplier aggregatorFunctionSupplier = ((ToAggregator) expression).supplier();
 
         return new Aggregator(aggregatorFunctionSupplier.aggregator(driverContext(), inputChannels), mode);
     }
 
     private GroupingAggregator groupingAggregator(Expression expression, List<Integer> inputChannels, AggregatorMode mode) {
-        AggregatorFunctionSupplier aggregatorFunctionSupplier = ((ToAggregator) expression).supplier(inputChannels);
+        AggregatorFunctionSupplier aggregatorFunctionSupplier = ((ToAggregator) expression).supplier();
 
         return new GroupingAggregator(aggregatorFunctionSupplier.groupingAggregator(driverContext(), inputChannels), mode);
     }

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ public DataType dataType() {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Override`
`129`		`- public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {`
`130`		`- return CountAggregatorFunction.supplier(inputChannels);`
	`129`	`+ public AggregatorFunctionSupplier supplier() {`
	`130`	`+ return CountAggregatorFunction.supplier();`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ protected TypeResolution resolveType() {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`@Override`
`212`		`- public AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {`
	`212`	`+ public AggregatorFunctionSupplier supplier() {`
`213`	`213`	`DataType type = field().dataType();`
`214`	`214`	`int precision = this.precision == null`
`215`	`215`	`? DEFAULT_PRECISION`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public DataType dataType() {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`@Override`
`144`		`- public final AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {`
	`144`	`+ public final AggregatorFunctionSupplier supplier() {`
`145`	`145`	`DataType type = field().dataType();`
`146`	`146`	`if (SUPPLIERS.containsKey(type) == false) {`
`147`	`147`	`// If the type checking did its job, this should never happen`
Original file line number	Diff line number	Diff line change
`@@ -99,17 +99,17 @@ public MedianAbsoluteDeviation withFilter(Expression filter) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@Override`
`102`		`- protected AggregatorFunctionSupplier longSupplier(List<Integer> inputChannels) {`
	`102`	`+ protected AggregatorFunctionSupplier longSupplier() {`
`103`	`103`	`return new MedianAbsoluteDeviationLongAggregatorFunctionSupplier();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@Override`
`107`		`- protected AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels) {`
	`107`	`+ protected AggregatorFunctionSupplier intSupplier() {`
`108`	`108`	`return new MedianAbsoluteDeviationIntAggregatorFunctionSupplier();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@Override`
`112`		`- protected AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels) {`
	`112`	`+ protected AggregatorFunctionSupplier doubleSupplier() {`
`113`	`113`	`return new MedianAbsoluteDeviationDoubleAggregatorFunctionSupplier();`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -92,26 +92,26 @@ public DataType dataType() {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`95`		`- public final AggregatorFunctionSupplier supplier(List<Integer> inputChannels) {`
	`95`	`+ public final AggregatorFunctionSupplier supplier() {`
`96`	`96`	`DataType type = field().dataType();`
`97`	`97`	`if (supportsDates() && type == DataType.DATETIME) {`
`98`		`- return longSupplier(inputChannels);`
	`98`	`+ return longSupplier();`
`99`	`99`	`}`
`100`	`100`	`if (type == DataType.LONG) {`
`101`		`- return longSupplier(inputChannels);`
	`101`	`+ return longSupplier();`
`102`	`102`	`}`
`103`	`103`	`if (type == DataType.INTEGER) {`
`104`		`- return intSupplier(inputChannels);`
	`104`	`+ return intSupplier();`
`105`	`105`	`}`
`106`	`106`	`if (type == DataType.DOUBLE) {`
`107`		`- return doubleSupplier(inputChannels);`
	`107`	`+ return doubleSupplier();`
`108`	`108`	`}`
`109`	`109`	`throw EsqlIllegalArgumentException.illegalDataType(type);`
`110`	`110`	`}`
`111`	`111`
`112`		`- protected abstract AggregatorFunctionSupplier longSupplier(List<Integer> inputChannels);`
	`112`	`+ protected abstract AggregatorFunctionSupplier longSupplier();`
`113`	`113`
`114`		`- protected abstract AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels);`
	`114`	`+ protected abstract AggregatorFunctionSupplier intSupplier();`
`115`	`115`
`116`		`- protected abstract AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels);`
	`116`	`+ protected abstract AggregatorFunctionSupplier doubleSupplier();`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,17 +156,17 @@ protected TypeResolution resolveType() {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`@Override`
`159`		`- protected AggregatorFunctionSupplier longSupplier(List<Integer> inputChannels) {`
	`159`	`+ protected AggregatorFunctionSupplier longSupplier() {`
`160`	`160`	`return new PercentileLongAggregatorFunctionSupplier(percentileValue());`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`@Override`
`164`		`- protected AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels) {`
	`164`	`+ protected AggregatorFunctionSupplier intSupplier() {`
`165`	`165`	`return new PercentileIntAggregatorFunctionSupplier(percentileValue());`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`@Override`
`169`		`- protected AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels) {`
	`169`	`+ protected AggregatorFunctionSupplier doubleSupplier() {`
`170`	`170`	`return new PercentileDoubleAggregatorFunctionSupplier(percentileValue());`
`171`	`171`	`}`
`172`	`172`