Skip to content

[SPARK-33853][SQL] EXPLAIN CODEGEN and BenchmarkQueryTest don't show subquery code #30859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

[SPARK-33853][SQL] EXPLAIN CODEGEN and BenchmarkQueryTest don't show subquery code #30859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ea7def3
Fix an issue that EXPLAIN CODEGEN doesn't show subquery code.
sarutak Dec 18, 2020
b0d34e7
Add test.
sarutak Dec 19, 2020
09c6fd1
Add JIRA ID to the test.
sarutak Dec 19, 2020
26551bf
Remove SQLConf.ADAPTIVE_EXECUTION_ENABLED.key -> "false".
sarutak Dec 20, 2020
0f6a53b
Apply the change to BenchmarkQueryTest too.
sarutak Dec 20, 2020
022d363
Minor change.
sarutak Dec 20, 2020
c338832
Fix typo.
sarutak Dec 20, 2020
13cadeb
withTable -> withTempView
sarutak Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/debug/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,17 @@ package object debug {
*/
def codegenStringSeq(plan: SparkPlan): Seq[(String, String, ByteCodeStats)] = {
val codegenSubtrees = new collection.mutable.HashSet[WholeStageCodegenExec]()
plan transform {
case s: WholeStageCodegenExec =>
codegenSubtrees += s
s
case s => s

def findSubtrees(plan: SparkPlan): Unit = {
plan foreach {
case s: WholeStageCodegenExec =>
codegenSubtrees += s
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code below has the same issue?

spark/sql/core/src/test/scala/org/apache/spark/sql/BenchmarkQueryTest.scala

Lines 65 to 70 in df2314b

val codegenSubtrees = new collection.mutable.HashSet[WholeStageCodegenExec]()
plan foreach {
case s: WholeStageCodegenExec =>
codegenSubtrees += s
case _ =>
}

case s =>
s.subqueries.foreach(findSubtrees)
}
}

findSubtrees(plan)
codegenSubtrees.toSeq.sortBy(_.codegenStageId).map { subtree =>
val (_, source) = subtree.doCodeGen()
val codeStats = try {
Expand Down
14 changes: 10 additions & 4 deletions sql/core/src/test/scala/org/apache/spark/sql/BenchmarkQueryTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,17 @@ abstract class BenchmarkQueryTest extends QueryTest with SharedSparkSession {

protected def checkGeneratedCode(plan: SparkPlan, checkMethodCodeSize: Boolean = true): Unit = {
val codegenSubtrees = new collection.mutable.HashSet[WholeStageCodegenExec]()
plan foreach {
case s: WholeStageCodegenExec =>
codegenSubtrees += s
case _ =>

def findSubtrees(plan: SparkPlan): Unit = {
plan foreach {
case s: WholeStageCodegenExec =>
codegenSubtrees += s
case s =>
s.subqueries.foreach(findSubtrees)
}
}

findSubtrees(plan)
codegenSubtrees.toSeq.foreach { subtree =>
val code = subtree.doCodeGen()._2
val (_, ByteCodeStats(maxMethodCodeSize, _, _)) = try {
Expand Down
16 changes: 16 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/ExplainSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,22 @@ class ExplainSuite extends ExplainSuiteHelper with DisableAdaptiveExecutionSuite
}
}

test("SPARK-33853: explain codegen - check presence of subquery") {
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "true") {
withTempView("df") {
val df1 = spark.range(1, 100)
df1.createTempView("df")

val sqlText = "EXPLAIN CODEGEN SELECT (SELECT min(id) FROM df)"
val expectedText = "Found 3 WholeStageCodegen subtrees."

withNormalizedExplain(sqlText) { normalizedOutput =>
assert(normalizedOutput.contains(expectedText))
}
}
}
}

test("explain formatted - check presence of subquery in case of DPP") {
withTable("df1", "df2") {
withSQLConf(SQLConf.DYNAMIC_PARTITION_PRUNING_ENABLED.key -> "true",
Expand Down