Skip to content

[SPARK-41017][SQL][FOLLOWUP] Respect the original Filter operator order #38684

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
cloud-fan wants to merge 2 commits into from
Closed

[SPARK-41017][SQL][FOLLOWUP] Respect the original Filter operator order #38684

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1044713
respect the original Filter operator order
cloud-fan Nov 17, 2022
22ef6e3
Update sql/core/src/main/scala/org/apache/spark/sql/execution/datasou…
cloud-fan Nov 17, 2022
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
5 changes: 3 additions & 2 deletions ...src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2ScanRelationPushDown.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ object V2ScanRelationPushDown extends Rule[LogicalPlan] with PredicateHelper {
val normalizedProjects = DataSourceStrategy
.normalizeExprs(project, sHolder.output)
.asInstanceOf[Seq[NamedExpression]]
val allFilters = filtersStayUp ++ filtersPushDown.reduceOption(And)
val allFilters = filtersPushDown.reduceOption(And).toSeq ++ filtersStayUp
val normalizedFilters = DataSourceStrategy.normalizeExprs(allFilters, sHolder.output)
val (scan, output) = PushDownUtils.pruneColumns(
sHolder.builder, sHolder.relation, normalizedProjects, normalizedFilters)
Expand All @@ -371,7 +371,8 @@ object V2ScanRelationPushDown extends Rule[LogicalPlan] with PredicateHelper {
}

val finalFilters = normalizedFilters.map(projectionFunc)
val withFilter = finalFilters.foldRight[LogicalPlan](scanRelation)((cond, plan) => {
// bottom-most filters are put in the left of the list.
val withFilter = finalFilters.foldLeft[LogicalPlan](scanRelation)((plan, cond) => {
Filter(cond, plan)
})

Expand Down