You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "yaooqinn (via GitHub)" <gi...@apache.org> on 2024/01/18 04:24:37 UTC
[PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
yaooqinn opened a new pull request, #44780:
URL: https://github.com/apache/spark/pull/44780
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This PR fixes the case sensitivity of 'compression' in the avro table definition and the write options. Also, the current logic for dealing invalid codec names is unreachable.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
bugfix
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
yes, 'compression'='Xz', 'compression'='XZ' now works as well as 'compression'='xz'
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
new tests
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
no
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #44780:
URL: https://github.com/apache/spark/pull/44780#issuecomment-1897968446
Thank you @dongjoon-hyun and @cloud-fan, merged to master
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #44780:
URL: https://github.com/apache/spark/pull/44780#issuecomment-1897815442
cc @dongjoon-hyun @cloud-fan, thank you in advance for reviewing this PR if you have some time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44780:
URL: https://github.com/apache/spark/pull/44780#discussion_r1456922811
##########
connector/avro/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala:
##########
@@ -102,22 +102,25 @@ private[sql] object AvroUtils extends Logging {
AvroJob.setOutputKeySchema(job, outputAvroSchema)
- if (parsedOptions.compression == UNCOMPRESSED.lowerCaseName()) {
- job.getConfiguration.setBoolean("mapred.output.compress", false)
- } else {
- job.getConfiguration.setBoolean("mapred.output.compress", true)
- logInfo(s"Compressing Avro output using the ${parsedOptions.compression} codec")
- val codec = AvroCompressionCodec.fromString(parsedOptions.compression) match {
- case DEFLATE =>
- val deflateLevel = sqlConf.avroDeflateLevel
- logInfo(s"Avro compression level $deflateLevel will be used for " +
- s"${DEFLATE.getCodecName()} codec.")
- job.getConfiguration.setInt(AvroOutputFormat.DEFLATE_LEVEL_KEY, deflateLevel)
- DEFLATE.getCodecName()
- case codec @ (SNAPPY | BZIP2 | XZ | ZSTANDARD) => codec.getCodecName()
- case unknown => throw new IllegalArgumentException(s"Invalid compression codec: $unknown")
- }
- job.getConfiguration.set(AvroJob.CONF_OUTPUT_CODEC, codec)
+ parsedOptions.compression.toLowerCase(Locale.ROOT) match {
+ case codecName if AvroCompressionCodec.values().exists(c => c.lowerCaseName() == codecName) =>
+ AvroCompressionCodec.fromString(codecName) match {
+ case UNCOMPRESSED =>
+ job.getConfiguration.setBoolean("mapred.output.compress", false)
+ case compressed =>
+ job.getConfiguration.setBoolean("mapred.output.compress", true)
+ job.getConfiguration.set(AvroJob.CONF_OUTPUT_CODEC, codecName)
Review Comment:
I guess Avro can accept in a case-insensitive way, but can we do like the following to match with the existing code?
```scala
- job.getConfiguration.set(AvroJob.CONF_OUTPUT_CODEC, codecName)
+ job.getConfiguration.set(AvroJob.CONF_OUTPUT_CODEC, compressed.getCodecName())
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn closed pull request #44780: [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options
URL: https://github.com/apache/spark/pull/44780
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #44780:
URL: https://github.com/apache/spark/pull/44780#discussion_r1456917963
##########
connector/avro/src/test/scala/org/apache/spark/sql/avro/AvroCodecSuite.scala:
##########
@@ -27,19 +30,34 @@ class AvroCodecSuite extends FileSourceCodecSuite {
override protected def availableCodecs =
AvroCompressionCodec.values().map(_.lowerCaseName()).iterator.to(Seq)
- availableCodecs.foreach { codec =>
+ (availableCodecs ++ availableCodecs.map(_.capitalize)).foreach { codec =>
test(s"SPARK-46746: attach codec name to avro files - codec $codec") {
withTable("avro_t") {
sql(
s"""CREATE TABLE avro_t
| USING $format OPTIONS('compression'='$codec')
| AS SELECT 1 as id
| """.stripMargin)
- spark.table("avro_t")
- .inputFiles.foreach { file =>
- assert(file.endsWith(s"$codec.avro".stripPrefix("uncompressed")))
+ spark
+ .table("avro_t")
+ .inputFiles.foreach { f =>
+ assert(f.endsWith(s"$codec.avro".toLowerCase(Locale.ROOT).stripPrefix("uncompressed")))
}
}
}
}
+
+ test("SPARK-46754: invalid compression codec name in avro table definition") {
+ checkError(
+ exception = intercept[SparkIllegalArgumentException](
+ sql(
+ s"""CREATE TABLE avro_t
+ | USING $format OPTIONS('compression'='unsupported')
Review Comment:
Although this is a copy of the existing test case pattern, shall we remove the space?
```scala
- | USING $format OPTIONS('compression'='unsupported')
+ |USING $format OPTIONS('compression'='unsupported')
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #44780:
URL: https://github.com/apache/spark/pull/44780#discussion_r1456937059
##########
connector/avro/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala:
##########
@@ -102,22 +102,25 @@ private[sql] object AvroUtils extends Logging {
AvroJob.setOutputKeySchema(job, outputAvroSchema)
- if (parsedOptions.compression == UNCOMPRESSED.lowerCaseName()) {
- job.getConfiguration.setBoolean("mapred.output.compress", false)
- } else {
- job.getConfiguration.setBoolean("mapred.output.compress", true)
- logInfo(s"Compressing Avro output using the ${parsedOptions.compression} codec")
- val codec = AvroCompressionCodec.fromString(parsedOptions.compression) match {
- case DEFLATE =>
- val deflateLevel = sqlConf.avroDeflateLevel
- logInfo(s"Avro compression level $deflateLevel will be used for " +
- s"${DEFLATE.getCodecName()} codec.")
- job.getConfiguration.setInt(AvroOutputFormat.DEFLATE_LEVEL_KEY, deflateLevel)
- DEFLATE.getCodecName()
- case codec @ (SNAPPY | BZIP2 | XZ | ZSTANDARD) => codec.getCodecName()
- case unknown => throw new IllegalArgumentException(s"Invalid compression codec: $unknown")
- }
- job.getConfiguration.set(AvroJob.CONF_OUTPUT_CODEC, codec)
+ parsedOptions.compression.toLowerCase(Locale.ROOT) match {
+ case codecName if AvroCompressionCodec.values().exists(c => c.lowerCaseName() == codecName) =>
+ AvroCompressionCodec.fromString(codecName) match {
+ case UNCOMPRESSED =>
+ job.getConfiguration.setBoolean("mapred.output.compress", false)
+ case compressed =>
+ job.getConfiguration.setBoolean("mapred.output.compress", true)
+ job.getConfiguration.set(AvroJob.CONF_OUTPUT_CODEC, codecName)
Review Comment:
OK
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-46754][SQL][AVRO] Fix compression code resolution in avro table definition and write options [spark]
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #44780:
URL: https://github.com/apache/spark/pull/44780#discussion_r1456944531
##########
connector/avro/src/test/scala/org/apache/spark/sql/avro/AvroCodecSuite.scala:
##########
@@ -27,19 +30,34 @@ class AvroCodecSuite extends FileSourceCodecSuite {
override protected def availableCodecs =
AvroCompressionCodec.values().map(_.lowerCaseName()).iterator.to(Seq)
- availableCodecs.foreach { codec =>
+ (availableCodecs ++ availableCodecs.map(_.capitalize)).foreach { codec =>
test(s"SPARK-46746: attach codec name to avro files - codec $codec") {
withTable("avro_t") {
sql(
s"""CREATE TABLE avro_t
| USING $format OPTIONS('compression'='$codec')
| AS SELECT 1 as id
| """.stripMargin)
- spark.table("avro_t")
- .inputFiles.foreach { file =>
- assert(file.endsWith(s"$codec.avro".stripPrefix("uncompressed")))
+ spark
+ .table("avro_t")
+ .inputFiles.foreach { f =>
+ assert(f.endsWith(s"$codec.avro".toLowerCase(Locale.ROOT).stripPrefix("uncompressed")))
}
}
}
}
+
+ test("SPARK-46754: invalid compression codec name in avro table definition") {
+ checkError(
+ exception = intercept[SparkIllegalArgumentException](
+ sql(
+ s"""CREATE TABLE avro_t
+ | USING $format OPTIONS('compression'='unsupported')
Review Comment:
I have removed any extra spaces and blank lines from both the origin and this one. Thank you for pointing this out
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org