You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "ulysses-you (via GitHub)" <gi...@apache.org> on 2023/11/26 03:01:35 UTC
[PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
ulysses-you opened a new pull request, #44013:
URL: https://github.com/apache/spark/pull/44013
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This pr introduces `case class AdaptiveRuleContext(isSubquery: Boolean, isFinalStage: Boolean)` which can be used inside adaptive sql extension rules through thread local, so that developers can modify the next plan fragment configs using `AdaptiveRuleContext.get()`.
To make it easy to modify the shuffle partitions config, this pr adds a new extension entrance `postPlannerStrategyRules` which will be applied between `plannerStrategy` and `queryStagePrepRules`, so it can get the whole plan before injecting exchanges.
The plan fragment configs can be propagated through multi-phases, e.g., if set a config in `postPlannerStrategyRules` then the config can be gotten in `queryStagePrepRules`, `queryStageOptimizerRules` and `columnarRules`. The configs will be cleanup before going to execute, so in next round the configs will be empty.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
To support modify the plan fragment level SQL configs through AQE rules.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
no, only affect developers.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
add new tests
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
no
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1413280745
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SQLConfHelper.scala:
##########
@@ -29,4 +30,32 @@ trait SQLConfHelper {
* See [[SQLConf.get]] for more information.
*/
def conf: SQLConf = SQLConf.get
+
+ /**
+ * Sets all SQL configurations specified in `pairs`, calls `f`, and then restores all SQL
+ * configurations.
+ */
+ protected def withSQLConf[T](pairs: (String, String)*)(f: => T): T = {
Review Comment:
I'm fine to make a new pr for it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1846243613
cc @cloud-fan , @wangyum
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411754598
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -713,10 +735,15 @@ case class AdaptiveSparkPlanExec(
private def reOptimize(logicalPlan: LogicalPlan): Option[(SparkPlan, LogicalPlan)] = {
try {
logicalPlan.invalidateStatsCache()
- val optimized = optimizer.execute(logicalPlan)
- val sparkPlan = context.session.sessionState.planner.plan(ReturnAnswer(optimized)).next()
- val newPlan = applyPhysicalRules(
- applyQueryPostPlannerStrategyRules(sparkPlan),
+ val optimized = withRuleContext {
+ optimizer.execute(logicalPlan)
+ }
Review Comment:
I'm wondering if we can make it as one-liner? Or, did `scalastyle` for `scalafmt` complain for this one-liner style?
```scala
val optimized = withRuleContext { optimizer.execute(logicalPlan) }
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1413280992
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -194,16 +212,16 @@ case class AdaptiveSparkPlanExec(
}
private def applyQueryPostPlannerStrategyRules(plan: SparkPlan): SparkPlan = {
- applyPhysicalRules(
+ applyPhysicalRulesWithRuleContext(
plan,
context.session.sessionState.adaptiveRulesHolder.queryPostPlannerStrategyRules,
- Some((planChangeLogger, "AQE Query Post Planner Strategy Rules"))
- )
+ Some((planChangeLogger, "AQE Query Post Planner Strategy Rules")))
Review Comment:
yeah, I think it's a typo when I do rebase
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1420896403
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveRuleContext.scala:
##########
@@ -0,0 +1,88 @@
+/*
+ * 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.spark.sql.execution.adaptive
+
+import scala.collection.mutable
+
+import org.apache.spark.annotation.Experimental
+import org.apache.spark.sql.catalyst.SQLConfHelper
+
+/**
+ * Provide the functionality to modify the next plan fragment configs in AQE rules.
+ * The configs will be cleanup before going to execute next plan fragment.
+ * To get instance, use: {{{ AdaptiveRuleContext.get() }}}
+ *
+ * @param isSubquery if the input query plan is subquery
+ * @param isFinalStage if the next stage is final stage
+ */
+@Experimental
+case class AdaptiveRuleContext(isSubquery: Boolean, isFinalStage: Boolean) {
+
+ /**
+ * Set SQL configs for next plan fragment. The configs will affect all of rules in AQE,
+ * i.e., the runtime optimizer, planner, queryStagePreparationRules, queryStageOptimizerRules,
+ * columnarRules.
+ * This configs will be cleared before going to get the next plan fragment.
+ */
+ private val nextPlanFragmentConf = new mutable.HashMap[String, String]()
+
+ private[sql] def withFinalStage(isFinalStage: Boolean): AdaptiveRuleContext = {
+ if (this.isFinalStage == isFinalStage) {
+ this
+ } else {
+ val newRuleContext = copy(isFinalStage = isFinalStage)
+ newRuleContext.setConfigs(this.configs())
+ newRuleContext
+ }
+ }
+
+ def setConfig(key: String, value: String): Unit = {
+ nextPlanFragmentConf.put(key, value)
+ }
+
+ def setConfigs(kvs: Map[String, String]): Unit = {
+ kvs.foreach(kv => nextPlanFragmentConf.put(kv._1, kv._2))
+ }
+
+ private[sql] def configs(): Map[String, String] = nextPlanFragmentConf.toMap
+
+ private[sql] def clearConfigs(): Unit = nextPlanFragmentConf.clear()
+}
+
+object AdaptiveRuleContext extends SQLConfHelper {
+ private val ruleContextThreadLocal = new ThreadLocal[AdaptiveRuleContext]
Review Comment:
I'm a bit worried about abusing ThreadLocal more and more, which makes the code harder to reason about.
Can we add a overload `def apply(plan: LogicalPlan, context: RuleContext)` in the `trait Rule`, which by default just ignores the context and calls the old `apply` method? Then in `AdaptiveSparkPlanExec` we always execute the rules by passing the `RuleContext`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1827025668
cc @cloud-fan @maryannxue @dongjoon-hyun if you have time to take a look at this idea, thank you.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411749965
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -194,16 +212,16 @@ case class AdaptiveSparkPlanExec(
}
private def applyQueryPostPlannerStrategyRules(plan: SparkPlan): SparkPlan = {
- applyPhysicalRules(
+ applyPhysicalRulesWithRuleContext(
plan,
context.session.sessionState.adaptiveRulesHolder.queryPostPlannerStrategyRules,
- Some((planChangeLogger, "AQE Query Post Planner Strategy Rules"))
- )
+ Some((planChangeLogger, "AQE Query Post Planner Strategy Rules")))
Review Comment:
In this case, let's recover to the old existing two lines in order to reduce the PR code diff.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411749119
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SQLConfHelper.scala:
##########
@@ -29,4 +30,32 @@ trait SQLConfHelper {
* See [[SQLConf.get]] for more information.
*/
def conf: SQLConf = SQLConf.get
+
+ /**
+ * Sets all SQL configurations specified in `pairs`, calls `f`, and then restores all SQL
+ * configurations.
+ */
+ protected def withSQLConf[T](pairs: (String, String)*)(f: => T): T = {
Review Comment:
Oh, this looks like an independent contribution too. Sorry for asking this again, but could you spin-off this too?
The new PR title could be the following, @ulysses-you .
```
Move `withSQLConf` from SQLHelper trait to `SQLConfHelper` trait
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1423311867
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveRuleContext.scala:
##########
@@ -0,0 +1,88 @@
+/*
+ * 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.spark.sql.execution.adaptive
+
+import scala.collection.mutable
+
+import org.apache.spark.annotation.Experimental
+import org.apache.spark.sql.catalyst.SQLConfHelper
+
+/**
+ * Provide the functionality to modify the next plan fragment configs in AQE rules.
+ * The configs will be cleanup before going to execute next plan fragment.
+ * To get instance, use: {{{ AdaptiveRuleContext.get() }}}
+ *
+ * @param isSubquery if the input query plan is subquery
+ * @param isFinalStage if the next stage is final stage
+ */
+@Experimental
+case class AdaptiveRuleContext(isSubquery: Boolean, isFinalStage: Boolean) {
+
+ /**
+ * Set SQL configs for next plan fragment. The configs will affect all of rules in AQE,
+ * i.e., the runtime optimizer, planner, queryStagePreparationRules, queryStageOptimizerRules,
+ * columnarRules.
+ * This configs will be cleared before going to get the next plan fragment.
+ */
+ private val nextPlanFragmentConf = new mutable.HashMap[String, String]()
+
+ private[sql] def withFinalStage(isFinalStage: Boolean): AdaptiveRuleContext = {
+ if (this.isFinalStage == isFinalStage) {
+ this
+ } else {
+ val newRuleContext = copy(isFinalStage = isFinalStage)
+ newRuleContext.setConfigs(this.configs())
+ newRuleContext
+ }
+ }
+
+ def setConfig(key: String, value: String): Unit = {
+ nextPlanFragmentConf.put(key, value)
+ }
+
+ def setConfigs(kvs: Map[String, String]): Unit = {
+ kvs.foreach(kv => nextPlanFragmentConf.put(kv._1, kv._2))
+ }
+
+ private[sql] def configs(): Map[String, String] = nextPlanFragmentConf.toMap
+
+ private[sql] def clearConfigs(): Unit = nextPlanFragmentConf.clear()
+}
+
+object AdaptiveRuleContext extends SQLConfHelper {
+ private val ruleContextThreadLocal = new ThreadLocal[AdaptiveRuleContext]
Review Comment:
Then we should also change `RuleExecutor`, `SparkStrategy` and `ColumnarRule` to pass the `RuleContext`. Does it sound good ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411756090
##########
sql/core/src/test/scala/org/apache/spark/sql/internal/ExecutorSideSQLConfSuite.scala:
##########
@@ -58,7 +58,7 @@ class ExecutorSideSQLConfSuite extends SparkFunSuite with SQLTestUtils {
}
}
- override def withSQLConf(pairs: (String, String)*)(f: => Unit): Unit = {
+ override def withSQLConf[T](pairs: (String, String)*)(f: => T): T = {
Review Comment:
I'm not sure why this is required here, but I believe this could be the perfect part of new spin-off PR, @ulysses-you .
##########
sql/core/src/test/scala/org/apache/spark/sql/test/SQLTestUtils.scala:
##########
@@ -243,7 +243,7 @@ private[sql] trait SQLTestUtilsBase
protected override def _sqlContext: SQLContext = self.spark.sqlContext
}
- protected override def withSQLConf(pairs: (String, String)*)(f: => Unit): Unit = {
+ protected override def withSQLConf[T](pairs: (String, String)*)(f: => T): T = {
Review Comment:
ditto.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1835663567
To @ulysses-you , could you address the second-round review comments, please?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1413283368
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -194,16 +212,16 @@ case class AdaptiveSparkPlanExec(
}
private def applyQueryPostPlannerStrategyRules(plan: SparkPlan): SparkPlan = {
- applyPhysicalRules(
+ applyPhysicalRulesWithRuleContext(
plan,
context.session.sessionState.adaptiveRulesHolder.queryPostPlannerStrategyRules,
- Some((planChangeLogger, "AQE Query Post Planner Strategy Rules"))
- )
+ Some((planChangeLogger, "AQE Query Post Planner Strategy Rules")))
}
@transient val initialPlan = context.session.withActive {
- applyPhysicalRules(
- applyQueryPostPlannerStrategyRules(inputPlan),
+ val planWithPostPlannerStrategy = applyQueryPostPlannerStrategyRules(inputPlan)
+ applyPhysicalRulesWithRuleContext(
+ planWithPostPlannerStrategy,
Review Comment:
It is required. We need to propagate the configs to the next rules, so we should make code like:
```
val x = withContext {}
val y = withContext {}
```
instead of
```
val x = withContext {
withContext {}
}
```
I will make it more clearer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411753257
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -364,11 +383,14 @@ case class AdaptiveSparkPlanExec(
result = createQueryStages(currentPhysicalPlan)
}
+ ruleContext = ruleContext.withFinalStage(isFinalStage = true)
+ val planWithOptimizeQueryStage = optimizeQueryStage(result.newPlan, isFinalStage = true)
Review Comment:
Is this used in somewhere else? Otherwise, let's not define a new one~
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411756239
##########
sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveSerDeSuite.scala:
##########
@@ -84,7 +84,7 @@ class HiveSerDeSuite extends HiveComparisonTest with PlanTest with BeforeAndAfte
}
// Make sure we set the config values to TestHive.conf.
- override def withSQLConf(pairs: (String, String)*)(f: => Unit): Unit =
+ override def withSQLConf[T](pairs: (String, String)*)(f: => T): T =
Review Comment:
ditto.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1837875645
I merged it. Could you rebase this PR, @ulysses-you ? 😄
- #44142
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1413283368
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -194,16 +212,16 @@ case class AdaptiveSparkPlanExec(
}
private def applyQueryPostPlannerStrategyRules(plan: SparkPlan): SparkPlan = {
- applyPhysicalRules(
+ applyPhysicalRulesWithRuleContext(
plan,
context.session.sessionState.adaptiveRulesHolder.queryPostPlannerStrategyRules,
- Some((planChangeLogger, "AQE Query Post Planner Strategy Rules"))
- )
+ Some((planChangeLogger, "AQE Query Post Planner Strategy Rules")))
}
@transient val initialPlan = context.session.withActive {
- applyPhysicalRules(
- applyQueryPostPlannerStrategyRules(inputPlan),
+ val planWithPostPlannerStrategy = applyQueryPostPlannerStrategyRules(inputPlan)
+ applyPhysicalRulesWithRuleContext(
+ planWithPostPlannerStrategy,
Review Comment:
It is required. We need to propagate the configs to the next rules, so we should make code like:
```
val x = withContext {}
val y = withContext {}
```
instead of
```
val x = withContext {
withContext {}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411755058
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -713,10 +735,15 @@ case class AdaptiveSparkPlanExec(
private def reOptimize(logicalPlan: LogicalPlan): Option[(SparkPlan, LogicalPlan)] = {
try {
logicalPlan.invalidateStatsCache()
- val optimized = optimizer.execute(logicalPlan)
- val sparkPlan = context.session.sessionState.planner.plan(ReturnAnswer(optimized)).next()
- val newPlan = applyPhysicalRules(
- applyQueryPostPlannerStrategyRules(sparkPlan),
+ val optimized = withRuleContext {
+ optimizer.execute(logicalPlan)
+ }
+ val sparkPlan = withRuleContext {
+ context.session.sessionState.planner.plan(ReturnAnswer(optimized)).next()
+ }
+ val planWithPostPlannerStrategy = applyQueryPostPlannerStrategyRules(sparkPlan)
Review Comment:
Ditto. If possible, let's avoid new one-time variable.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1837735524
thank you @dongjoon-hyun, will rebase and address comments after https://github.com/apache/spark/pull/44142
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1837910213
thank you @dongjoon-hyun it's done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-2014093249
We're closing this PR because it hasn't been updated in a while. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable.
If you'd like to revive this PR, please reopen it and ask a committer to remove the Stale tag!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1851348137
> @beliefer for example, change the initial shuffle partition number per plan fragment to avoid too big or too small, change the advisory partition size according to the feature of plan fragment(small for generate, big for filter).
Thank you for explanation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1851269758
@beliefer for example, change the initial shuffle partition number per plan fragment to avoid too big or too small, change the advisory partition size according to the feature of plan fragment(small for generate, big for filter).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1423311867
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveRuleContext.scala:
##########
@@ -0,0 +1,88 @@
+/*
+ * 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.spark.sql.execution.adaptive
+
+import scala.collection.mutable
+
+import org.apache.spark.annotation.Experimental
+import org.apache.spark.sql.catalyst.SQLConfHelper
+
+/**
+ * Provide the functionality to modify the next plan fragment configs in AQE rules.
+ * The configs will be cleanup before going to execute next plan fragment.
+ * To get instance, use: {{{ AdaptiveRuleContext.get() }}}
+ *
+ * @param isSubquery if the input query plan is subquery
+ * @param isFinalStage if the next stage is final stage
+ */
+@Experimental
+case class AdaptiveRuleContext(isSubquery: Boolean, isFinalStage: Boolean) {
+
+ /**
+ * Set SQL configs for next plan fragment. The configs will affect all of rules in AQE,
+ * i.e., the runtime optimizer, planner, queryStagePreparationRules, queryStageOptimizerRules,
+ * columnarRules.
+ * This configs will be cleared before going to get the next plan fragment.
+ */
+ private val nextPlanFragmentConf = new mutable.HashMap[String, String]()
+
+ private[sql] def withFinalStage(isFinalStage: Boolean): AdaptiveRuleContext = {
+ if (this.isFinalStage == isFinalStage) {
+ this
+ } else {
+ val newRuleContext = copy(isFinalStage = isFinalStage)
+ newRuleContext.setConfigs(this.configs())
+ newRuleContext
+ }
+ }
+
+ def setConfig(key: String, value: String): Unit = {
+ nextPlanFragmentConf.put(key, value)
+ }
+
+ def setConfigs(kvs: Map[String, String]): Unit = {
+ kvs.foreach(kv => nextPlanFragmentConf.put(kv._1, kv._2))
+ }
+
+ private[sql] def configs(): Map[String, String] = nextPlanFragmentConf.toMap
+
+ private[sql] def clearConfigs(): Unit = nextPlanFragmentConf.clear()
+}
+
+object AdaptiveRuleContext extends SQLConfHelper {
+ private val ruleContextThreadLocal = new ThreadLocal[AdaptiveRuleContext]
Review Comment:
Then we should also change `SparkStrategy` and `RuleExecutor` to pass the `RuleContext`. Does it sound good ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on PR #44013:
URL: https://github.com/apache/spark/pull/44013#issuecomment-1851218457
@ulysses-you Could you explain what scenario would require adjusting the SQL configs segment by segment? I'm just out of curiosity.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46090][SQL] Support plan fragment level SQL configs in AQE [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44013:
URL: https://github.com/apache/spark/pull/44013#discussion_r1411752514
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -194,16 +212,16 @@ case class AdaptiveSparkPlanExec(
}
private def applyQueryPostPlannerStrategyRules(plan: SparkPlan): SparkPlan = {
- applyPhysicalRules(
+ applyPhysicalRulesWithRuleContext(
plan,
context.session.sessionState.adaptiveRulesHolder.queryPostPlannerStrategyRules,
- Some((planChangeLogger, "AQE Query Post Planner Strategy Rules"))
- )
+ Some((planChangeLogger, "AQE Query Post Planner Strategy Rules")))
}
@transient val initialPlan = context.session.withActive {
- applyPhysicalRules(
- applyQueryPostPlannerStrategyRules(inputPlan),
+ val planWithPostPlannerStrategy = applyQueryPostPlannerStrategyRules(inputPlan)
+ applyPhysicalRulesWithRuleContext(
+ planWithPostPlannerStrategy,
Review Comment:
Shall we change like the following simply by avoiding one-time used variable, `val planWithPostPlannerStrategy`?
```scala
- applyPhysicalRules(
+ applyPhysicalRulesWithRuleContext(
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org