Skip to content

[SPARK-11692][SQL] Support for Parquet logical types, JSON and BSON (embedded types) #9658

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

Closed
HyukjinKwon wants to merge 6 commits into from
Closed

[SPARK-11692][SQL] Support for Parquet logical types, JSON and BSON (embedded types) #9658

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c9b77a
[SPARK-11692][SQL] Support for Parquet logical types, JSON and BISON …
HyukjinKwon Nov 12, 2015
d5a9629
[SPARK-11692][SQL] Fix typos
HyukjinKwon Nov 12, 2015
66088e3
[SPARK-11694][SQL] Remove mistakenly added characters.
HyukjinKwon Nov 12, 2015
9f22651
[SPARK-11692][SQL] Update indentation
HyukjinKwon Nov 12, 2015
d17a2db
[SPARK-11692][SQL] Resolve conflits
HyukjinKwon Nov 13, 2015
1152636
[SPARK-11692][SQL] Use === instead of == for better assertion error m…
HyukjinKwon Nov 16, 2015
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
3 changes: 2 additions & 1 deletion ...in/scala/org/apache/spark/sql/execution/datasources/parquet/CatalystSchemaConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,10 @@ private[parquet] class CatalystSchemaConverter(

case BINARY =>
originalType match {
case UTF8 | ENUM => StringType
case UTF8 | ENUM | JSON => StringType
case null if assumeBinaryIsString => StringType
case null => BinaryType
case BSON => BinaryType
case DECIMAL => makeDecimalType()
case _ => illegalType()
}
Expand Down
23 changes: 23 additions & 0 deletions ...re/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetIOSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,29 @@ class ParquetIOSuite extends QueryTest with ParquetTest with SharedSQLContext {
}
}

test("SPARK-11692 Support for Parquet logical types, JSON and BSON (embedded types)") {
val parquetSchema = MessageTypeParser.parseMessageType(
"""message root {
| required binary a(JSON);
| required binary b(BSON);
|} + """.stripMargin)
Copy link
Contributor

@liancheng liancheng Nov 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, again, what's the +?


withTempPath { location =>
val extraMetadata = Map.empty[String, String].asJava
val fileMetadata = new FileMetaData(parquetSchema, extraMetadata, "Spark")
val path = new Path(location.getCanonicalPath)
val footer = List(
new Footer(path, new ParquetMetadata(fileMetadata, Collections.emptyList()))
).asJava

ParquetFileWriter.writeMetadataFile(sparkContext.hadoopConfiguration, path, footer)
val jsonDataType = sqlContext.read.parquet(path.toString).schema(0).dataType
assert(jsonDataType == StringType)
Copy link
Contributor

@liancheng liancheng Nov 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry that I missed this part during the last review. Please always use === instead of == for better assertion error messages.

val bsonDataType = sqlContext.read.parquet(path.toString).schema(1).dataType
assert(bsonDataType == BinaryType)
Copy link
Contributor

@liancheng liancheng Nov 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

}
}

test("compression codec") {
def compressionCodecFor(path: String, codecName: String): String = {
val codecs = for {
Expand Down