Skip to content

refactor(encryption) use StandardKeyMetadata from EncryptedOutputFile in ManifestWriterBuilder #2628

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

Open
xanderbailey wants to merge 3 commits into
base: main
Choose a base branch
from
+6 −5
Open

refactor(encryption) use StandardKeyMetadata from EncryptedOutputFile in ManifestWriterBuilder #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da189b6
fix writer
xanderbailey Jun 12, 2026
053dcc8
Run cargo fmt
xanderbailey Jun 14, 2026
1e6882d
fix clippy warnings in manifest writer
xanderbailey Jun 14, 2026
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
2 changes: 1 addition & 1 deletion crates/iceberg/public-api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,7 +2079,7 @@ pub fn iceberg::spec::ManifestWriterBuilder::build_v2_deletes(self) -> iceberg::
pub fn iceberg::spec::ManifestWriterBuilder::build_v3_data(self) -> iceberg::spec::ManifestWriter
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>

@xanderbailey xanderbailey Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This isn't a break to users since this hasn't been released or used within the crate

pub struct iceberg::spec::Map
impl iceberg::spec::Map
pub fn iceberg::spec::Map::get(&self, key: &iceberg::spec::Literal) -> core::option::Option<&core::option::Option<iceberg::spec::Literal>>
Expand Down
9 changes: 5 additions & 4 deletions crates/iceberg/src/spec/manifest/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@ impl ManifestWriterBuilder {
pub fn new_from_encrypted(
encrypted_output: EncryptedOutputFile,
snapshot_id: Option<i64>,
key_metadata: Option<Vec<u8>>,
schema: SchemaRef,
partition_spec: PartitionSpec,
) -> Self {
) -> Result<Self> {
let location = encrypted_output.location().to_owned();
Self {
let key_metadata = Some(encrypted_output.key_metadata().encode()?.to_vec());
Ok(Self {
writer_future: Box::pin(async move { encrypted_output.writer().await }),
location,
snapshot_id,
key_metadata,
schema,
partition_spec,
}
})
}

/// Build a [`ManifestWriter`] for format version 1.
Expand Down Expand Up @@ -124,6 +124,7 @@ impl ManifestWriterBuilder {
.format_version(FormatVersion::V2)
.content(ManifestContentType::Data)
.build();

ManifestWriter::new(
self.writer_future,
self.location,
Expand Down
Loading