You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/03/30 09:57:25 UTC
[GitHub] [spark] ulysses-you opened a new pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
ulysses-you opened a new pull request #36011:
URL: https://github.com/apache/spark/pull/36011
<!--
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.
-->
Add `injectRuntimeOptimizerRule` public method in `SparkSessionExtensions`
### 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.
-->
Provide a entrance for user to play their logical plan with runtime optimizer in adaptive query execution framework.
We should follow the existed Spark session extension to allow user inject the rule.
So developers can improve the logical plan leverage accurate statistics from shuffle.
### 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'.
-->
yes, a new entrance for Spark session extension
### 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 test
--
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
[GitHub] [spark] cloud-fan commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r840299016
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/SparkSessionExtensions.scala
##########
@@ -294,4 +295,23 @@ class SparkSessionExtensions {
def injectTableFunction(functionDescription: TableFunctionDescription): Unit = {
injectedTableFunctions += functionDescription
}
+
+ private[this] val runtimeOptimizerRules = mutable.Buffer.empty[RuleBuilder]
+
+ private[sql] def buildRuntimeOptimizerRules(session: SparkSession): Seq[Rule[LogicalPlan]] = {
+ runtimeOptimizerRules.map(_.apply(session)).toSeq
+ }
+
+ /**
+ * Inject a runtime `Rule` builder into the [[SparkSession]].
+ * The injected rules will be executed once after built-in
Review comment:
We run the rules in a fixed-point batch
--
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
[GitHub] [spark] ulysses-you commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r840319427
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/internal/SessionState.scala
##########
@@ -79,7 +79,8 @@ private[sql] class SessionState(
createQueryExecution: (LogicalPlan, CommandExecutionMode.Value) => QueryExecution,
createClone: (SparkSession, SessionState) => SessionState,
val columnarRules: Seq[ColumnarRule],
- val queryStagePrepRules: Seq[Rule[SparkPlan]]) {
+ val queryStagePrepRules: Seq[Rule[SparkPlan]],
+ val runtimeOptimizerRules: Seq[Rule[LogicalPlan]]) {
Review comment:
I agree it's worth. We can collect `queryStagePrepRules` and `runtimeOptimizerRules` into a new wrapper
--
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
[GitHub] [spark] ulysses-you commented on pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on pull request #36011:
URL: https://github.com/apache/spark/pull/36011#issuecomment-1085301214
thank you @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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r841173889
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AQEOptimizer.scala
##########
@@ -28,7 +29,9 @@ import org.apache.spark.util.Utils
/**
* The optimizer for re-optimizing the logical plan used by AdaptiveSparkPlanExec.
*/
-class AQEOptimizer(conf: SQLConf) extends RuleExecutor[LogicalPlan] {
+class AQEOptimizer(session: SparkSession) extends RuleExecutor[LogicalPlan] {
Review comment:
`SparkSession` seems an overkill. Shall we narrow down and pass over `session.sessionState.adaptiveRulesHolder` only (in addition to the existing `conf`)?
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r841174227
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveRulesHolder.scala
##########
@@ -0,0 +1,30 @@
+/*
+ * 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 org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.execution.SparkPlan
+
+/**
+ * A holder to warp the SQL extension rules of adaptive query execution
+ */
+class AdaptiveRulesHolder(
Review comment:
+1 for this addition.
--
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
[GitHub] [spark] cloud-fan commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r840298886
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/SparkSessionExtensions.scala
##########
@@ -294,4 +295,23 @@ class SparkSessionExtensions {
def injectTableFunction(functionDescription: TableFunctionDescription): Unit = {
injectedTableFunctions += functionDescription
}
+
+ private[this] val runtimeOptimizerRules = mutable.Buffer.empty[RuleBuilder]
+
+ private[sql] def buildRuntimeOptimizerRules(session: SparkSession): Seq[Rule[LogicalPlan]] = {
+ runtimeOptimizerRules.map(_.apply(session)).toSeq
+ }
+
+ /**
+ * Inject a runtime `Rule` builder into the [[SparkSession]].
+ * The injected rules will be executed once after built-in
Review comment:
```suggestion
* The injected rules will be executed after built-in
```
--
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
[GitHub] [spark] cloud-fan commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r840300830
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/internal/SessionState.scala
##########
@@ -79,7 +79,8 @@ private[sql] class SessionState(
createQueryExecution: (LogicalPlan, CommandExecutionMode.Value) => QueryExecution,
createClone: (SparkSession, SessionState) => SessionState,
val columnarRules: Seq[ColumnarRule],
- val queryStagePrepRules: Seq[Rule[SparkPlan]]) {
+ val queryStagePrepRules: Seq[Rule[SparkPlan]],
+ val runtimeOptimizerRules: Seq[Rule[LogicalPlan]]) {
Review comment:
shall we have a wrapper for these custom AQE optimizations? otherwise we may keep adding new parameters here
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r841174107
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala
##########
@@ -83,7 +83,7 @@ case class AdaptiveSparkPlanExec(
@transient private val planChangeLogger = new PlanChangeLogger[SparkPlan]()
// The logical plan optimizer for re-optimizing the current logical plan.
- @transient private val optimizer = new AQEOptimizer(conf)
+ @transient private val optimizer = new AQEOptimizer(context.session)
Review comment:
```scala
- @transient private val optimizer = new AQEOptimizer(context.session)
+ @transient private val optimizer = new AQEOptimizer(conf,
session.sessionState.adaptiveRulesHolder.runtimeOptimizerRules)
```
--
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
[GitHub] [spark] ulysses-you commented on pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on pull request #36011:
URL: https://github.com/apache/spark/pull/36011#issuecomment-1083196135
cc @cloud-fan @HyukjinKwon @dongjoon-hyun
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r841176375
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/SparkSessionExtensions.scala
##########
@@ -294,4 +295,23 @@ class SparkSessionExtensions {
def injectTableFunction(functionDescription: TableFunctionDescription): Unit = {
injectedTableFunctions += functionDescription
}
+
+ private[this] val runtimeOptimizerRules = mutable.Buffer.empty[RuleBuilder]
+
+ private[sql] def buildRuntimeOptimizerRules(session: SparkSession): Seq[Rule[LogicalPlan]] = {
+ runtimeOptimizerRules.map(_.apply(session)).toSeq
+ }
+
+ /**
+ * Inject a runtime `Rule` builder into the [[SparkSession]].
+ * The injected rules will be executed after built-in
+ * [[org.apache.spark.sql.execution.adaptive.AQEOptimizer]] rules are applied.
+ * A runtime optimizer rule is used to improve the quality of a logical plan during execution
+ * which can leverage accurate statistics from shuffle.
+ *
+ * Note that, it does not work if adaptive query execution is disabled.
+ */
+ def injectRuntimeOptimizerRule(builder: RuleBuilder): Unit = {
+ runtimeOptimizerRules += builder
+ }
Review comment:
Shall we move these new additions somewhere around the exiting `queryStagePrepRuleBuilders` and `buildQueryStagePrepRules`?
--
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
[GitHub] [spark] ulysses-you commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
ulysses-you commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r840349465
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/SparkSessionExtensions.scala
##########
@@ -294,4 +295,23 @@ class SparkSessionExtensions {
def injectTableFunction(functionDescription: TableFunctionDescription): Unit = {
injectedTableFunctions += functionDescription
}
+
+ private[this] val runtimeOptimizerRules = mutable.Buffer.empty[RuleBuilder]
+
+ private[sql] def buildRuntimeOptimizerRules(session: SparkSession): Seq[Rule[LogicalPlan]] = {
+ runtimeOptimizerRules.map(_.apply(session)).toSeq
+ }
+
+ /**
+ * Inject a runtime `Rule` builder into the [[SparkSession]].
+ * The injected rules will be executed once after built-in
Review comment:
fixed
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r841173889
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AQEOptimizer.scala
##########
@@ -28,7 +29,9 @@ import org.apache.spark.util.Utils
/**
* The optimizer for re-optimizing the logical plan used by AdaptiveSparkPlanExec.
*/
-class AQEOptimizer(conf: SQLConf) extends RuleExecutor[LogicalPlan] {
+class AQEOptimizer(session: SparkSession) extends RuleExecutor[LogicalPlan] {
Review comment:
`SparkSession` seems an overkill. Shall we narrow down and pass over `session.sessionState.adaptiveRulesHolder.runtimeOptimizerRules` only (in addition to the existing `conf`)?
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #36011: [SPARK-38697][SQL] Extend SparkSessionExtensions to inject rules into AQE Optimizer
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #36011:
URL: https://github.com/apache/spark/pull/36011#discussion_r841174107
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala
##########
@@ -83,7 +83,7 @@ case class AdaptiveSparkPlanExec(
@transient private val planChangeLogger = new PlanChangeLogger[SparkPlan]()
// The logical plan optimizer for re-optimizing the current logical plan.
- @transient private val optimizer = new AQEOptimizer(conf)
+ @transient private val optimizer = new AQEOptimizer(context.session)
Review comment:
```
- @transient private val optimizer = new AQEOptimizer(context.session)
+ @transient private val optimizer = new AQEOptimizer(conf, session.sessionState.adaptiveRulesHolder.runtimeOptimizerRules)
```
--
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