Skip to content

[SPARK-32986][SQL] Add bucketed scan info in query plan of data source v1 #33698

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
c21 wants to merge 2 commits into from
Closed

[SPARK-32986][SQL] Add bucketed scan info in query plan of data source v1 #33698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b087cd3
Add bucketed scan info in query plan of data source v1
c21 Aug 11, 2021
2d42d37
Address comment
c21 Aug 11, 2021
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
21 changes: 13 additions & 8 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,21 +370,26 @@ case class FileSourceScanExec(
"DataFilters" -> seqToString(dataFilters),
"Location" -> locationDesc)

// TODO(SPARK-32986): Add bucketed scan info in explain output of FileSourceScanExec
if (bucketedScan) {
relation.bucketSpec.map { spec =>
relation.bucketSpec.map { spec =>
val bucketedKey = "Bucketed"
if (bucketedScan) {
val numSelectedBuckets = optionalBucketSet.map { b =>
b.cardinality()
} getOrElse {
spec.numBuckets
}
metadata + ("SelectedBucketsCount" ->
(s"$numSelectedBuckets out of ${spec.numBuckets}" +
metadata ++ Map(
bucketedKey -> "true",
"SelectedBucketsCount" -> (s"$numSelectedBuckets out of ${spec.numBuckets}" +
optionalNumCoalescedBuckets.map { b => s" (Coalesced to $b)"}.getOrElse("")))
} getOrElse {
metadata
} else if (!relation.sparkSession.sessionState.conf.bucketingEnabled) {
metadata + (bucketedKey -> "false (disabled by configuration)")
} else if (disableBucketedScan) {
metadata + (bucketedKey -> "false (disabled by query planner)")
} else {
metadata + (bucketedKey -> "false (bucket column(s) not read)")
}
} else {
} getOrElse {
metadata
}
}
Expand Down
27 changes: 27 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 @@ -677,6 +677,33 @@ class ExplainSuiteAE extends ExplainSuiteHelper with EnableAdaptiveExecutionSuit
}
}
}

test("SPARK-32986: Bucketed scan info should be a part of explain string") {
withTable("t1", "t2") {
Seq((1, 2), (2, 3)).toDF("i", "j").write.bucketBy(8, "i").saveAsTable("t1")
Seq(2, 3).toDF("i").write.bucketBy(8, "i").saveAsTable("t2")
val df1 = spark.table("t1")
val df2 = spark.table("t2")

withSQLConf(SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "0") {
checkKeywordsExistsInExplain(
df1.join(df2, df1("i") === df2("i")),
"Bucketed: true")
}

withSQLConf(SQLConf.BUCKETING_ENABLED.key -> "false") {
checkKeywordsExistsInExplain(
df1.join(df2, df1("i") === df2("i")),
"Bucketed: false (disabled by configuration)")
}

checkKeywordsExistsInExplain(df1, "Bucketed: false (disabled by query planner)" )

checkKeywordsExistsInExplain(
df1.select("j"),
"Bucketed: false (bucket column(s) not read)")
}
}
}

case class ExplainSingleData(id: Int)