address comments from yhuai

apache · Oct 9, 2016 · fb96f1c · fb96f1c
1 parent 96833d5
commit fb96f1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 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
@@ -199,7 +199,8 @@ class SessionCatalog(
     if (dbName == globalTempViewManager.database) {
       throw new AnalysisException(
         s"${globalTempViewManager.database} is a system preserved database, " +
-          "you cannot use it as current database.")
+          "you cannot use it as current database. To access global temporary views, you should " +
+          s"use qualified name, e.g. ${globalTempViewManager.database}.viewName.")
     }
     requireDbExists(dbName)
     synchronized { currentDb = dbName }

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala
@@ -183,7 +183,8 @@ case class DropTableCommand(
 
   override def run(sparkSession: SparkSession): Seq[Row] = {
     val catalog = sparkSession.sessionState.catalog
-    if (tableName.database.forall(catalog.databaseExists) && catalog.tableExists(tableName)) {
+
+    if (!catalog.isTemporaryTable(tableName) && catalog.tableExists(tableName)) {
       // If the command DROP VIEW is to drop a table or DROP TABLE is to drop a view
       // issue an exception.
       catalog.getTableMetadata(tableName).tableType match {