refactor(encryption) use StandardKeyMetadata from EncryptedOutputFile in ManifestWriterBuilder#2628
Merged
blackmwk merged 4 commits intoJul 1, 2026
Conversation
xanderbailey
commented
Jun 12, 2026
| pub fn iceberg::spec::ManifestWriterBuilder::build_v3_deletes(self) -> iceberg::spec::ManifestWriter | ||
| pub fn iceberg::spec::ManifestWriterBuilder::new(output: iceberg::io::OutputFile, snapshot_id: core::option::Option<i64>, key_metadata: core::option::Option<alloc::vec::Vec<u8>>, schema: iceberg::spec::SchemaRef, partition_spec: iceberg::spec::PartitionSpec) -> Self | ||
| pub fn iceberg::spec::ManifestWriterBuilder::new_from_encrypted(encrypted_output: iceberg::encryption::EncryptedOutputFile, snapshot_id: core::option::Option<i64>, key_metadata: core::option::Option<alloc::vec::Vec<u8>>, schema: iceberg::spec::SchemaRef, partition_spec: iceberg::spec::PartitionSpec) -> Self | ||
| pub fn iceberg::spec::ManifestWriterBuilder::new_from_encrypted(encrypted_output: iceberg::encryption::EncryptedOutputFile, snapshot_id: core::option::Option<i64>, schema: iceberg::spec::SchemaRef, partition_spec: iceberg::spec::PartitionSpec) -> iceberg::Result<Self> |
Contributor
Author
There was a problem hiding this comment.
This isn't a break to users since this hasn't been released or used within the crate
xanderbailey
commented
Jun 12, 2026
Contributor
Author
There was a problem hiding this comment.
I didn't realise this at the time but it's likely incorrect that we have key_metadata in this constructor at all. This should never be present with a plaintext OutputFile. But in #2568 we discussed a desire to not break this API but on closer look, I think the current API here is error-prone.
Contributor
Author
There was a problem hiding this comment.
@blackmwk very interested to know your thoughts here.
Contributor
There was a problem hiding this comment.
Yes, we should remove it.
Contributor
Author
There was a problem hiding this comment.
Opened a new PR here #2666, wanted to keep this one targeted. Hope that's okay.
Contributor
Author
|
failing CI is fixed in #2627 |
xanderbailey
force-pushed
the
xb/refactor_manifest_list_writer_2
branch
from
584f31f to
da189b6
Compare
blackmwk
pushed a commit
that referenced
this pull request
Jul 1, 2026
…nencrypted manifest writer (#2666) ## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123. --> - working towards #2034 Follow up for #2628 ## What changes are included in this PR? Now that we have two constructors for `ManifestWriterBuilder`, `new` and `new_from_encrypted`, it should never be the case that you want to present `key_metadata` to an unencrypted `output`. <!-- Provide a summary of the modifications in this PR. List the main changes such as new features, bug fixes, refactoring, or any other updates. --> ## Are these changes tested? <!-- Specify what test covers (unit test, integration test, etc.). If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? -->
blackmwk
approved these changes
Jul 1, 2026
blackmwk
left a comment
blackmwk
left a comment
Contributor
There was a problem hiding this comment.
Thanks @xanderbailey for this fix!
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.
Which issue does this PR close?
In #2568 we introduced
new_from_encryptedbut the api isn't very ergonomic becauseEncryptedOutputFilehasStandardKeyMetadataon it already so we don't need to pass inkey_metadataalso.working towards #2034
What changes are included in this PR?
Are these changes tested?