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 2024/02/27 09:44:32 UTC
[PR] [SPARK-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
ulysses-you opened a new pull request, #45282:
URL: https://github.com/apache/spark/pull/45282
<!--
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
'common/utils/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 overrides `AdaptiveSparkPlanExec#clone` to make the cloned plan preserve the final plan, so that when we clone plan inside table cache, we can get the final plan.
### 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 fix the issue [SPARK-47177](https://issues.apache.org/jira/browse/SPARK-47177)
### 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, affect plan explain
### 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
### 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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1510653381
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/ExplainUtils.scala:
##########
@@ -76,7 +76,7 @@ object ExplainUtils extends AdaptiveSparkPlanHelper {
* 1. Generates the explain output for the input plan excluding the subquery plans.
* 2. Generates the explain output for each subquery referenced in the plan.
*/
- def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = {
+ def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = synchronized {
Review Comment:
`children` is `def` too, but I don't see we create local variables...
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1510612237
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala:
##########
@@ -1009,18 +1009,19 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]]
append(str)
append("\n")
- if (innerChildren.nonEmpty) {
+ val innerChildrenLocal = innerChildren
Review Comment:
why do we need a new local 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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1966306730
Do we have golden files for ensuring the plan stability in this senario？
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1977837540
@dongjoon-hyun there are some conflicts, I created a new pr https://github.com/apache/spark/pull/45381 for branch-3.4
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1505216648
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -87,7 +87,7 @@ case class AdaptiveSparkPlanExec(
// The logical plan optimizer for re-optimizing the current logical plan.
@transient private val optimizer = new AQEOptimizer(conf,
- session.sessionState.adaptiveRulesHolder.runtimeOptimizerRules)
+ context.session.sessionState.adaptiveRulesHolder.runtimeOptimizerRules)
Review Comment:
I face an issue so change this
```
py4j.protocol.Py4JJavaError: An error occurred while calling o6764.fit.
: java.lang.NullPointerException: Cannot invoke "org.apache.spark.sql.SparkSession.sessionState()" because the return value of "org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.session()" is null
at org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.<init>(AdaptiveSparkPlanExec.scala:90)
at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77)
at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)
at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:480)
at org.apache.spark.sql.catalyst.trees.TreeNode.$anonfun$makeCopy$6(TreeNode.scala:743)
at org.apache.spark.sql.catalyst.trees.CurrentOrigin$.withOrigin(origin.scala:83)
at org.apache.spark.sql.catalyst.trees.TreeNode.makeCopy(TreeNode.scala:742)
at org.apache.spark.sql.catalyst.trees.TreeNode.clone(TreeNode.scala:798)
at org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.clone(AdaptiveSparkPlanExec.scala:502)
at org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.clone(AdaptiveSparkPlanExec.scala:67)
at org.apache.spark.sql.execution.columnar.InMemoryRelation.innerChildren(InMemoryRelation.scala:418)
at org.apache.spark.sql.catalyst.trees.TreeNode.generateTreeString(TreeNode.scala:1012)
```
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you closed pull request #45282: [SPARK-47177][SQL] Cached SQL plan do not display final AQE plan in explain string
URL: https://github.com/apache/spark/pull/45282
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1975770696
I think we can't remove the mutable states (TreeNodeTag) any time soon, we must live with it and the call sites should be careful when setting it. For EXPLAIN, my preference is to have a string formatter to produce EXPLAIN result, and the formatter implementation uses the visitor pattern and maintains states by itself, instead of using TreeNodeTag. But it's going to be a big change and I'm find with this short term fix by using lock.
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1510631629
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/ExplainUtils.scala:
##########
@@ -76,7 +76,7 @@ object ExplainUtils extends AdaptiveSparkPlanHelper {
* 1. Generates the explain output for the input plan excluding the subquery plans.
* 2. Generates the explain output for each subquery referenced in the plan.
*/
- def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = {
+ def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = synchronized {
Review Comment:
added comment
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1505216648
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala:
##########
@@ -87,7 +87,7 @@ case class AdaptiveSparkPlanExec(
// The logical plan optimizer for re-optimizing the current logical plan.
@transient private val optimizer = new AQEOptimizer(conf,
- session.sessionState.adaptiveRulesHolder.runtimeOptimizerRules)
+ context.session.sessionState.adaptiveRulesHolder.runtimeOptimizerRules)
Review Comment:
I face an issue so change this
```
py4j.protocol.Py4JJavaError: An error occurred while calling o6764.fit.
: java.lang.NullPointerException: Cannot invoke "org.apache.spark.sql.SparkSession.sessionState()" because the return value of "org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.session()" is null
at org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.<init>(AdaptiveSparkPlanExec.scala:90)
at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77)
at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)
at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:480)
at org.apache.spark.sql.catalyst.trees.TreeNode.$anonfun$makeCopy$6(TreeNode.scala:743)
at org.apache.spark.sql.catalyst.trees.CurrentOrigin$.withOrigin(origin.scala:83)
at org.apache.spark.sql.catalyst.trees.TreeNode.makeCopy(TreeNode.scala:742)
at org.apache.spark.sql.catalyst.trees.TreeNode.clone(TreeNode.scala:798)
at org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.clone(AdaptiveSparkPlanExec.scala:502)
at org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanExec.clone(AdaptiveSparkPlanExec.scala:67)
at org.apache.spark.sql.execution.columnar.InMemoryRelation.innerChildren(InMemoryRelation.scala:418)
at org.apache.spark.sql.catalyst.trees.TreeNode.generateTreeString(TreeNode.scala:1012)
```
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1977838135
Thank you! That's better and safe.
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1510625804
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala:
##########
@@ -1009,18 +1009,19 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]]
append(str)
append("\n")
- if (innerChildren.nonEmpty) {
+ val innerChildrenLocal = innerChildren
Review Comment:
it is possbile innerChildren is not a variable, it is defined as `def innerChildren`
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1510653381
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/ExplainUtils.scala:
##########
@@ -76,7 +76,7 @@ object ExplainUtils extends AdaptiveSparkPlanHelper {
* 1. Generates the explain output for the input plan excluding the subquery plans.
* 2. Generates the explain output for each subquery referenced in the plan.
*/
- def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = {
+ def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = synchronized {
Review Comment:
`children` is `def` too, but I don't see we create local variables...
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1966319989
It seems we did not have golden files for cache related query..
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1968017384
cc @cloud-fan as well
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1510653731
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala:
##########
@@ -1009,18 +1009,19 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]]
append(str)
append("\n")
- if (innerChildren.nonEmpty) {
+ val innerChildrenLocal = innerChildren
Review Comment:
`children` is `def` too, but I don't see we create local variables...
Anyway, this is safer, I'm fine with 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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1511998525
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/InMemoryRelationSuite.scala:
##########
@@ -18,27 +18,42 @@
package org.apache.spark.sql.execution.columnar
import org.apache.spark.SparkFunSuite
+import org.apache.spark.sql.execution.SparkPlan
+import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
+import org.apache.spark.sql.functions.expr
import org.apache.spark.sql.test.SharedSparkSessionBase
import org.apache.spark.storage.StorageLevel
-class InMemoryRelationSuite extends SparkFunSuite with SharedSparkSessionBase {
- test("SPARK-43157: Clone innerChildren cached plan") {
- val d = spark.range(1)
- val relation = InMemoryRelation(StorageLevel.MEMORY_ONLY, d.queryExecution, None)
- val cloned = relation.clone().asInstanceOf[InMemoryRelation]
-
- val relationCachedPlan = relation.innerChildren.head
- val clonedCachedPlan = cloned.innerChildren.head
-
- // verify the plans are not the same object but are logically equivalent
- assert(!relationCachedPlan.eq(clonedCachedPlan))
- assert(relationCachedPlan === clonedCachedPlan)
- }
+class InMemoryRelationSuite extends SparkFunSuite
+ with SharedSparkSessionBase with AdaptiveSparkPlanHelper {
test("SPARK-46779: InMemoryRelations with the same cached plan are semantically equivalent") {
val d = spark.range(1)
val r1 = InMemoryRelation(StorageLevel.MEMORY_ONLY, d.queryExecution, None)
val r2 = r1.withOutput(r1.output.map(_.newInstance()))
assert(r1.sameResult(r2))
}
+
+ test("SPARK-47177: Cached SQL plan do not display final AQE plan in explain string") {
+ def findIMRInnerChild(p: SparkPlan): SparkPlan = {
+ val tableCache = find(p) {
+ case _: InMemoryTableScanExec => true
+ case _ => false
+ }
+ assert(tableCache.isDefined)
+ tableCache.get.asInstanceOf[InMemoryTableScanExec].relation.innerChildren.head
+ }
+
+ val d1 = spark.range(1).withColumn("key", expr("id % 100"))
+ .groupBy("key").agg(Map("key" -> "count"))
+ val cached_d2 = d1.cache()
+ val df = cached_d2.withColumn("key2", expr("key % 10"))
+ .groupBy("key2").agg(Map("key2" -> "count"))
+
+ assert(findIMRInnerChild(df.queryExecution.executedPlan).treeString
+ .contains("AdaptiveSparkPlan isFinalPlan=false"))
+ df.collect()
+ assert(findIMRInnerChild(df.queryExecution.executedPlan).treeString
Review Comment:
it would not contain outer plan, the tree string is from InMemoryRelation.innerChildren
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "liuzqt (via GitHub)" <gi...@apache.org>.
liuzqt commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1511610145
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/InMemoryRelationSuite.scala:
##########
@@ -18,27 +18,42 @@
package org.apache.spark.sql.execution.columnar
import org.apache.spark.SparkFunSuite
+import org.apache.spark.sql.execution.SparkPlan
+import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
+import org.apache.spark.sql.functions.expr
import org.apache.spark.sql.test.SharedSparkSessionBase
import org.apache.spark.storage.StorageLevel
-class InMemoryRelationSuite extends SparkFunSuite with SharedSparkSessionBase {
- test("SPARK-43157: Clone innerChildren cached plan") {
- val d = spark.range(1)
- val relation = InMemoryRelation(StorageLevel.MEMORY_ONLY, d.queryExecution, None)
- val cloned = relation.clone().asInstanceOf[InMemoryRelation]
-
- val relationCachedPlan = relation.innerChildren.head
- val clonedCachedPlan = cloned.innerChildren.head
-
- // verify the plans are not the same object but are logically equivalent
- assert(!relationCachedPlan.eq(clonedCachedPlan))
- assert(relationCachedPlan === clonedCachedPlan)
- }
+class InMemoryRelationSuite extends SparkFunSuite
+ with SharedSparkSessionBase with AdaptiveSparkPlanHelper {
test("SPARK-46779: InMemoryRelations with the same cached plan are semantically equivalent") {
val d = spark.range(1)
val r1 = InMemoryRelation(StorageLevel.MEMORY_ONLY, d.queryExecution, None)
val r2 = r1.withOutput(r1.output.map(_.newInstance()))
assert(r1.sameResult(r2))
}
+
+ test("SPARK-47177: Cached SQL plan do not display final AQE plan in explain string") {
+ def findIMRInnerChild(p: SparkPlan): SparkPlan = {
+ val tableCache = find(p) {
+ case _: InMemoryTableScanExec => true
+ case _ => false
+ }
+ assert(tableCache.isDefined)
+ tableCache.get.asInstanceOf[InMemoryTableScanExec].relation.innerChildren.head
+ }
+
+ val d1 = spark.range(1).withColumn("key", expr("id % 100"))
+ .groupBy("key").agg(Map("key" -> "count"))
+ val cached_d2 = d1.cache()
+ val df = cached_d2.withColumn("key2", expr("key % 10"))
+ .groupBy("key2").agg(Map("key2" -> "count"))
+
+ assert(findIMRInnerChild(df.queryExecution.executedPlan).treeString
+ .contains("AdaptiveSparkPlan isFinalPlan=false"))
+ df.collect()
+ assert(findIMRInnerChild(df.queryExecution.executedPlan).treeString
Review Comment:
better to assert tree doesn't not contains any `AdaptiveSparkPlan isFinalPlan=false`. See the problematic treeString in https://issues.apache.org/jira/browse/SPARK-47177 also has a `isFinalPlan=true` in outer AQE plan, and a `isFinalPlan=false` in the inner AQE cached plan.
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "liuzqt (via GitHub)" <gi...@apache.org>.
liuzqt commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1512035940
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/InMemoryRelationSuite.scala:
##########
@@ -18,27 +18,42 @@
package org.apache.spark.sql.execution.columnar
import org.apache.spark.SparkFunSuite
+import org.apache.spark.sql.execution.SparkPlan
+import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
+import org.apache.spark.sql.functions.expr
import org.apache.spark.sql.test.SharedSparkSessionBase
import org.apache.spark.storage.StorageLevel
-class InMemoryRelationSuite extends SparkFunSuite with SharedSparkSessionBase {
- test("SPARK-43157: Clone innerChildren cached plan") {
- val d = spark.range(1)
- val relation = InMemoryRelation(StorageLevel.MEMORY_ONLY, d.queryExecution, None)
- val cloned = relation.clone().asInstanceOf[InMemoryRelation]
-
- val relationCachedPlan = relation.innerChildren.head
- val clonedCachedPlan = cloned.innerChildren.head
-
- // verify the plans are not the same object but are logically equivalent
- assert(!relationCachedPlan.eq(clonedCachedPlan))
- assert(relationCachedPlan === clonedCachedPlan)
- }
+class InMemoryRelationSuite extends SparkFunSuite
+ with SharedSparkSessionBase with AdaptiveSparkPlanHelper {
test("SPARK-46779: InMemoryRelations with the same cached plan are semantically equivalent") {
val d = spark.range(1)
val r1 = InMemoryRelation(StorageLevel.MEMORY_ONLY, d.queryExecution, None)
val r2 = r1.withOutput(r1.output.map(_.newInstance()))
assert(r1.sameResult(r2))
}
+
+ test("SPARK-47177: Cached SQL plan do not display final AQE plan in explain string") {
+ def findIMRInnerChild(p: SparkPlan): SparkPlan = {
+ val tableCache = find(p) {
+ case _: InMemoryTableScanExec => true
+ case _ => false
+ }
+ assert(tableCache.isDefined)
+ tableCache.get.asInstanceOf[InMemoryTableScanExec].relation.innerChildren.head
+ }
+
+ val d1 = spark.range(1).withColumn("key", expr("id % 100"))
+ .groupBy("key").agg(Map("key" -> "count"))
+ val cached_d2 = d1.cache()
+ val df = cached_d2.withColumn("key2", expr("key % 10"))
+ .groupBy("key2").agg(Map("key2" -> "count"))
+
+ assert(findIMRInnerChild(df.queryExecution.executedPlan).treeString
+ .contains("AdaptiveSparkPlan isFinalPlan=false"))
+ df.collect()
+ assert(findIMRInnerChild(df.queryExecution.executedPlan).treeString
Review Comment:
I see, thanks!
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45282:
URL: https://github.com/apache/spark/pull/45282#discussion_r1510609021
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/ExplainUtils.scala:
##########
@@ -76,7 +76,7 @@ object ExplainUtils extends AdaptiveSparkPlanHelper {
* 1. Generates the explain output for the input plan excluding the subquery plans.
* 2. Generates the explain output for each subquery referenced in the plan.
*/
- def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = {
+ def processPlan[T <: QueryPlan[T]](plan: T, append: String => Unit): Unit = synchronized {
Review Comment:
We should add more comments to explain it. Ideally this is a no-op as different explain actions operate on different plan instances, but cached plan is an exception.
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1975767660
cc @robreeves @liuzqt
--
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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1977829088
BTW, #40812 landed at Apache Spark 3.4.1, doesn't it? If then, it seems that we need to backport this to branch-3.4, @ulysses-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-47177][SQL] Cached SQL plan do not display final AQE plan in explain string [spark]
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on PR #45282:
URL: https://github.com/apache/spark/pull/45282#issuecomment-1977821766
thanks for review, merging to master/branch-1.5
--
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