Skip to content

[SPARK-40193][SQL] Merge subplans with different filter conditions #55298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
peter-toth wants to merge 3 commits into from
Closed

[SPARK-40193][SQL] Merge subplans with different filter conditions #55298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f95716
[SPARK-40193][SQL] Merge subplans with different filter conditions
peter-toth Apr 10, 2026
6ab9c33
Address review comments on SPARK-40193 filter merging
peter-toth Apr 18, 2026
ea4f5b7
revert golden plan changes
peter-toth Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/MergeSubplans.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,7 @@ object MergeSubplans extends Rule[LogicalPlan] {

levelFromSubqueries = levelFromSubqueries.max(level + 1)

val mergedOutput = mergeResult.outputMap(planWithReferences.output.head)
val outputIndex =
mergeResult.mergedPlan.plan.output.indexWhere(_.exprId == mergedOutput.exprId)
val outputIndex = mergeResult.outputMap(planWithReferences.output.head)
ScalarSubqueryReference(
level,
mergeResult.mergedPlanIndex,
Expand All @@ -262,9 +260,7 @@ object MergeSubplans extends Rule[LogicalPlan] {

val mergeResult = getPlanMerger(planMergers, level).merge(aggregateWithReferences, false)

val mergedOutput = aggregateWithReferences.output.map(mergeResult.outputMap)
val outputIndices =
mergedOutput.map(a => mergeResult.mergedPlan.plan.output.indexWhere(_.exprId == a.exprId))
val outputIndices = aggregateWithReferences.output.map(mergeResult.outputMap)
val aggregateReference = NonGroupingAggregateReference(
level,
mergeResult.mergedPlanIndex,
Expand Down
Loading