rebase and ignore optional fields when copying deleted status

Author: CTTY

crates/iceberg/src/transaction/rewrite_files.rs

@@ -25,8 +25,8 @@ use super::snapshot::{DefaultManifestProcess, SnapshotProduceOperation, Snapshot
 use super::{ActionCommit, TransactionAction};
 use crate::error::{Error, ErrorKind, Result};
 use crate::spec::{
-    DataContentType, DataFile, ManifestContentType, ManifestEntry, ManifestEntryRef, ManifestFile,
-    ManifestStatus, Operation,
+    DataContentType, DataFile, ManifestContentType, ManifestEntry, ManifestFile, ManifestStatus,
+    Operation,
 };
 use crate::table::Table;
 use crate::transaction::validate::SnapshotValidator;
@@ -170,18 +170,12 @@ impl TransactionAction for RewriteFilesAction {
 }
 
 fn copy_with_deleted_status(entry: &ManifestEntry) -> Result<ManifestEntry> {
-    let mut builder = ManifestEntry::builder()
+    let builder = ManifestEntry::builder()
         .status(ManifestStatus::Deleted)
+        .snapshot_id_opt(entry.snapshot_id())
+        .sequence_number_opt(entry.sequence_number())
         .data_file(entry.data_file().clone());
 
-    if let Some(snapshot_id) = entry.snapshot_id() {
-        builder = builder.snapshot_id(snapshot_id);
-    }
-
-    if let Some(sequence_number) = entry.sequence_number() {
-        builder = builder.sequence_number(sequence_number);
-    }
-
     // todo copy file seq no as well
 
     Ok(builder.build())

crates/iceberg/src/transaction/snapshot.rs

@@ -23,11 +23,10 @@ use uuid::Uuid;
 
 use crate::error::Result;
 use crate::spec::{
-    DataContentType, DataFile, DataFileFormat, FormatVersion, MAIN_BRANCH, ManifestContentType, ManifestEntry,
-    ManifestFile, ManifestListWriter, ManifestWriter, ManifestWriterBuilder, Operation,
-    PROPERTY_WRITE_PARTITION_SUMMARY_LIMIT, PROPERTY_WRITE_PARTITION_SUMMARY_LIMIT_DEFAULTSnapshot,
-    SnapshotReference, SnapshotRetention, SnapshotSummaryCollector, Struct, StructType, Summary,
-    TableProperties, update_snapshot_summaries,
+    DataContentType, DataFile, DataFileFormat, FormatVersion, MAIN_BRANCH, ManifestContentType,
+    ManifestEntry, ManifestFile, ManifestListWriter, ManifestWriter, ManifestWriterBuilder,
+    Operation, Snapshot, SnapshotReference, SnapshotRetention, SnapshotSummaryCollector, Struct,
+    StructType, Summary, TableProperties, update_snapshot_summaries,
 };
 use crate::table::Table;
 use crate::transaction::ActionCommit;