aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2014-08-14 13:00:21 -0700
committerMichael Armbrust <michael@databricks.com>2014-08-14 13:00:21 -0700
commita7f8a4f5ee757450ce8d4028021441435081cf53 (patch)
tree7d138d5e7ab1b5c1b31a4409845cb1ac36f60d38
parent96221067572e5955af1a7710b0cca33a73db4bd5 (diff)
downloadspark-a7f8a4f5ee757450ce8d4028021441435081cf53.tar.gz
spark-a7f8a4f5ee757450ce8d4028021441435081cf53.tar.bz2
spark-a7f8a4f5ee757450ce8d4028021441435081cf53.zip
Revert [SPARK-3011][SQL] _temporary directory should be filtered out by sqlContext.parquetFile
Reverts #1924 due to build failures with hadoop 0.23. Author: Michael Armbrust <michael@databricks.com> Closes #1949 from marmbrus/revert1924 and squashes the following commits: 6bff940 [Michael Armbrust] Revert "[SPARK-3011][SQL] _temporary directory should be filtered out by sqlContext.parquetFile"
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetTypes.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetTypes.scala b/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetTypes.scala
index b0579f76da..c79a9ac2da 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetTypes.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetTypes.scala
@@ -378,8 +378,7 @@ private[parquet] object ParquetTypesConverter extends Logging {
val children = fs.listStatus(path).filterNot { status =>
val name = status.getPath.getName
- name(0) == '.' || name == FileOutputCommitter.SUCCEEDED_FILE_NAME ||
- name == FileOutputCommitter.TEMP_DIR_NAME
+ name(0) == '.' || name == FileOutputCommitter.SUCCEEDED_FILE_NAME
}
// NOTE (lian): Parquet "_metadata" file can be very slow if the file consists of lots of row