Skip to content

Commit ee3096c

Browse files
committed
address comments
1 parent 48ce44e commit ee3096c

5 files changed

Lines changed: 11 additions & 30 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,15 @@ class SessionCatalog(
277277
* If the specified table/view is not found in the database then a [[NoSuchTableException]] is
278278
* thrown.
279279
*/
280-
def getTempViewOrPermanentTableMetadata(name: TableIdentifier): CatalogTable = synchronized {
281-
val table = formatTableName(name.table)
280+
def getTempViewOrPermanentTableMetadata(name: String): CatalogTable = synchronized {
281+
val table = formatTableName(name)
282282
getTempView(table).map { plan =>
283283
CatalogTable(
284284
identifier = TableIdentifier(table),
285285
tableType = CatalogTableType.VIEW,
286286
storage = CatalogStorageFormat.empty,
287287
schema = plan.output.toStructType)
288-
}.getOrElse(getTableMetadata(name))
288+
}.getOrElse(getTableMetadata(TableIdentifier(name)))
289289
}
290290

291291
/**

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -444,35 +444,16 @@ class SessionCatalogSuite extends SparkFunSuite {
444444
assert(!catalog.tableExists(TableIdentifier("view1", Some("default"))))
445445
}
446446

447-
test("getTableMetadata and getTempViewOrPermanentTableMetadata on temporary views") {
447+
test("getTempViewOrPermanentTableMetadata on temporary views") {
448448
val catalog = new SessionCatalog(newBasicCatalog())
449449
val tempTable = Range(1, 10, 2, 10)
450-
val m = intercept[AnalysisException] {
451-
catalog.getTableMetadata(TableIdentifier("view1"))
452-
}.getMessage
453-
assert(m.contains("Table or view 'view1' not found in database 'default'"))
454-
455-
val m2 = intercept[AnalysisException] {
456-
catalog.getTableMetadata(TableIdentifier("view1", Some("default")))
457-
}.getMessage
458-
assert(m2.contains("Table or view 'view1' not found in database 'default'"))
459-
460450
intercept[NoSuchTableException] {
461-
catalog.getTempViewOrPermanentTableMetadata(TableIdentifier("view1"))
451+
catalog.getTempViewOrPermanentTableMetadata("view1")
462452
}.getMessage
463453

464454
catalog.createTempView("view1", tempTable, overrideIfExists = false)
465-
assert(catalog.getTempViewOrPermanentTableMetadata(TableIdentifier("view1")).identifier ==
455+
assert(catalog.getTempViewOrPermanentTableMetadata("view1").identifier ==
466456
TableIdentifier("view1"), "the temporary view `view1` should exist")
467-
468-
intercept[NoSuchTableException] {
469-
catalog.getTableMetadata(TableIdentifier("view1"))
470-
}.getMessage
471-
472-
val m3 = intercept[AnalysisException] {
473-
catalog.getTableMetadata(TableIdentifier("view1", Some("default")))
474-
}.getMessage
475-
assert(m3.contains("Table or view 'view1' not found in database 'default'"))
476457
}
477458

478459
test("list tables without pattern") {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ case class CreateTableLikeCommand(
6767
val sourceTableDesc = if (sourceTable.database.isDefined) {
6868
catalog.getTableMetadata(sourceTable)
6969
} else {
70-
catalog.getTempViewOrPermanentTableMetadata(sourceTable)
70+
catalog.getTempViewOrPermanentTableMetadata(sourceTable.table)
7171
}
7272

7373
// Storage format
@@ -605,7 +605,7 @@ case class ShowColumnsCommand(tableName: TableIdentifier) extends RunnableComman
605605
val table = if (tableName.database.isDefined) {
606606
catalog.getTableMetadata(tableName)
607607
} else {
608-
catalog.getTempViewOrPermanentTableMetadata(tableName)
608+
catalog.getTempViewOrPermanentTableMetadata(tableName.table)
609609
}
610610
table.schema.map { c =>
611611
Row(c.name)

sql/core/src/main/scala/org/apache/spark/sql/internal/CatalogImpl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class CatalogImpl(sparkSession: SparkSession) extends Catalog {
154154
val tableMetadata = if (tableIdentifier.database.isDefined) {
155155
sessionCatalog.getTableMetadata(tableIdentifier)
156156
} else {
157-
sessionCatalog.getTempViewOrPermanentTableMetadata(tableIdentifier)
157+
sessionCatalog.getTempViewOrPermanentTableMetadata(tableIdentifier.table)
158158
}
159159

160160
val partitionColumnNames = tableMetadata.partitionColumnNames.toSet

sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,8 @@ class HiveDDLSuite
678678
.createTempView(sourceViewName)
679679
sql(s"CREATE TABLE $targetTabName LIKE $sourceViewName")
680680

681-
val sourceTable = spark.sessionState.catalog.getTempViewOrPermanentTableMetadata(
682-
TableIdentifier(sourceViewName))
681+
val sourceTable =
682+
spark.sessionState.catalog.getTempViewOrPermanentTableMetadata(sourceViewName)
683683
val targetTable = spark.sessionState.catalog.getTableMetadata(
684684
TableIdentifier(targetTabName, Some("default")))
685685

0 commit comments

Comments
 (0)