Skip to content

[SPARK-37494][SQL] Unify v1 and v2 options output of SHOW CREATE TABLE command #34753

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
Peng-Lei wants to merge 1 commit into from
Closed

[SPARK-37494][SQL] Unify v1 and v2 options output of SHOW CREATE TABLE command #34753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/command/tables.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ trait ShowCreateTableCommandBase {

protected def showTableProperties(metadata: CatalogTable, builder: StringBuilder): Unit = {
if (metadata.properties.nonEmpty) {
val props = metadata.properties.map { case (key, value) =>
val props = metadata.properties.toSeq.sortBy(_._1).map { case (key, value) =>
Copy link
Contributor Author

@Peng-Lei Peng-Lei Nov 30, 2021

Choose a reason for hiding this comment

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

This probably has nothing to do with this PR.

s"'${escapeSingleQuotedString(key)}' = '${escapeSingleQuotedString(value)}'"
}

Expand Down Expand Up @@ -1158,8 +1158,9 @@ case class ShowCreateTableCommand(
// If it is a Hive table, we already convert its metadata and fill in a provider.
builder ++= s"USING ${metadata.provider.get}\n"

val dataSourceOptions = conf.redactOptions(metadata.storage.properties).map {
case (key, value) => s"${quoteIdentifier(key)} '${escapeSingleQuotedString(value)}'"
val dataSourceOptions = conf.redactOptions(metadata.storage.properties).toSeq.sortBy(_._1).map {
case (key, value) =>
s"'${escapeSingleQuotedString(key)}' = '${escapeSingleQuotedString(value)}'"
Copy link
Contributor Author

@Peng-Lei Peng-Lei Nov 30, 2021

Choose a reason for hiding this comment

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

keep consistent with v2. also sort it.

}

if (dataSourceOptions.nonEmpty) {
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/resources/sql-tests/results/show-create-table.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ CREATE TABLE `default`.`tbl` (
`c` INT)
USING parquet
OPTIONS (
`a` '1')
'a' = '1')


-- !query
Expand Down
26 changes: 26 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/ShowCreateTableSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,32 @@ abstract class ShowCreateTableSuite extends QueryTest with SQLTestUtils {
}
}

test("SPARK-37494: Unify v1 and v2 option output") {
withTable("ddl_test") {
sql(
s"""CREATE TABLE ddl_test (
| a STRING
|)
|USING json
|TBLPROPERTIES (
| 'b' = '1',
| 'a' = '2')
|OPTIONS (
| k4 'v4',
| `k3` 'v3',
| 'k5' 'v5',
| 'k1' = 'v1',
| k2 = 'v2'
|)
""".stripMargin
)
val expected = "CREATE TABLE `default`.`ddl_test` ( `a` STRING) USING json" +
" OPTIONS ( 'k1' = 'v1', 'k2' = 'v2', 'k3' = 'v3', 'k4' = 'v4', 'k5' = 'v5')" +
" TBLPROPERTIES ( 'a' = '2', 'b' = '1')"
assert(getShowDDL("SHOW CREATE TABLE ddl_test") == expected)
}
}

protected def getShowDDL(showCreateTableSql: String): String = {
sql(showCreateTableSql).head().getString(0).split("\n").map(_.trim).mkString(" ")
}
Expand Down
4 changes: 2 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,8 +1207,8 @@ class JDBCSuite extends QueryTest
.select("createtab_stmt").collect()
assert(createTabStmt.length === 1)
createTabStmt.foreach { r =>
assert(r.getString(0).contains(s"`url` '${Utils.REDACTION_REPLACEMENT_TEXT}'"))
assert(r.getString(0).contains(s"`password` '${Utils.REDACTION_REPLACEMENT_TEXT}'"))
assert(r.getString(0).contains(s"'url' = '${Utils.REDACTION_REPLACEMENT_TEXT}'"))
assert(r.getString(0).contains(s"'password' = '${Utils.REDACTION_REPLACEMENT_TEXT}'"))
}
}
}
Expand Down