diff options
author | gatorsmile <gatorsmile@gmail.com> | 2017-01-03 11:55:31 +0800 |
---|---|---|
committer | Wenchen Fan <wenchen@databricks.com> | 2017-01-03 11:55:31 +0800 |
commit | a6cd9dbc6095570e93dab1d93671abecdce40c25 (patch) | |
tree | c4b38ddad4ece7448a27a1b7b8967d7a88ed80e9 | |
parent | 46b212602428f1f11c184c836b4e09c150d0ee30 (diff) | |
download | spark-a6cd9dbc6095570e93dab1d93671abecdce40c25.tar.gz spark-a6cd9dbc6095570e93dab1d93671abecdce40c25.tar.bz2 spark-a6cd9dbc6095570e93dab1d93671abecdce40c25.zip |
[SPARK-19029][SQL] Remove databaseName from SimpleCatalogRelation
### What changes were proposed in this pull request?
Remove useless `databaseName ` from `SimpleCatalogRelation`.
### How was this patch tested?
Existing test cases.
Author: gatorsmile <gatorsmile@gmail.com>
Closes #16438 from gatorsmile/removeDBFromSimpleCatalogRelation.
3 files changed, 5 insertions, 10 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala index 741ed05b63..2060d535b0 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala @@ -573,7 +573,7 @@ class SessionCatalog( val view = Option(metadata.tableType).collect { case CatalogTableType.VIEW => name } - SubqueryAlias(relationAlias, SimpleCatalogRelation(db, metadata), view) + SubqueryAlias(relationAlias, SimpleCatalogRelation(metadata), view) } else { SubqueryAlias(relationAlias, tempTables(table), Option(name)) } diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala index 24d75ab02c..b402bd2d6c 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala @@ -318,7 +318,6 @@ trait CatalogRelation { * Note that in the future we should consolidate this and HiveCatalogRelation. */ case class SimpleCatalogRelation( - databaseName: String, metadata: CatalogTable) extends LeafNode with CatalogRelation { @@ -335,8 +334,4 @@ case class SimpleCatalogRelation( } dataCols ++ partCols } - - require( - metadata.identifier.database == Some(databaseName), - "provided database does not match the one specified in the table definition") } diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala index 5cc772d8e9..19b7a4659c 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalogSuite.scala @@ -433,24 +433,24 @@ class SessionCatalogSuite extends SparkFunSuite { sessionCatalog.setCurrentDatabase("db2") // If we explicitly specify the database, we'll look up the relation in that database assert(sessionCatalog.lookupRelation(TableIdentifier("tbl1", Some("db2"))) - == SubqueryAlias("tbl1", SimpleCatalogRelation("db2", metastoreTable1), None)) + == SubqueryAlias("tbl1", SimpleCatalogRelation(metastoreTable1), None)) // Otherwise, we'll first look up a temporary table with the same name assert(sessionCatalog.lookupRelation(TableIdentifier("tbl1")) == SubqueryAlias("tbl1", tempTable1, Some(TableIdentifier("tbl1")))) // Then, if that does not exist, look up the relation in the current database sessionCatalog.dropTable(TableIdentifier("tbl1"), ignoreIfNotExists = false, purge = false) assert(sessionCatalog.lookupRelation(TableIdentifier("tbl1")) - == SubqueryAlias("tbl1", SimpleCatalogRelation("db2", metastoreTable1), None)) + == SubqueryAlias("tbl1", SimpleCatalogRelation(metastoreTable1), None)) } test("lookup table relation with alias") { val catalog = new SessionCatalog(newBasicCatalog()) val alias = "monster" val tableMetadata = catalog.getTableMetadata(TableIdentifier("tbl1", Some("db2"))) - val relation = SubqueryAlias("tbl1", SimpleCatalogRelation("db2", tableMetadata), None) + val relation = SubqueryAlias("tbl1", SimpleCatalogRelation(tableMetadata), None) val relationWithAlias = SubqueryAlias(alias, - SimpleCatalogRelation("db2", tableMetadata), None) + SimpleCatalogRelation(tableMetadata), None) assert(catalog.lookupRelation( TableIdentifier("tbl1", Some("db2")), alias = None) == relation) assert(catalog.lookupRelation( |