address comments.

apache · Sep 17, 2016 · da5bec6 · da5bec6
1 parent 44f335b
commit da5bec6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala
@@ -80,9 +80,6 @@ final class DataFrameWriter[T] private[sql](ds: Dataset[T]) {
    * @since 1.4.0
    */
   def format(source: String): DataFrameWriter[T] = {
-    if (source.toLowerCase == "hive") {
-      throw new AnalysisException(s"Failed to find data source: $source")
-    }
     this.source = source
     this
   }
@@ -360,6 +357,9 @@ final class DataFrameWriter[T] private[sql](ds: Dataset[T]) {
   }
 
   private def saveAsTable(tableIdent: TableIdentifier): Unit = {
+    if (source.toLowerCase == "hive") {
+      throw new AnalysisException("Cannot create hive serde table with saveAsTable API")
+    }
 
     val tableExists = df.sparkSession.sessionState.catalog.tableExists(tableIdent)
 

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/MetastoreDataSourcesSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/MetastoreDataSourcesSuite.scala
@@ -1155,7 +1155,7 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
   test("save API - format hive") {
     withTempDir { dir =>
       val path = dir.getCanonicalPath
-      val e = intercept[AnalysisException] {
+      val e = intercept[ClassNotFoundException] {
         spark.range(10).write.format("hive").mode(SaveMode.Ignore).save(path)
       }.getMessage
       assert(e.contains("Failed to find data source: hive"))
@@ -1168,7 +1168,7 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
       val e = intercept[AnalysisException] {
         spark.range(10).write.format("hive").mode(SaveMode.Overwrite).saveAsTable(tableName)
       }.getMessage
-      assert(e.contains("Failed to find data source: hive"))
+      assert(e.contains("Cannot create hive serde table with saveAsTable API"))
     }
   }