Skip to content

refine: add new_manifest_writer in SnapshotProducer #1481

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

Merged
merged 1 commit into from
Jul 2, 2025
Merged

refine: add new_manifest_writer in SnapshotProducer #1481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 27 additions & 21 deletions crates/iceberg/src/transaction/snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ use std::ops::RangeFrom;
use uuid::Uuid;

use crate::error::Result;
use crate::io::OutputFile;
use crate::spec::{
DataFile, DataFileFormat, FormatVersion, MAIN_BRANCH, ManifestEntry, ManifestFile,
ManifestListWriter, ManifestWriterBuilder, Operation, PROPERTY_WRITE_PARTITION_SUMMARY_LIMIT,
PROPERTY_WRITE_PARTITION_SUMMARY_LIMIT_DEFAULT, Snapshot, SnapshotReference, SnapshotRetention,
SnapshotSummaryCollector, Struct, StructType, Summary, update_snapshot_summaries,
DataFile, DataFileFormat, FormatVersion, MAIN_BRANCH, ManifestContentType, ManifestEntry,
ManifestFile, ManifestListWriter, ManifestWriter, ManifestWriterBuilder, Operation,
PROPERTY_WRITE_PARTITION_SUMMARY_LIMIT, PROPERTY_WRITE_PARTITION_SUMMARY_LIMIT_DEFAULT,
Snapshot, SnapshotReference, SnapshotRetention, SnapshotSummaryCollector, Struct, StructType,
Summary, update_snapshot_summaries,
};
use crate::table::Table;
use crate::transaction::ActionCommit;
Expand Down Expand Up @@ -177,7 +177,11 @@ impl SnapshotProducer {
snapshot_id
}

fn new_manifest_output(&mut self, table: &Table) -> Result<OutputFile> {
fn new_manifest_writer(
&mut self,
content: ManifestContentType,
table: &Table,
) -> Result<ManifestWriter> {
let new_manifest_path = format!(
"{}/{}/{}-m{}.{}",
table.metadata().location(),
Expand All @@ -186,7 +190,22 @@ impl SnapshotProducer {
self.manifest_counter.next().unwrap(),
DataFileFormat::Avro
);
table.file_io().new_output(new_manifest_path)
let output_file = table.file_io().new_output(new_manifest_path)?;
let builder = ManifestWriterBuilder::new(
output_file,
Some(self.snapshot_id),
self.key_metadata.clone(),
table.metadata().current_schema().clone(),
table.metadata().default_partition_spec().as_ref().clone(),
);
if table.metadata().format_version() == FormatVersion::V1 {
Ok(builder.build_v1())
} else {
match content {
ManifestContentType::Data => Ok(builder.build_v2_data()),
ManifestContentType::Deletes => Ok(builder.build_v2_deletes()),
}
}
}

// Check if the partition value is compatible with the partition type.
Expand Down Expand Up @@ -244,20 +263,7 @@ impl SnapshotProducer {
builder.build()
}
});
let mut writer = {
let builder = ManifestWriterBuilder::new(
self.new_manifest_output(table)?,
Some(self.snapshot_id),
self.key_metadata.clone(),
table.metadata().current_schema().clone(),
table.metadata().default_partition_spec().as_ref().clone(),
);
if table.metadata().format_version() == FormatVersion::V1 {
builder.build_v1()
} else {
builder.build_v2_data()
}
};
let mut writer = self.new_manifest_writer(ManifestContentType::Data, table)?;
for entry in manifest_entries {
writer.add_entry(entry)?;
}
Expand Down
Loading