Skip to content

[SPARK-46746][SQL][AVRO] Attach codec extension to avro datasource files #44770

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
yaooqinn wants to merge 2 commits into from
Closed

[SPARK-46746][SQL][AVRO] Attach codec extension to avro datasource files #44770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7239d66
[SPARK-46746][SQL][AVRO] Attach codec extension to avro datasource files
yaooqinn Jan 17, 2024
7c2631f
Merge branch 'master' into SPARK-46746
yaooqinn Jan 17, 2024
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
10 changes: 9 additions & 1 deletion connector/avro/src/main/scala/org/apache/spark/sql/avro/AvroOutputWriterFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.sql.avro

import org.apache.avro.Schema
import org.apache.avro.mapreduce.AvroJob
import org.apache.hadoop.mapreduce.TaskAttemptContext

import org.apache.spark.sql.execution.datasources.{OutputWriter, OutputWriterFactory}
Expand All @@ -38,7 +39,14 @@ private[sql] class AvroOutputWriterFactory(

private lazy val avroSchema = new Schema.Parser().parse(avroSchemaAsJsonString)

override def getFileExtension(context: TaskAttemptContext): String = ".avro"
override def getFileExtension(context: TaskAttemptContext): String = {
val codec = context.getConfiguration.get(AvroJob.CONF_OUTPUT_CODEC)
if (codec == null || codec.equalsIgnoreCase("null")) {
".avro"
} else {
s".$codec.avro"
}
}

override def newInstance(
path: String,
Expand Down
16 changes: 16 additions & 0 deletions connector/avro/src/test/scala/org/apache/spark/sql/avro/AvroCodecSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,20 @@ class AvroCodecSuite extends FileSourceCodecSuite {
override val codecConfigName: String = SQLConf.AVRO_COMPRESSION_CODEC.key
override protected def availableCodecs =
AvroCompressionCodec.values().map(_.lowerCaseName()).iterator.to(Seq)

availableCodecs.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")))
}
}
}
}
}