Skip to content

[SPARK-25002][SQL] Avro: revise the output record namespace #21974

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
gengliangwang wants to merge 1 commit into from
Closed

[SPARK-25002][SQL] Avro: revise the output record namespace #21974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 1 deletion external/avro/src/main/scala/org/apache/spark/sql/avro/SchemaConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@ object SchemaConverters {
case MapType(StringType, vt, valueContainsNull) =>
builder.map().values(toAvroType(vt, valueContainsNull, recordName, prevNameSpace))
case st: StructType =>
val nameSpace = s"$prevNameSpace.$recordName"
val nameSpace = prevNameSpace match {
case "" => recordName
case _ => s"$prevNameSpace.$recordName"
}

val fieldsAssembler = builder.record(recordName).namespace(nameSpace).fields()
st.foreach { f =>
val fieldAvroType = toAvroType(f.dataType, f.nullable, f.name, nameSpace)
Expand Down
17 changes: 17 additions & 0 deletions external/avro/src/test/scala/org/apache/spark/sql/avro/AvroSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,23 @@ class AvroSuite extends QueryTest with SharedSQLContext with SQLTestUtils {

case class NestedTop(id: Int, data: NestedMiddle)

test("Validate namespace in avro file that has nested records with the same name") {
withTempPath { dir =>
val writeDf = spark.createDataFrame(List(NestedTop(1, NestedMiddle(2, NestedBottom(3, "1")))))
writeDf.write.format("avro").save(dir.toString)
val file = new File(dir.toString)
.listFiles()
.filter(_.isFile)
.filter(_.getName.endsWith("avro"))
.head
val reader = new DataFileReader(file, new GenericDatumReader[Any]())
val schema = reader.getSchema.toString()
assert(schema.contains("\"namespace\":\"topLevelRecord\""))
assert(schema.contains("\"namespace\":\"topLevelRecord.data\""))
assert(schema.contains("\"namespace\":\"topLevelRecord.data.data\""))
}
}

test("saving avro that has nested records with the same name") {
withTempPath { tempDir =>
// Save avro file on output folder path
Expand Down