Included ShardContext list into LocalExecutionPlannerContext

Author: carlosdelest

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AbstractPhysicalOperationProviders.java

@@ -60,8 +60,7 @@ public abstract class AbstractPhysicalOperationProviders implements PhysicalOper
     public final PhysicalOperation groupingPhysicalOperation(
         AggregateExec aggregateExec,
         PhysicalOperation source,
-        LocalExecutionPlannerContext context,
-        List<EsPhysicalOperationProviders.ShardContext> shardContexts
+        LocalExecutionPlannerContext context
     ) {
         // The layout this operation will produce.
         Layout.Builder layout = new Layout.Builder();
@@ -96,8 +95,7 @@ public final PhysicalOperation groupingPhysicalOperation(
                 aggregatorMode,
                 sourceLayout,
                 false, // non-grouping
-                s -> aggregatorFactories.add(s.supplier.aggregatorFactory(s.mode, s.channels)),
-                shardContexts
+                s -> aggregatorFactories.add(s.supplier.aggregatorFactory(s.mode, s.channels))
             );
 
             if (aggregatorFactories.isEmpty() == false) {
@@ -171,8 +169,7 @@ else if (aggregatorMode.isOutputPartial()) {
                 aggregatorMode,
                 sourceLayout,
                 true, // grouping
-                s -> aggregatorFactories.add(s.supplier.groupingAggregatorFactory(s.mode, s.channels)),
-                shardContexts
+                s -> aggregatorFactories.add(s.supplier.groupingAggregatorFactory(s.mode, s.channels))
             );
 
             if (groupSpecs.size() == 1 && groupSpecs.get(0).channel == null) {
@@ -262,8 +259,7 @@ private void aggregatesToFactory(
         AggregatorMode mode,
         Layout layout,
         boolean grouping,
-        Consumer<AggFunctionSupplierContext> consumer,
-        List<EsPhysicalOperationProviders.ShardContext> shardContexts
+        Consumer<AggFunctionSupplierContext> consumer
     ) {
         // extract filtering channels - and wrap the aggregation with the new evaluator expression only during the init phase
         for (NamedExpression ne : aggregates) {
@@ -323,8 +319,7 @@ else if (mode == AggregatorMode.FINAL || mode == AggregatorMode.INTERMEDIATE) {
                         EvalOperator.ExpressionEvaluator.Factory evalFactory = EvalMapper.toEvaluator(
                             foldContext,
                             aggregateFunction.filter(),
-                            layout,
-                            shardContexts
+                            layout
                         );
                         aggSupplier = new FilteredAggregatorFunctionSupplier(aggSupplier, evalFactory);
                     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java

@@ -189,7 +189,8 @@ public LocalExecutionPlan plan(String description, FoldContext foldCtx, Physical
             bigArrays,
             blockFactory,
             foldCtx,
-            settings
+            settings,
+            shardContexts
         );
 
         // workaround for https://github.com/elastic/elasticsearch/issues/99782
@@ -308,7 +309,7 @@ private PhysicalOperation planRrfScoreEvalExec(RrfScoreEvalExec rrf, LocalExecut
 
     private PhysicalOperation planAggregation(AggregateExec aggregate, LocalExecutionPlannerContext context) {
         var source = plan(aggregate.child(), context);
-        return physicalOperationProviders.groupingPhysicalOperation(aggregate, source, context, shardContexts);
+        return physicalOperationProviders.groupingPhysicalOperation(aggregate, source, context);
     }
 
     private PhysicalOperation planEsQueryNode(EsQueryExec esQueryExec, LocalExecutionPlannerContext context) {
@@ -895,7 +896,8 @@ public record LocalExecutionPlannerContext(
         BigArrays bigArrays,
         BlockFactory blockFactory,
         FoldContext foldCtx,
-        Settings settings
+        Settings settings,
+        List<EsPhysicalOperationProviders.ShardContext> shardContexts
     ) {
         void addDriverFactory(DriverFactory driverFactory) {
             driverFactories.add(driverFactory);

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PhysicalOperationProviders.java

@@ -13,8 +13,6 @@
 import org.elasticsearch.xpack.esql.planner.LocalExecutionPlanner.LocalExecutionPlannerContext;
 import org.elasticsearch.xpack.esql.planner.LocalExecutionPlanner.PhysicalOperation;
 
-import java.util.List;
-
 interface PhysicalOperationProviders {
     PhysicalOperation fieldExtractPhysicalOperation(FieldExtractExec fieldExtractExec, PhysicalOperation source);
 
@@ -23,7 +21,6 @@ interface PhysicalOperationProviders {
     PhysicalOperation groupingPhysicalOperation(
         AggregateExec aggregateExec,
         PhysicalOperation source,
-        LocalExecutionPlannerContext context,
-        List<EsPhysicalOperationProviders.ShardContext> shardContexts
+        LocalExecutionPlannerContext context
     );
 }