Github user liancheng commented on a diff in the pull request:
https://github.com/apache/spark/pull/12844#discussion_r61992394
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/command/tables.scala ---
@@ -290,29 +291,88 @@ case class DescribeTableCommand(table:
TableIdentifier, isExtended: Boolean)
val result = new ArrayBuffer[Row]
sparkSession.sessionState.catalog.lookupRelation(table) match {
case catalogRelation: CatalogRelation =>
- catalogRelation.catalogTable.schema.foreach { column =>
- result += Row(column.name, column.dataType,
column.comment.orNull)
- }
-
- if (catalogRelation.catalogTable.partitionColumns.nonEmpty) {
- result += Row("# Partition Information", "", "")
- result += Row(s"# ${output(0).name}", output(1).name,
output(2).name)
-
- catalogRelation.catalogTable.partitionColumns.foreach { col =>
- result += Row(col.name, col.dataType, col.comment.orNull)
- }
+ if (isExtended) {
+ describeExtended(catalogRelation, result)
+ } else if (isFormatted) {
+ describeFormatted(catalogRelation, result)
+ } else {
+ describe(catalogRelation, result)
}
case relation =>
- relation.schema.fields.foreach { field =>
- val comment =
- if (field.metadata.contains("comment"))
field.metadata.getString("comment") else ""
- result += Row(field.name, field.dataType.simpleString, comment)
- }
+ describeSchema(relation.schema, result)
}
result
}
+
+ // Shows data columns and partitioned columns (if any)
+ private def describe(relation: CatalogRelation, buffer:
ArrayBuffer[Row]): Unit = {
+ describeSchema(relation.catalogTable.schema, buffer)
+
+ if (relation.catalogTable.partitionColumns.nonEmpty) {
+ buffer += Row("# Partition Information", "", "")
+ buffer += Row(s"# ${output(0).name}", output(1).name, output(2).name)
+
+ describeSchema(relation.catalogTable.partitionColumns, buffer)
+ }
+ }
+
+ private def describeExtended(relation: CatalogRelation, buffer:
ArrayBuffer[Row]): Unit = {
+ describe(relation, buffer)
+
+ buffer += Row("", "", "")
+ buffer += Row("# Detailed Table Information",
relation.catalogTable.toString, "")
+ }
+
+ private def describeFormatted(relation: CatalogRelation, buffer:
ArrayBuffer[Row]): Unit = {
--- End diff --
Makes sense, actually there were several times that I forgot to add the
trailing empty string(s) while working on this PR. Thanks!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
