Repository: spark
Updated Branches:
  refs/heads/branch-1.4 aec83949a -> d518c0369


[HOTFIX] Use 'new Job' in fsBasedParquet.scala

Same issue as #6095

cc liancheng

Author: zsxwing <zsxw...@gmail.com>

Closes #6136 from zsxwing/hotfix and squashes the following commits:

4beea54 [zsxwing] Use 'new Job' in fsBasedParquet.scala

(cherry picked from commit 728af88cf6be4c25a732ab7e4fe66c1ed0041164)
Signed-off-by: Michael Armbrust <mich...@databricks.com>


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

Branch: refs/heads/branch-1.4
Commit: d518c0369fa412567855980c3f0f426cde5c190d
Parents: aec8394
Author: zsxwing <zsxw...@gmail.com>
Authored: Wed May 13 17:58:29 2015 -0700
Committer: Michael Armbrust <mich...@databricks.com>
Committed: Wed May 13 17:58:54 2015 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/sql/parquet/fsBasedParquet.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/d518c036/sql/core/src/main/scala/org/apache/spark/sql/parquet/fsBasedParquet.scala
----------------------------------------------------------------------
diff --git 
a/sql/core/src/main/scala/org/apache/spark/sql/parquet/fsBasedParquet.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/parquet/fsBasedParquet.scala
index d810d6a..c83a9c3 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/parquet/fsBasedParquet.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/parquet/fsBasedParquet.scala
@@ -231,7 +231,7 @@ private[sql] class FSBasedParquetRelation(
       filters: Array[Filter],
       inputPaths: Array[String]): RDD[Row] = {
 
-    val job = Job.getInstance(SparkHadoopUtil.get.conf)
+    val job = new Job(SparkHadoopUtil.get.conf)
     val conf = ContextUtil.getConfiguration(job)
 
     ParquetInputFormat.setReadSupportClass(job, classOf[RowReadSupport])


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

Reply via email to