You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "fanyue-xia (via GitHub)" <gi...@apache.org> on 2025/11/13 18:09:54 UTC
[PR] [SPARK-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
fanyue-xia opened a new pull request, #53041:
URL: https://github.com/apache/spark/pull/53041
<!--
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
'common/utils/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.
-->
When Catalyst and Avro schemas have different field orders, the nullability validation was incorrectly using positional indexing instead of name-based field mapping. The fix uses avroIndices(i) to map Catalyst field positions to Avro field positions when checking nullability and generating error messages.
Added two tests to verify:
1. Reordered fields with nullable target succeed
2. Reordered fields with non-nullable target fail with correct field name
### 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.
-->
fix a bug, as explained above
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
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'.
-->
No
### 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.
-->
U/T
### 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.
-->
'Generated-by: Claude Code version 2.0.37'
--
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-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
Posted by "gengliangwang (via GitHub)" <gi...@apache.org>.
gengliangwang closed pull request #53041: [SPARK-50906][SQL] Fix Avro nullability check for reordered struct fields
URL: https://github.com/apache/spark/pull/53041
--
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-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
Posted by "fanyue-xia (via GitHub)" <gi...@apache.org>.
fanyue-xia commented on PR #53041:
URL: https://github.com/apache/spark/pull/53041#issuecomment-3534943654
> Thank you, @fanyue-xia and @gengliangwang .
>
> Could you use `[FOLLOWUP]` in the PR title next time, please?
>
> ```
> $ git log --oneline | grep SPARK-50906
> cf513611bf7 [SPARK-50906][SQL] Fix Avro nullability check for reordered struct fields
> d66667f56d7 [SPARK-50906][SQL][SS] Add nullability check for if inputs of to_avro align with schema
> ```
Will do, thanks for pointing it 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
Re: [PR] [SPARK-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #53041:
URL: https://github.com/apache/spark/pull/53041#issuecomment-3534632340
Thank you, @fanyue-xia and @gengliangwang .
Could you use `[FOLLOWUP]` in the PR title next time, please?
--
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-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
Posted by "gengliangwang (via GitHub)" <gi...@apache.org>.
gengliangwang commented on code in PR #53041:
URL: https://github.com/apache/spark/pull/53041#discussion_r2525056355
##########
connector/avro/src/test/scala/org/apache/spark/sql/avro/AvroSuite.scala:
##########
@@ -1423,6 +1423,56 @@ abstract class AvroSuite
}
}
+ test("to_avro with reordered fields and nullable target succeeds") {
+ // Test that when Catalyst and Avro field orders differ, null values
+ // are correctly validated against the mapped Avro field's nullability
+ val avroSchema = """{
+ "type": "record",
+ "name": "ReorderedRecord",
+ "fields": [
+ {"name": "a", "type": ["null", "string"]},
+ {"name": "b", "type": "string"}
+ ]
+ }"""
+
+ // Catalyst has fields in order [b, a], Avro has [a, b]
+ // Pass null for 'a' which is nullable in Avro - should succeed
+ val df = Seq(("B", null.asInstanceOf[String])).toDF("b", "a")
+ .select(struct($"b", $"a").as("s"))
+ val result = df.select(functions.to_avro($"s", avroSchema).as("avro"))
+
+ // Should succeed without throwing AVRO_CANNOT_WRITE_NULL_FIELD
+ val collected = result.collect()
+ assert(collected.length == 1)
Review Comment:
let's use `checkAnswer` to verify the result data
--
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-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
Posted by "gengliangwang (via GitHub)" <gi...@apache.org>.
gengliangwang commented on PR #53041:
URL: https://github.com/apache/spark/pull/53041#issuecomment-3530085987
LGTM except for one comment
--
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-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
Posted by "gengliangwang (via GitHub)" <gi...@apache.org>.
gengliangwang commented on code in PR #53041:
URL: https://github.com/apache/spark/pull/53041#discussion_r2525056355
##########
connector/avro/src/test/scala/org/apache/spark/sql/avro/AvroSuite.scala:
##########
@@ -1423,6 +1423,56 @@ abstract class AvroSuite
}
}
+ test("to_avro with reordered fields and nullable target succeeds") {
+ // Test that when Catalyst and Avro field orders differ, null values
+ // are correctly validated against the mapped Avro field's nullability
+ val avroSchema = """{
+ "type": "record",
+ "name": "ReorderedRecord",
+ "fields": [
+ {"name": "a", "type": ["null", "string"]},
+ {"name": "b", "type": "string"}
+ ]
+ }"""
+
+ // Catalyst has fields in order [b, a], Avro has [a, b]
+ // Pass null for 'a' which is nullable in Avro - should succeed
+ val df = Seq(("B", null.asInstanceOf[String])).toDF("b", "a")
+ .select(struct($"b", $"a").as("s"))
+ val result = df.select(functions.to_avro($"s", avroSchema).as("avro"))
+
+ // Should succeed without throwing AVRO_CANNOT_WRITE_NULL_FIELD
+ val collected = result.collect()
+ assert(collected.length == 1)
Review Comment:
let's use `checkAnswer` + `from_avro` to verify the result data
--
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-50906][SQL] Fix Avro nullability check for reordered struct fields [spark]
Posted by "gengliangwang (via GitHub)" <gi...@apache.org>.
gengliangwang commented on PR #53041:
URL: https://github.com/apache/spark/pull/53041#issuecomment-3534538648
Thanks, merging to master/4.1
--
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