Skip to content

[SPARK-16610][SQL] Add orc.compress as an alias for compression option. #14518

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 7 commits into from
Closed

[SPARK-16610][SQL] Add orc.compress as an alias for compression option. #14518

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d55a61
[SPARK-16610][SQL] Do not ignore `orc.compress` when `compression` op…
HyukjinKwon Aug 6, 2016
4f27313
Use SNAPPY as default
HyukjinKwon Aug 6, 2016
1ad44ec
Fix indentation
HyukjinKwon Aug 6, 2016
af1a3b8
Add a comment for default value
HyukjinKwon Aug 6, 2016
3f70f25
Revert the change to look up Hadoop configuration but just add an alias
HyukjinKwon Aug 8, 2016
be04706
Update the names of test cases
HyukjinKwon Aug 8, 2016
e4d6999
Clean codes and add some more comments
HyukjinKwon Aug 9, 2016
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
6 changes: 3 additions & 3 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcOptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ package org.apache.spark.sql.hive.orc
/**
* Options for the ORC data source.
*/
private[orc] class OrcOptions(
@transient private val parameters: Map[String, String])
private[orc] class OrcOptions(@transient private val parameters: Map[String, String])
extends Serializable {

import OrcOptions._
Expand All @@ -31,7 +30,8 @@ private[orc] class OrcOptions(
* Acceptable values are defined in [[shortOrcCompressionCodecNames]].
*/
val compressionCodec: String = {
val codecName = parameters.getOrElse("compression", "snappy").toLowerCase
val codecName = parameters.getOrElse(
"compression", parameters.getOrElse("orc.compress", "snappy")).toLowerCase
Copy link
Contributor

@yhuai yhuai Aug 8, 2016

Choose a reason for hiding this comment

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

use OrcRelation.ORC_COMPRESSION (since we have a val defined)? Let's add comments to explain what we are doing (we should mention that orc.compress is a ORC conf and which conf will take precedence). Also, will the following lines look better?

    val orcCompressionConf = parameters.get(OrcRelation.ORC_COMPRESSION)
    val codecName = parameters
      .get("compression")
      .orElse(orcCompressionConf)
      .getOrElse("snappy")

Copy link
Member Author

@HyukjinKwon HyukjinKwon Aug 9, 2016

Choose a reason for hiding this comment

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

Sure, Thanks for the cleaner snippet!

if (!shortOrcCompressionCodecNames.contains(codecName)) {
val availableCodecs = shortOrcCompressionCodecNames.keys.map(_.toLowerCase)
throw new IllegalArgumentException(s"Codec [$codecName] " +
Expand Down
23 changes: 23 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,29 @@ class OrcQuerySuite extends QueryTest with BeforeAndAfterAll with OrcTest {
}
}

test("SPARK-16610: Respect orc.compress option when compression is unset") {
// Respect `orc.compress`.
withTempPath { file =>
spark.range(0, 10).write
.option("orc.compress", "ZLIB")
.orc(file.getCanonicalPath)
val expectedCompressionKind =
OrcFileOperator.getFileReader(file.getCanonicalPath).get.getCompression
assert("ZLIB" === expectedCompressionKind.name())
}

// `compression` overrides `orc.compress`.
withTempPath { file =>
spark.range(0, 10).write
.option("compression", "ZLIB")
.option("orc.compress", "SNAPPY")
.orc(file.getCanonicalPath)
val expectedCompressionKind =
OrcFileOperator.getFileReader(file.getCanonicalPath).get.getCompression
assert("ZLIB" === expectedCompressionKind.name())
}
}
Copy link
Contributor

@yhuai yhuai Aug 8, 2016

Choose a reason for hiding this comment

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

nice. Thank you for adding this test.


// Hive supports zlib, snappy and none for Hive 1.2.1.
test("Compression options for writing to an ORC file (SNAPPY, ZLIB and NONE)") {
withTempPath { file =>
Expand Down