[SPARK-58972][SQL][PROTOBUF] from_protobuf unwrapped primitive wrappers follow wrapper presence, not emit.default.values - #58253
Open
bhollis-dbx wants to merge 1 commit into
Conversation
…rs follow wrapper presence, not emit.default.values
### What changes were proposed in this pull request?
When `from_protobuf` is used with `unwrap.primitive.wrapper.types=true`, a present
well-known primitive wrapper (`google.protobuf.{Bool,Int32,UInt32,Int64,UInt64,Float,
Double,String,Bytes}Value`) now unwraps to its inner scalar's default (0/""/false/
empty-bytes) when the inner value is unset, rather than to null. Null results only when
the wrapper field is absent. This is independent of `emit.default.values`.
The deserializer previously read the inner scalar through the same path used for bare
proto3 scalars (`getFieldValue`), which returns null for an unset/default scalar unless
`emit.default.values=true`. That conflated wrapper *message presence* with the
`emit.default.values` option (which governs bare proto3 scalar defaults). The unwrap
converters now read the inner value directly via `DynamicMessage.getField`, which returns
the scalar's default and never null, matching proto3 wrapper semantics.
### Why are the changes needed?
- It matches the canonical proto3 JSON / wrapper mapping: wrapper presence carries the
value; absent -> null.
- It fixes an untested crash. For `repeated`/`map` fields of unwrapped wrappers the
container is non-nullable (`containsNull=false` / `valueContainsNull=false`). A
present-but-empty wrapper element used to deserialize to null inside that non-null
container, causing a downstream `UnsafeWriter` NullPointerException. With the fix such
elements become non-null defaults, so the crash and the schema mismatch both disappear
with no schema change.
### Does this PR introduce any user-facing change?
Yes. With `from_protobuf` and `unwrap.primitive.wrapper.types=true`, a present wrapper
whose inner value is the default now deserializes to that default instead of null (and
repeated/map wrappers with empty elements no longer error). Absent wrappers still
deserialize to null.
### How was this patch tested?
Updated the "test well known wrappers with emit defaults" expectations and added a new
test covering empty elements in a repeated wrapper (-> 0) and a map wrapper value (-> "").
Ran the protobuf module suite: 94 tests pass.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code
uros-b
approved these changes
Aug 24, 2026
Member
|
Thank you @bhollis-dbx! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
When
from_protobufis used withunwrap.primitive.wrapper.types=true, a present well-known primitive wrapper (google.protobuf.{Bool,Int32,UInt32,Int64,UInt64,Float,Double,String,Bytes}Value) now unwraps to its inner scalar's default (0/""/false/empty-bytes) when the inner value is unset, rather than to null. Null results only when the wrapper field is absent. This is independent ofemit.default.values.The deserializer previously read the inner scalar through the same path used for bare proto3 scalars (
getFieldValue), which returns null for an unset/default scalar unlessemit.default.values=true. That conflated wrapper message presence with theemit.default.valuesoption (which governs bare proto3 scalar defaults). The unwrap converters now read the inner value directly viaDynamicMessage.getField, which returns the scalar's default and never null, matching proto3 wrapper semantics.Why are the changes needed?
repeated/mapfields of unwrapped wrappers the container is non-nullable (containsNull=false/valueContainsNull=false). A present-but-empty wrapper element used to deserialize to null inside that non-null container, causing a downstreamUnsafeWriterNullPointerException. With the fix such elements become non-null defaults, so the crash and the schema mismatch both disappear with no schema change.Does this PR introduce any user-facing change?
Yes. With
from_protobufandunwrap.primitive.wrapper.types=true, a present wrapper whose inner value is the default now deserializes to that default instead of null (and repeated/map wrappers with empty elements no longer error). Absent wrappers still deserialize to null.How was this patch tested?
Updated the "test well known wrappers with emit defaults" expectations and added a new test covering empty elements in a repeated wrapper (-> 0) and a map wrapper value (-> ""). Ran the protobuf module suite: 94 tests pass.
Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code