[SPARK-6330] Fix filesystem bug in newParquet relation

If I'm running this locally and my path points to S3, this would currently error out because of incorrect FS.
I tested this in a scenario that previously didn't work, this change seemed to fix the issue.

Author: Volodymyr Lyubinets <vlyubin@gmail.com>

Closes #5020 from vlyubin/parquertbug and squashes the following commits:

a645ad5 [Volodymyr Lyubinets] Fix filesystem bug in newParquet relation
This commit is contained in:
Volodymyr Lyubinets 2015-03-16 12:13:18 -07:00 committed by Aaron Davidson
parent 12a345adcb
commit d19efeddc0

View file

@ -19,6 +19,7 @@ package org.apache.spark.sql.parquet
import java.io.IOException
import java.lang.{Double => JDouble, Float => JFloat, Long => JLong}
import java.math.{BigDecimal => JBigDecimal}
import java.net.URI
import java.text.SimpleDateFormat
import java.util.{Date, List => JList}
@ -244,11 +245,10 @@ private[sql] case class ParquetRelation2(
* Refreshes `FileStatus`es, footers, partition spec, and table schema.
*/
def refresh(): Unit = {
val fs = FileSystem.get(sparkContext.hadoopConfiguration)
// Support either reading a collection of raw Parquet part-files, or a collection of folders
// containing Parquet files (e.g. partitioned Parquet table).
val baseStatuses = paths.distinct.map { p =>
val fs = FileSystem.get(URI.create(p), sparkContext.hadoopConfiguration)
val qualified = fs.makeQualified(new Path(p))
if (!fs.exists(qualified) && maybeSchema.isDefined) {
@ -262,6 +262,7 @@ private[sql] case class ParquetRelation2(
// Lists `FileStatus`es of all leaf nodes (files) under all base directories.
val leaves = baseStatuses.flatMap { f =>
val fs = FileSystem.get(f.getPath.toUri, sparkContext.hadoopConfiguration)
SparkHadoopUtil.get.listLeafStatuses(fs, f.getPath).filter { f =>
isSummaryFile(f.getPath) ||
!(f.getPath.getName.startsWith("_") || f.getPath.getName.startsWith("."))