Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 98 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ unused_qualifications = "deny"
[workspace.dependencies]
aes-gcm = "0.10"
anyhow = "1.0.72"
apache-avro = { version = "0.21", features = ["snappy", "zstandard"] }
apache-avro = { version = "0.22", features = ["snappy", "zstandard"] }

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deserializer's union handling rides on how 0.22's deserialize_any dispatches unions, which isn't a documented public contract — a 0.22.x minor bump could shift it under us. Worth a comment here that the adapter semantics are pinned to this version, and keeping test_parse_manifest_reads_union_writer_fields_as_{required,optional} as the guard for the next bump.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deserializer's union handling rides on how 0.22's deserialize_any dispatches unions, which isn't a documented public contract

As I read serde's Deserializer contract, deserialize_any on a self-describing format dispatches on the data. 0.22's schema-aware deserialize_any reads a union's branch index and continues with that branch's schema (deser_schema/mod.rs#L228-L272). The new tests in avro/deserializer.rs read union and non-union writer values into plain and Option targets. A 0.22.x release that changes the dispatch fails them, along with the two union tests you named. Would those tests work as the guard instead of a comment in Cargo.toml?

array-init = "2"
arrow = "59.2"
arrow-arith = "59.2"
Expand Down
1 change: 1 addition & 0 deletions crates/iceberg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ rand = { workspace = true }
regex = { workspace = true }
serde_arrow = { version = "0.14", features = ["arrow-59"] }
tempfile = { workspace = true }
tracing-subscriber = { workspace = true }

[package.metadata.cargo-machete]
# These dependencies are added to ensure minimal dependency version
Expand Down
Loading
Loading