@@ -155,7 +155,7 @@ private static Operator operator(DriverContext driverContext, String grouping, S
155155
156156 if (grouping .equals ("none" )) {
157157 return new AggregationOperator (
158- List .of (supplier (op , dataType , filter , 0 ).aggregatorFactory (AggregatorMode .SINGLE ).apply (driverContext )),
158+ List .of (supplier (op , dataType , filter ).aggregatorFactory (AggregatorMode .SINGLE , List . of ( 0 ) ).apply (driverContext )),
159159 driverContext
160160 );
161161 }
@@ -182,33 +182,33 @@ private static Operator operator(DriverContext driverContext, String grouping, S
182182 default -> throw new IllegalArgumentException ("unsupported grouping [" + grouping + "]" );
183183 };
184184 return new HashAggregationOperator (
185- List .of (supplier (op , dataType , filter , groups .size ()). groupingAggregatorFactory ( AggregatorMode . SINGLE )),
185+ List .of (supplier (op , dataType , filter ). groupingAggregatorFactory ( AggregatorMode . SINGLE , List . of ( groups .size ()))),
186186 () -> BlockHash .build (groups , driverContext .blockFactory (), 16 * 1024 , false ),
187187 driverContext
188188 );
189189 }
190190
191- private static AggregatorFunctionSupplier supplier (String op , String dataType , String filter , int dataChannel ) {
191+ private static AggregatorFunctionSupplier supplier (String op , String dataType , String filter ) {
192192 return filtered (switch (op ) {
193- case COUNT -> CountAggregatorFunction .supplier (List . of ( dataChannel ) );
193+ case COUNT -> CountAggregatorFunction .supplier ();
194194 case COUNT_DISTINCT -> switch (dataType ) {
195- case LONGS -> new CountDistinctLongAggregatorFunctionSupplier (List . of ( dataChannel ), 3000 );
196- case DOUBLES -> new CountDistinctDoubleAggregatorFunctionSupplier (List . of ( dataChannel ), 3000 );
195+ case LONGS -> new CountDistinctLongAggregatorFunctionSupplier (3000 );
196+ case DOUBLES -> new CountDistinctDoubleAggregatorFunctionSupplier (3000 );
197197 default -> throw new IllegalArgumentException ("unsupported data type [" + dataType + "]" );
198198 };
199199 case MAX -> switch (dataType ) {
200- case LONGS -> new MaxLongAggregatorFunctionSupplier (List . of ( dataChannel ) );
201- case DOUBLES -> new MaxDoubleAggregatorFunctionSupplier (List . of ( dataChannel ) );
200+ case LONGS -> new MaxLongAggregatorFunctionSupplier ();
201+ case DOUBLES -> new MaxDoubleAggregatorFunctionSupplier ();
202202 default -> throw new IllegalArgumentException ("unsupported data type [" + dataType + "]" );
203203 };
204204 case MIN -> switch (dataType ) {
205- case LONGS -> new MinLongAggregatorFunctionSupplier (List . of ( dataChannel ) );
206- case DOUBLES -> new MinDoubleAggregatorFunctionSupplier (List . of ( dataChannel ) );
205+ case LONGS -> new MinLongAggregatorFunctionSupplier ();
206+ case DOUBLES -> new MinDoubleAggregatorFunctionSupplier ();
207207 default -> throw new IllegalArgumentException ("unsupported data type [" + dataType + "]" );
208208 };
209209 case SUM -> switch (dataType ) {
210- case LONGS -> new SumLongAggregatorFunctionSupplier (List . of ( dataChannel ) );
211- case DOUBLES -> new SumDoubleAggregatorFunctionSupplier (List . of ( dataChannel ) );
210+ case LONGS -> new SumLongAggregatorFunctionSupplier ();
211+ case DOUBLES -> new SumDoubleAggregatorFunctionSupplier ();
212212 default -> throw new IllegalArgumentException ("unsupported data type [" + dataType + "]" );
213213 };
214214 default -> throw new IllegalArgumentException ("unsupported op [" + op + "]" );
0 commit comments