cfmcgrady commented on a change in pull request #32931: URL: https://github.com/apache/spark/pull/32931#discussion_r657080819
########## File path: sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/ShowCreateTableExec.scala ########## @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.execution.datasources.v2 + +import scala.collection.Map +import scala.collection.mutable + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.expressions.Attribute +import org.apache.spark.sql.catalyst.util.escapeSingleQuotedString +import org.apache.spark.sql.connector.catalog.{CatalogV2Util, Table, TableCatalog} +import org.apache.spark.sql.execution.LeafExecNode +import org.apache.spark.unsafe.types.UTF8String + +/** + * Physical plan node for show create table. + */ +case class ShowCreateTableExec( + output: Seq[Attribute], + table: Table) extends V2CommandExec with LeafExecNode { + override protected def run(): Seq[InternalRow] = { + val builder = StringBuilder.newBuilder + // it is used to generate Spark DDL for given table. include Hive Serde table + showCreateTable(table, builder) + Seq(InternalRow(UTF8String.fromString(builder.toString))) + } + + private def showCreateTable(table: Table, builder: StringBuilder): Unit = { + import scala.collection.JavaConverters._ + builder ++= s"CREATE TABLE ${table.name()} " + + showTableDataColumns(table, builder) + showTableUsing(table, builder) + + val tableOptions = table.properties.asScala + .filterKeys(_.startsWith(TableCatalog.OPTION_PREFIX)).map { + case (k, v) => k.drop(TableCatalog.OPTION_PREFIX.length) -> v + } + showTableOptions(builder, tableOptions) + showTablePartitioning(table, builder) + showTableComment(table, builder) + showTableLocation(table, builder) + showTableProperties(table, builder, tableOptions) + } + + private def showTableDataColumns(table: Table, builder: StringBuilder): Unit = { + val columns = table.schema().fields.map(_.toDDL) + builder ++= concatByMultiLines(columns) + } + + private def showTableUsing(table: Table, builder: StringBuilder): Unit = { + Option(table.properties.get(TableCatalog.PROP_PROVIDER)) + .map("USING " + escapeSingleQuotedString(_) + "\n") + .foreach(builder.append) + } + + private def showTableOptions( + builder: StringBuilder, + tableOptions: Map[String, String]): Unit = { + if (tableOptions.nonEmpty) { + val props = tableOptions.map { case (key, value) => + s"'${escapeSingleQuotedString(key)}' = '${escapeSingleQuotedString(value)}'" + } + builder ++= "OPTIONS" + builder ++= concatByMultiLines(props) + } + } + + private def showTablePartitioning(table: Table, builder: StringBuilder): Unit = { + if (!table.partitioning.isEmpty) { + val transforms = new mutable.ArrayBuffer[String] + table.partitioning.foreach(t => transforms += t.describe()) + builder ++= s"PARTITIONED BY ${transforms.mkString("(", ", ", ")")}\n" + } + } + + private def showTableLocation(table: Table, builder: StringBuilder): Unit = { + Option(table.properties.get(TableCatalog.PROP_LOCATION)) + .map("LOCATION '" + escapeSingleQuotedString(_) + "'\n") + .foreach(builder.append) + } + + private def showTableProperties( + table: Table, + builder: StringBuilder, + tableOptions: Map[String, String]): Unit = { Review comment: nit: 4 space. ```scala private def showTableProperties( table: Table, builder: StringBuilder, tableOptions: Map[String, String]): Unit = { ``` ########## File path: sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/ShowCreateTableExec.scala ########## @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.execution.datasources.v2 + +import scala.collection.Map +import scala.collection.mutable + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.expressions.Attribute +import org.apache.spark.sql.catalyst.util.escapeSingleQuotedString +import org.apache.spark.sql.connector.catalog.{CatalogV2Util, Table, TableCatalog} +import org.apache.spark.sql.execution.LeafExecNode +import org.apache.spark.unsafe.types.UTF8String + +/** + * Physical plan node for show create table. + */ +case class ShowCreateTableExec( + output: Seq[Attribute], + table: Table) extends V2CommandExec with LeafExecNode { + override protected def run(): Seq[InternalRow] = { + val builder = StringBuilder.newBuilder + // it is used to generate Spark DDL for given table. include Hive Serde table + showCreateTable(table, builder) + Seq(InternalRow(UTF8String.fromString(builder.toString))) + } + + private def showCreateTable(table: Table, builder: StringBuilder): Unit = { + import scala.collection.JavaConverters._ + builder ++= s"CREATE TABLE ${table.name()} " + + showTableDataColumns(table, builder) + showTableUsing(table, builder) + + val tableOptions = table.properties.asScala + .filterKeys(_.startsWith(TableCatalog.OPTION_PREFIX)).map { + case (k, v) => k.drop(TableCatalog.OPTION_PREFIX.length) -> v + } + showTableOptions(builder, tableOptions) + showTablePartitioning(table, builder) + showTableComment(table, builder) + showTableLocation(table, builder) + showTableProperties(table, builder, tableOptions) + } + + private def showTableDataColumns(table: Table, builder: StringBuilder): Unit = { + val columns = table.schema().fields.map(_.toDDL) + builder ++= concatByMultiLines(columns) + } + + private def showTableUsing(table: Table, builder: StringBuilder): Unit = { + Option(table.properties.get(TableCatalog.PROP_PROVIDER)) + .map("USING " + escapeSingleQuotedString(_) + "\n") + .foreach(builder.append) + } + + private def showTableOptions( + builder: StringBuilder, + tableOptions: Map[String, String]): Unit = { Review comment: nit: 4 space ```scala private def showTableOptions( builder: StringBuilder, tableOptions: Map[String, String]): Unit = { ``` ########## File path: sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala ########## @@ -1961,12 +1961,98 @@ class DataSourceV2SQLSuite } } - test("SHOW CREATE TABLE") { + test("SPARK-33898: SHOW CREATE TABLE AS SERDE") { val t = "testcat.ns1.ns2.tbl" withTable(t) { spark.sql(s"CREATE TABLE $t (id bigint, data string) USING foo") - testNotSupportedV2Command("SHOW CREATE TABLE", t) - testNotSupportedV2Command("SHOW CREATE TABLE", s"$t AS SERDE") + val e = intercept[AnalysisException] { + sql(s"SHOW CREATE TABLE $t AS SERDE") + } + assert(e.message.contains(s"SHOW CREATE TABLE AS SERDE is not supported for v2 tables.")) + } + } + + test("SPARK-33898: SHOW CREATE TABLE") { + val t = "testcat.ns1.ns2.tbl" + withTable(t) { + spark.sql(s"""CREATE TABLE $t ( + | a bigint, + | b bigint, + | c bigint, + | `extra col` ARRAY<INT>, + | `<another>` STRUCT<x: INT, y: ARRAY<BOOLEAN>> + |) + |USING foo + |OPTIONS ( + | from = 0, + | to = 1) + |COMMENT 'This is a comment' + |TBLPROPERTIES ('prop1' = '1') + |PARTITIONED BY (a) + |LOCATION '/tmp' + """.stripMargin) + val showDDL = getShowCreateDDL(s"SHOW CREATE TABLE $t") + assert(showDDL === Array( + "CREATE TABLE testcat.ns1.ns2.tbl (", + "`a` BIGINT,", + "`b` BIGINT,", + "`c` BIGINT,", + "`extra col` ARRAY<INT>,", + "`<another>` STRUCT<`x`: INT, `y`: ARRAY<BOOLEAN>>)", + "USING foo", + "OPTIONS(", + "'from' = '0',", + "'to' = '1')", + "PARTITIONED BY (a)", + "COMMENT 'This is a comment'", + "LOCATION '/tmp'", + "TBLPROPERTIES(", + "'prop1' = '1')" + )) + } + } + + test("SPARK-33898: SHOW CREATE TABLE WITH AS SELECT") { + val t = "testcat.ns1.ns2.tbl" + withTable(t) { + spark.sql(s"""CREATE TABLE $t Review comment: ditto. ```scala spark.sql(s"""|CREATE TABLE $t ``` ########## File path: sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala ########## @@ -1961,12 +1961,98 @@ class DataSourceV2SQLSuite } } - test("SHOW CREATE TABLE") { + test("SPARK-33898: SHOW CREATE TABLE AS SERDE") { val t = "testcat.ns1.ns2.tbl" withTable(t) { spark.sql(s"CREATE TABLE $t (id bigint, data string) USING foo") - testNotSupportedV2Command("SHOW CREATE TABLE", t) - testNotSupportedV2Command("SHOW CREATE TABLE", s"$t AS SERDE") + val e = intercept[AnalysisException] { + sql(s"SHOW CREATE TABLE $t AS SERDE") + } + assert(e.message.contains(s"SHOW CREATE TABLE AS SERDE is not supported for v2 tables.")) + } + } + + test("SPARK-33898: SHOW CREATE TABLE") { + val t = "testcat.ns1.ns2.tbl" + withTable(t) { + spark.sql(s"""CREATE TABLE $t ( Review comment: nit: ```scala spark.sql(s"""|CREATE TABLE $t ( ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
