Remove various analysis exceptions

Author: hvanhovell

sql/catalyst/src/main/scala/org/apache/spark/sql/AnalysisException.scala

@@ -18,6 +18,7 @@
 package org.apache.spark.sql
 
 import org.apache.spark.annotation.InterfaceStability
+import org.apache.spark.sql.catalyst.catalog.CatalogTypes.TablePartitionSpec
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 
 
@@ -27,7 +28,7 @@ import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
  * @since 1.3.0
  */
 @InterfaceStability.Stable
-class AnalysisException protected[sql] (
+class AnalysisException(
     val message: String,
     val line: Option[Int] = None,
     val startPosition: Option[Int] = None,
@@ -55,3 +56,113 @@ class AnalysisException protected[sql] (
     s"$message;$lineAnnotation$positionAnnotation"
   }
 }
+
+object AnalysisException {
+  /**
+   * Create a no such database analysis exception.
+   */
+  def noSuchDatabase(db: String): AnalysisException = {
+    new AnalysisException(s"Database '$db' not found")
+  }
+
+  /**
+   * Create a database already exists analysis exception.
+   */
+  def databaseAlreadyExists(db: String): AnalysisException = {
+    new AnalysisException(s"Database '$db' already exists")
+  }
+
+  /**
+   * Create a no such table analysis exception.
+   */
+  def noSuchTable(db: String, table: String): AnalysisException = {
+    new AnalysisException(s"Table or view '$table' not found in database '$db'")
+  }
+
+  /**
+   * Create a table already exists analysis exception.
+   */
+  def tableAlreadyExists(db: String, table: String): AnalysisException = {
+    new AnalysisException(s"Table or view '$table' already exists in database '$db'")
+  }
+
+  /**
+   * Create a temporary table already exists analysis exception.
+   */
+  def tempTableAlreadyExists(table: String): AnalysisException = {
+    new AnalysisException(s"Temporary table '$table' already exists")
+  }
+
+  /**
+   * Create a no such partition analysis exception.
+   */
+  def noSuchPartition(db: String, table: String, spec: TablePartitionSpec): AnalysisException = {
+    new AnalysisException(
+      s"Partition not found in table '$table' database '$db':\n" + spec.mkString("\n"))
+  }
+
+  /**
+   * Create a partition already exists analysis exception.
+   */
+  def partitionAlreadyExists(
+      db: String,
+      table: String,
+      spec: TablePartitionSpec): AnalysisException = {
+    new AnalysisException(
+      s"Partition already exists in table '$table' database '$db':\n" + spec.mkString("\n"))
+  }
+
+  /**
+   * Create a no such partitions analysis exception.
+   */
+  def noSuchPartitions(
+      db: String,
+      table: String,
+      specs: Seq[TablePartitionSpec]): AnalysisException = {
+    new AnalysisException(
+      s"The following partitions not found in table '$table' database '$db':\n"
+        + specs.mkString("\n===\n"))
+  }
+
+  /**
+   * Create a partitions already exists analysis exception.
+   */
+  def partitionsAlreadyExists(
+      db: String,
+      table: String,
+      specs: Seq[TablePartitionSpec]): AnalysisException = {
+    new AnalysisException(
+      s"The following partitions already exists in table '$table' database '$db':\n"
+        + specs.mkString("\n===\n"))
+  }
+
+  /**
+   * Create a no such function exception.
+   */
+  def noSuchFunction(db: String, func: String): AnalysisException = {
+    new AnalysisException(
+      s"Undefined function: '$func'. This function is neither a registered temporary " +
+        s"function nor a permanent function registered in the database '$db'.")
+  }
+
+  /**
+   * Create a function already exists analysis exception.
+   */
+  def functionAlreadyExists(db: String, func: String): AnalysisException = {
+    new AnalysisException(s"Function '$func' already exists in database '$db'")
+  }
+
+  /**
+   * Create a no such permanent function exception.
+   */
+  def noSuchPermanentFunction(db: String, func: String): AnalysisException = {
+    new AnalysisException(s"Function '$func' not found in database '$db'")
+  }
+
+  /**
+   * Create a no such temporary function exception.
+   */
+  def noSuchTempFunction(func: String): AnalysisException = {
+    new AnalysisException(s"Temporary function '$func' not found")
+  }
+}

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/AlreadyExistException.scala

@@ -636,17 +636,16 @@ class Analyzer(
         defaultDatabase: Option[String] = None): LogicalPlan = {
       val tableIdentWithDb = u.tableIdentifier.copy(
         database = u.tableIdentifier.database.orElse(defaultDatabase))
-      try {
-        catalog.lookupRelation(tableIdentWithDb)
-      } catch {
-        case _: NoSuchTableException =>
-          u.failAnalysis(s"Table or view not found: ${tableIdentWithDb.unquotedString}")
-        // If the database is defined and that database is not found, throw an AnalysisException.
+      if (!tableIdentWithDb.database.exists(catalog.databaseExists)) {
         // Note that if the database is not defined, it is possible we are looking up a temp view.
-        case e: NoSuchDatabaseException =>
-          u.failAnalysis(s"Table or view not found: ${tableIdentWithDb.unquotedString}, the " +
-            s"database ${e.db} doesn't exsits.")
+        u.failAnalysis(s"Table or view not found: ${tableIdentWithDb.unquotedString}, the " +
+          s"database doesn't exsits.")
+      }
+      if (!catalog.tableExists(tableIdentWithDb)) {
+        // If the database is defined and that database is not found, throw an AnalysisException.
+        u.failAnalysis(s"Table or view not found: ${tableIdentWithDb.unquotedString}")
       }
+      catalog.lookupRelation(tableIdentWithDb)
     }
 
     // If the database part is specified, and we support running SQL directly on files, and
@@ -1122,7 +1121,9 @@ class Analyzer(
     override def apply(plan: LogicalPlan): LogicalPlan = plan.transformAllExpressions {
       case f: UnresolvedFunction if !catalog.functionExists(f.name) =>
         withPosition(f) {
-          throw new NoSuchFunctionException(f.name.database.getOrElse("default"), f.name.funcName)
+          throw AnalysisException.noSuchFunction(
+            f.name.database.getOrElse("default"),
+            f.name.funcName)
         }
     }
   }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

@@ -17,7 +17,7 @@
 
 package org.apache.spark.sql.catalyst.catalog
 
-import org.apache.spark.sql.catalyst.analysis.{FunctionAlreadyExistsException, NoSuchDatabaseException, NoSuchFunctionException, NoSuchTableException}
+import org.apache.spark.sql.AnalysisException
 import org.apache.spark.sql.catalyst.expressions.Expression
 import org.apache.spark.sql.types.StructType
 
@@ -28,32 +28,32 @@ import org.apache.spark.sql.types.StructType
  * can be accessed in multiple threads. This is an external catalog because it is expected to
  * interact with external systems.
  *
- * Implementations should throw [[NoSuchDatabaseException]] when databases don't exist.
+ * Implementations should throw an [[AnalysisException]] when databases don't exist.
  */
 abstract class ExternalCatalog {
   import CatalogTypes.TablePartitionSpec
 
   protected def requireDbExists(db: String): Unit = {
     if (!databaseExists(db)) {
-      throw new NoSuchDatabaseException(db)
+      throw AnalysisException.noSuchDatabase(db)
     }
   }
 
   protected def requireTableExists(db: String, table: String): Unit = {
     if (!tableExists(db, table)) {
-      throw new NoSuchTableException(db = db, table = table)
+      throw AnalysisException.noSuchTable(db, table)
     }
   }
 
   protected def requireFunctionExists(db: String, funcName: String): Unit = {
     if (!functionExists(db, funcName)) {
-      throw new NoSuchFunctionException(db = db, func = funcName)
+      throw AnalysisException.noSuchFunction(db, funcName)
     }
   }
 
   protected def requireFunctionNotExists(db: String, funcName: String): Unit = {
     if (functionExists(db, funcName)) {
-      throw new FunctionAlreadyExistsException(db = db, func = funcName)
+      throw AnalysisException.functionAlreadyExists(db, funcName)
     }
   }
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/NoSuchItemException.scala

@@ -22,7 +22,6 @@ import javax.annotation.concurrent.GuardedBy
 import scala.collection.mutable
 
 import org.apache.spark.sql.AnalysisException
-import org.apache.spark.sql.catalyst.analysis.TempTableAlreadyExistsException
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 import org.apache.spark.sql.catalyst.util.StringUtils
 
@@ -58,7 +57,7 @@ class GlobalTempViewManager(val database: String) {
       viewDefinition: LogicalPlan,
       overrideIfExists: Boolean): Unit = synchronized {
     if (!overrideIfExists && viewDefinitions.contains(name)) {
-      throw new TempTableAlreadyExistsException(name)
+      throw AnalysisException.tempTableAlreadyExists(name)
     }
     viewDefinitions.put(name, viewDefinition)
   }