Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-2700] [SQL] Hidden files (such as .impala_insert_staging) should be filtered out by sqlContext.parquetFile #1599

Closed
wants to merge 10 commits into from
Closed

[SPARK-2700] [SQL] Hidden files (such as .impala_insert_staging) should be filtered out by sqlContext.parquetFile #1599

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1de83a7
SPARK-2407: Added Parse of SQL SUBSTR()
chutium Jul 16, 2014
88cb37d
Merge https://github.com/apache/spark
chutium Jul 17, 2014
094f773
Merge https://github.com/apache/spark
chutium Jul 17, 2014
c870172
Merge https://github.com/apache/spark
chutium Jul 17, 2014
06e933b
Merge https://github.com/apache/spark
chutium Jul 17, 2014
9a60ccf
SPARK-2407: Added Parser of SQL SUBSTR() #1442
chutium Jul 17, 2014
b49cc8a
SPARK-2407: Added Parser of SQL SUBSTRING() #1442
chutium Jul 18, 2014
b32a1d0
Merge https://github.com/apache/spark
chutium Jul 26, 2014
5333329
SPARK-2700 Hidden files (such as .impala_insert_staging) should be fi…
chutium Jul 26, 2014
3b85e2f
SPARK-2699 Improve compatibility with parquet file/table
chutium Jul 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ private[parquet] object ParquetTypesConverter extends Logging {
def isPrimitiveType(ctype: DataType): Boolean =
classOf[PrimitiveType] isAssignableFrom ctype.getClass

private var allowBinaryType: Boolean = true

def toPrimitiveDataType(parquetType: ParquetPrimitiveType): DataType =
parquetType.getPrimitiveTypeName match {
case ParquetPrimitiveTypeName.BINARY
if parquetType.getOriginalType == ParquetOriginalType.UTF8 => StringType
if (parquetType.getOriginalType == ParquetOriginalType.UTF8 || !allowBinaryType) => StringType
case ParquetPrimitiveTypeName.BINARY => BinaryType
case ParquetPrimitiveTypeName.BOOLEAN => BooleanType
case ParquetPrimitiveTypeName.DOUBLE => DoubleType
Expand Down Expand Up @@ -369,9 +371,12 @@ private[parquet] object ParquetTypesConverter extends Logging {
}
ParquetRelation.enableLogForwarding()

val children = fs.listStatus(path).filterNot {
_.getPath.getName == FileOutputCommitter.SUCCEEDED_FILE_NAME
}
allowBinaryType = conf.getBoolean("parquet.binarytype", true)

val children = fs.listStatus(path).filterNot(
status => (status.getPath.getName.charAt(0) == '.' ||
status.getPath.getName == FileOutputCommitter.SUCCEEDED_FILE_NAME)
)

// NOTE (lian): Parquet "_metadata" file can be very slow if the file consists of lots of row
// groups. Since Parquet schema is replicated among all row groups, we only need to touch a
Expand Down Expand Up @@ -406,8 +411,12 @@ private[parquet] object ParquetTypesConverter extends Logging {
if (keyValueMetadata.get(RowReadSupport.SPARK_METADATA_KEY) != null) {
convertFromString(keyValueMetadata.get(RowReadSupport.SPARK_METADATA_KEY))
} else {
val attributes = convertToAttributes(
readMetaData(origPath, conf).getFileMetaData.getSchema)
val fileMetaData = readMetaData(origPath, conf).getFileMetaData
if (fileMetaData.getCreatedBy.contains("impala")) {
allowBinaryType = false
log.info(s"Impala parquet file founded, BinaryType disabled")
}
val attributes = convertToAttributes(fileMetaData.getSchema)
log.info(s"Falling back to schema conversion from Parquet types; result: $attributes")
attributes
}
Expand Down