File tree Expand file tree Collapse file tree 2 files changed +1
-10
lines changed
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner Expand file tree Collapse file tree 2 files changed +1
-10
lines changed Original file line number Diff line number Diff line change 33
33
import org .elasticsearch .xpack .esql .expression .function .aggregate .Count ;
34
34
import org .elasticsearch .xpack .esql .expression .function .grouping .Categorize ;
35
35
import org .elasticsearch .xpack .esql .plan .physical .AggregateExec ;
36
- import org .elasticsearch .xpack .esql .plan .physical .ExchangeSourceExec ;
37
36
import org .elasticsearch .xpack .esql .planner .LocalExecutionPlanner .LocalExecutionPlannerContext ;
38
37
import org .elasticsearch .xpack .esql .planner .LocalExecutionPlanner .PhysicalOperation ;
39
38
@@ -70,14 +69,6 @@ public final PhysicalOperation groupingPhysicalOperation(
70
69
71
70
var sourceLayout = source .layout ;
72
71
73
- if (aggregatorMode != AggregatorMode .INITIAL && aggregatorMode != AggregatorMode .FINAL ) {
74
- assert false : "Invalid aggregator mode [" + aggregatorMode + "]" ;
75
- }
76
- if (aggregatorMode == AggregatorMode .INITIAL && aggregateExec .child () instanceof ExchangeSourceExec ) {
77
- // the reducer step at data node (local) level
78
- aggregatorMode = AggregatorMode .INTERMEDIATE ;
79
- }
80
-
81
72
if (aggregateExec .groupings ().isEmpty ()) {
82
73
// not grouping
83
74
List <Aggregator .Factory > aggregatorFactories = new ArrayList <>();
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ public static PhysicalPlan reductionPlan(PhysicalPlan plan) {
99
99
final LocalMapper mapper = new LocalMapper ();
100
100
PhysicalPlan reducePlan = mapper .map (pipelineBreaker );
101
101
if (reducePlan instanceof AggregateExec agg ) {
102
- reducePlan = agg .withMode (AggregatorMode .INITIAL ); // force to emit intermediate outputs
102
+ reducePlan = agg .withMode (AggregatorMode .INTERMEDIATE );
103
103
}
104
104
return EstimatesRowSize .estimateRowSize (fragment .estimatedRowSize (), reducePlan );
105
105
}
You can’t perform that action at this time.
0 commit comments