Skip to content

Commit 753632d

Browse files
committed
Remove MergeOperator since it's no longer needed
1 parent 7b0aaa3 commit 753632d

File tree

2 files changed

+0
-96
lines changed

2 files changed

+0
-96
lines changed

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/MergeOperator.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.elasticsearch.compute.operator.LimitOperator;
3232
import org.elasticsearch.compute.operator.LocalSourceOperator;
3333
import org.elasticsearch.compute.operator.LocalSourceOperator.LocalSourceFactory;
34-
import org.elasticsearch.compute.operator.MergeOperator;
3534
import org.elasticsearch.compute.operator.MvExpandOperator;
3635
import org.elasticsearch.compute.operator.Operator;
3736
import org.elasticsearch.compute.operator.Operator.OperatorFactory;
@@ -103,7 +102,6 @@
103102
import org.elasticsearch.xpack.esql.plan.physical.LimitExec;
104103
import org.elasticsearch.xpack.esql.plan.physical.LocalSourceExec;
105104
import org.elasticsearch.xpack.esql.plan.physical.LookupJoinExec;
106-
import org.elasticsearch.xpack.esql.plan.physical.MergeExec;
107105
import org.elasticsearch.xpack.esql.plan.physical.MvExpandExec;
108106
import org.elasticsearch.xpack.esql.plan.physical.OutputExec;
109107
import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
@@ -281,8 +279,6 @@ else if (node instanceof OutputExec outputExec) {
281279
return planOutput(outputExec, context);
282280
} else if (node instanceof ExchangeSinkExec exchangeSink) {
283281
return planExchangeSink(exchangeSink, context);
284-
} else if (node instanceof MergeExec mergeExec) {
285-
return planMerge(mergeExec, context);
286282
} else if (node instanceof RrfScoreEvalExec rrf) {
287283
return planRrfScoreEvalExec(rrf, context);
288284
}
@@ -804,13 +800,6 @@ private PhysicalOperation planChangePoint(ChangePointExec changePoint, LocalExec
804800
);
805801
}
806802

807-
private PhysicalOperation planMerge(MergeExec mergeExec, LocalExecutionPlannerContext context) {
808-
Layout.Builder layout = new Layout.Builder();
809-
layout.append(mergeExec.output());
810-
MergeOperator.BlockSuppliers suppliers = () -> mergeExec.suppliers().stream().map(s -> s.get()).toList();
811-
return PhysicalOperation.fromSource(new MergeOperator.MergeOperatorFactory(suppliers), layout.build());
812-
}
813-
814803
/**
815804
* Immutable physical operation.
816805
*/

0 commit comments

Comments
 (0)