Skip to content

Commit 358ac0d

Browse files
author
bomeng
committed
improve the disply of CatalogTable information
1 parent 62d2fa5 commit 358ac0d

File tree

2 files changed

+6
-4
lines changed
  • sql
    • catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog
    • core/src/main/scala/org/apache/spark/sql/execution/command

2 files changed

+6
-4
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ case class CatalogTable(
127127
sortColumnNames: Seq[String] = Seq.empty,
128128
bucketColumnNames: Seq[String] = Seq.empty,
129129
numBuckets: Int = -1,
130-
owner: String = "",
130+
owner: String = System.getProperty("user.name"),
131131
createTime: Long = System.currentTimeMillis,
132132
lastAccessTime: Long = -1,
133133
properties: Map[String, String] = Map.empty,
@@ -180,7 +180,8 @@ case class CatalogTable(
180180
Seq(s"Table: ${identifier.quotedString}",
181181
if (owner.nonEmpty) s"Owner: $owner" else "",
182182
s"Created: ${new Date(createTime).toString}",
183-
s"Last Access: ${new Date(lastAccessTime).toString}",
183+
"Last Access: " +
184+
(if (lastAccessTime == -1) "UNKNOWN" else new Date(lastAccessTime).toString),
184185
s"Type: ${tableType.name}",
185186
if (schema.nonEmpty) s"Schema: ${schema.mkString("[", ", ", "]")}" else "",
186187
if (partitionColumnNames.nonEmpty) s"Partition Columns: $partitionColumns" else "",

sql/core/src/main/scala/org/apache/spark/sql/execution/command/tables.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,8 @@ case class DescribeTableCommand(table: TableIdentifier, isExtended: Boolean, isF
468468
append(buffer, "Database:", table.database, "")
469469
append(buffer, "Owner:", table.owner, "")
470470
append(buffer, "Create Time:", new Date(table.createTime).toString, "")
471-
append(buffer, "Last Access Time:", new Date(table.lastAccessTime).toString, "")
471+
append(buffer, "Last Access Time:",
472+
if (table.lastAccessTime == -1) "UNKNOWN" else new Date(table.lastAccessTime).toString, "")
472473
append(buffer, "Location:", table.storage.locationUri.getOrElse(""), "")
473474
append(buffer, "Table Type:", table.tableType.name, "")
474475

@@ -522,7 +523,7 @@ case class DescribeTableCommand(table: TableIdentifier, isExtended: Boolean, isF
522523

523524
private def describeSchema(schema: Seq[CatalogColumn], buffer: ArrayBuffer[Row]): Unit = {
524525
schema.foreach { column =>
525-
append(buffer, column.name, column.dataType.toLowerCase, column.comment.orNull)
526+
append(buffer, column.name, column.dataType.toLowerCase, column.comment.getOrElse(""))
526527
}
527528
}
528529

0 commit comments

Comments
 (0)