Skip to content

[SPARK-33898][SQL][FOLLOWUP] Unify the v2 behavior with v1 for SHOW CREATE TABLE command #34773

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-33898][SQL][FOLLOWUP] Unify the v2 behavior with v1 for SHOW CREATE TABLE command #34773

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
2 changes: 1 addition & 1 deletion ...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 @@ -109,7 +109,7 @@ case class ShowCreateTableExec(
s"'${escapeSingleQuotedString(key)}' = '${escapeSingleQuotedString(value)}'"
}

builder ++= "TBLPROPERTIES"
builder ++= "TBLPROPERTIES "
Copy link
Contributor

@LuciferYang LuciferYang Dec 2, 2021

Choose a reason for hiding this comment

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

Is this change related to Fix the behavior different with v1 command that about the TBLPROPERTIES?

Copy link
Contributor Author

@Peng-Lei Peng-Lei Dec 3, 2021

Choose a reason for hiding this comment

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

Yeah. Rright. Thank you for your review.

builder ++= concatByMultiLines(props)
}
}
Expand Down
10 changes: 0 additions & 10 deletions sql/core/src/test/scala/org/apache/spark/sql/CharVarcharTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,16 +843,6 @@ class FileSourceCharVarcharTestSuite extends CharVarcharTestSuite with SharedSpa
}
}

// TODO(SPARK-33898): Move these tests to super after SHOW CREATE TABLE for v2 implemented
test("SPARK-33892: SHOW CREATE TABLE w/ char/varchar") {
withTable("t") {
sql(s"CREATE TABLE t(v VARCHAR(3), c CHAR(5)) USING $format")
val rest = sql("SHOW CREATE TABLE t").head().getString(0)
assert(rest.contains("VARCHAR(3)"))
assert(rest.contains("CHAR(5)"))
}
}

test("SPARK-34114: should not trim right for read-side length check and char padding") {
Seq("char", "varchar").foreach { typ =>
withTempPath { dir =>
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2031,7 +2031,7 @@ class DataSourceV2SQLSuite
"PARTITIONED BY (a)",
"COMMENT 'This is a comment'",
"LOCATION 'file:/tmp'",
"TBLPROPERTIES(",
"TBLPROPERTIES (",
"'prop1' = '1',",
"'prop2' = '2',",
"'prop3' = '3',",
Expand Down
9 changes: 9 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/CharVarcharDDLTestBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,15 @@ trait CharVarcharDDLTestBase extends QueryTest with SQLTestUtils {
Row("char(5)"))
}
}

test("SPARK-33892: SHOW CREATE TABLE w/ char/varchar") {
withTable("t") {
sql(s"CREATE TABLE t(v VARCHAR(3), c CHAR(5)) USING $format")
val rest = sql("SHOW CREATE TABLE t").head().getString(0)
assert(rest.contains("VARCHAR(3)"))
assert(rest.contains("CHAR(5)"))
}
}
}

class FileSourceCharVarcharDDLTestSuite extends CharVarcharDDLTestBase with SharedSparkSession {
Expand Down