-
Notifications
You must be signed in to change notification settings - Fork 629
[GLUTEN-11635] Enable partial fallback if parent node supports partial fallback #11637
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.
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
Merged
jinchengchenghh
merged 4 commits into
apache:main
from
wecharyu:partial_fallback_enhence
Mar 10, 2026
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
backends-velox/src/main/scala/org/apache/gluten/extension/PartialFallback.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.spark.sql.catalyst.rules.{Rule, RuleExecutor} | ||
| import org.apache.spark.sql.execution.{GenerateExec, ProjectExec, SparkPlan} | ||
| import org.apache.spark.sql.internal.SQLConf | ||
|
|
||
| case class PartialFallbackRules() extends Rule[SparkPlan] { | ||
| override def apply(plan: SparkPlan): SparkPlan = { | ||
| new PartialFallbackRuleExecutor().execute(plan) | ||
| } | ||
|
|
||
| private class PartialFallbackRuleExecutor extends RuleExecutor[SparkPlan] { | ||
| private def fixedPoint = | ||
| FixedPoint( | ||
| SQLConf.get.optimizerMaxIterations, | ||
| maxIterationsSetting = SQLConf.OPTIMIZER_MAX_ITERATIONS.key) | ||
|
|
||
| override protected def batches: Seq[Batch] = Seq( | ||
| Batch("PartialFallback", fixedPoint, PartialProjectRule(), PartialGenerateRule())) | ||
| } | ||
| } | ||
|
|
||
| object PartialFallback { | ||
| def supportPartialFallback(plan: SparkPlan): Boolean = { | ||
| plan.isInstanceOf[ProjectExec] || | ||
| plan.isInstanceOf[GenerateExec] | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,37 +17,36 @@ | |
| package org.apache.gluten.extension | ||
|
|
||
| import org.apache.gluten.config.GlutenConfig | ||
| import org.apache.gluten.execution.ColumnarPartialProjectExec | ||
| import org.apache.gluten.execution.{ColumnarPartialProjectExec, WholeStageTransformer} | ||
| import org.apache.gluten.utils.PlanUtil | ||
|
|
||
| import org.apache.spark.sql.SparkSession | ||
| import org.apache.spark.sql.catalyst.rules.Rule | ||
| import org.apache.spark.sql.execution.{ProjectExec, SparkPlan} | ||
|
|
||
| case class PartialProjectRule(spark: SparkSession) extends Rule[SparkPlan] { | ||
| case class PartialProjectRule() extends Rule[SparkPlan] { | ||
| override def apply(plan: SparkPlan): SparkPlan = { | ||
| if (!GlutenConfig.get.enableColumnarPartialProject) { | ||
| return plan | ||
| } | ||
|
|
||
| val newPlan = plan match { | ||
| // If the root node of the plan is a ProjectExec and its child is a gluten columnar op, | ||
| // we try to add a ColumnarPartialProjectExec | ||
| case p: ProjectExec if PlanUtil.isGlutenColumnarOp(p.child) => | ||
| tryAddColumnarPartialProjectExec(p) | ||
| case _ => plan | ||
| } | ||
| // Wrap a WholeStageTransformer to check if the top node supports partial fallback. | ||
| // It will be removed afterward. | ||
| val newPlan = WholeStageTransformer(plan)(-1) | ||
|
|
||
| newPlan.transformUp { | ||
| case parent: SparkPlan | ||
| if parent.children.exists(_.isInstanceOf[ProjectExec]) && | ||
| PlanUtil.isGlutenColumnarOp(parent) => | ||
| parent.mapChildren { | ||
| case p: ProjectExec if PlanUtil.isGlutenColumnarOp(p.child) => | ||
| tryAddColumnarPartialProjectExec(p) | ||
| case other => other | ||
| } | ||
| } | ||
| newPlan | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. newPlan -> wrapped
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Addressed. |
||
| .transformUp { | ||
| case parent: SparkPlan | ||
| if parent.children.exists(_.isInstanceOf[ProjectExec]) && | ||
| (PlanUtil.isGlutenColumnarOp(parent) || PartialFallback.supportPartialFallback( | ||
| parent)) => | ||
| parent.mapChildren { | ||
| case p: ProjectExec if PlanUtil.isGlutenColumnarOp(p.child) => | ||
| tryAddColumnarPartialProjectExec(p) | ||
| case other => other | ||
| } | ||
| } | ||
| .children | ||
| .head | ||
| } | ||
|
|
||
| private def tryAddColumnarPartialProjectExec(plan: ProjectExec): SparkPlan = { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.