Repository: spark
Updated Branches:
  refs/heads/branch-1.3 476c4e117 -> 9d88f0cbd


[SPARK-6330] [SQL] Add a test case for SPARK-6330

When getting file statuses, create file system from each path instead of a 
single one from hadoop configuration.

Author: Pei-Lun Lee <pl...@appier.com>

Closes #5039 from ypcat/spark-6351 and squashes the following commits:

a19a3fe [Pei-Lun Lee] [SPARK-6330] [SQL] fix test
506f5a0 [Pei-Lun Lee] [SPARK-6351] [SQL] fix test
fa2290e [Pei-Lun Lee] [SPARK-6330] [SQL] Rename test case and add comment
606c967 [Pei-Lun Lee] Merge branch 'master' of https://github.com/apache/spark 
into spark-6351
896e80a [Pei-Lun Lee] [SPARK-6351] [SQL] Add test case
2ae0916 [Pei-Lun Lee] [SPARK-6351] [SQL] ParquetRelation2 supporting multiple 
file systems

(cherry picked from commit 4633a87b86a6ef01fa724d31763dcb97cb5bc746)
Signed-off-by: Cheng Lian <l...@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9d88f0cb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9d88f0cb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9d88f0cb

Branch: refs/heads/branch-1.3
Commit: 9d88f0cbdb3e994c3ab62eb7534b0b5308cc5265
Parents: 476c4e1
Author: Pei-Lun Lee <pl...@appier.com>
Authored: Wed Mar 18 08:34:46 2015 +0800
Committer: Cheng Lian <l...@databricks.com>
Committed: Wed Mar 18 08:39:11 2015 +0800

----------------------------------------------------------------------
 .../org/apache/spark/sql/parquet/ParquetIOSuite.scala  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/9d88f0cb/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetIOSuite.scala
----------------------------------------------------------------------
diff --git 
a/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetIOSuite.scala 
b/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetIOSuite.scala
index 36f3406..a70b3c7 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetIOSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetIOSuite.scala
@@ -329,6 +329,7 @@ class ParquetIOSuiteBase extends QueryTest with ParquetTest 
{
       checkAnswer(parquetFile(file), (data ++ newData).map(Row.fromTuple))
     }
   }
+
 }
 
 class ParquetDataSourceOnIOSuite extends ParquetIOSuiteBase with 
BeforeAndAfterAll {
@@ -341,6 +342,18 @@ class ParquetDataSourceOnIOSuite extends 
ParquetIOSuiteBase with BeforeAndAfterA
   override protected def afterAll(): Unit = {
     sqlContext.setConf(SQLConf.PARQUET_USE_DATA_SOURCE_API, 
originalConf.toString)
   }
+
+  test("SPARK-6330 regression test") {
+    // In 1.3.0, save to fs other than file: without configuring core-site.xml 
would get:
+    // IllegalArgumentException: Wrong FS: hdfs://..., expected: file:///
+    intercept[java.io.FileNotFoundException] {
+      sqlContext.parquetFile("file:///nonexistent")
+    }
+    val errorMessage = intercept[Throwable] {
+      sqlContext.parquetFile("hdfs://nonexistent")
+    }.toString
+    assert(errorMessage.contains("UnknownHostException"))
+  }
 }
 
 class ParquetDataSourceOffIOSuite extends ParquetIOSuiteBase with 
BeforeAndAfterAll {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to