Skip to content

[SPARK-56755][SQL] Fix SHOW CREATE TABLE for v2 table partitioned by bucket transform #55718

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

Open
pan3793 wants to merge 3 commits into
base: master
Choose a base branch
from
+23 −5
Open

[SPARK-56755][SQL] Fix SHOW CREATE TABLE for v2 table partitioned by bucket transform #55718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4963c27
[SPARK-56755][SQL] Fix SHOW CREATE TABLE for v2 table partitioned by …
pan3793 May 6, 2026
ac4abfa
replace with require assertion
pan3793 May 7, 2026
2afcd18
fix import
pan3793 May 7, 2026
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
5 changes: 3 additions & 2 deletions ...re/src/main/scala/org/apache/spark/sql/execution/datasources/v2/ShowCreateTableExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.apache.spark.sql.catalyst.catalog.BucketSpec
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.catalyst.types.DataTypeUtils
import org.apache.spark.sql.catalyst.util.{escapeSingleQuotedString, CharVarcharUtils}
import org.apache.spark.sql.connector.catalog.{CatalogV2Util, Table, TableCatalog}
import org.apache.spark.sql.connector.catalog.{CatalogV2Util, Table, TableCatalog, V1Table}
import org.apache.spark.sql.connector.expressions.BucketTransform
import org.apache.spark.sql.execution.LeafExecNode
import org.apache.spark.sql.types.StructType
Expand Down Expand Up @@ -98,7 +98,8 @@ case class ShowCreateTableExec(
val transforms = new ArrayBuffer[String]
var bucketSpec = Option.empty[BucketSpec]
table.partitioning.map {
case BucketTransform(numBuckets, col, sortCol) =>
case BucketTransform(numBuckets, col, sortCol) if table.isInstanceOf[V1Table] =>
require(bucketSpec.isEmpty, "V1Table can not define multiple bucket transforms")
if (sortCol.isEmpty) {
bucketSpec = Some(BucketSpec(numBuckets, col.map(_.fieldNames.mkString(".")), Nil))
} else {
Expand Down
23 changes: 20 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/v2/ShowCreateTableSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,26 @@ class ShowCreateTableSuite extends command.ShowCreateTableSuiteBase with Command
"b STRING COLLATE UTF8_BINARY,",
"ts TIMESTAMP)",
defaultUsing,
"PARTITIONED BY (a, years(ts), months(ts), days(ts), hours(ts))",
"CLUSTERED BY (b)",
"INTO 16 BUCKETS"
"PARTITIONED BY (a, bucket(16, b), years(ts), months(ts), days(ts), hours(ts))"
))
}
}

test("SPARK-56755: show create table[partitioned by multi bucket transforms]") {
withNamespaceAndTable(ns, table) { t =>
sql(
s"""
|CREATE TABLE $t (a INT, b STRING, ts TIMESTAMP) $defaultUsing
|PARTITIONED BY (bucket(4, a), bucket(8, b), years(ts))
""".stripMargin)
val showDDL = getShowCreateDDL(t, false)
assert(showDDL === Array(
s"CREATE TABLE $t (",
"a INT,",
"b STRING COLLATE UTF8_BINARY,",
"ts TIMESTAMP)",
defaultUsing,
"PARTITIONED BY (bucket(4, a), bucket(8, b), years(ts))"
))
}
}
Expand Down