File tree Expand file tree Collapse file tree 4 files changed +9
-20
lines changed
crates/iceberg/src/transaction Expand file tree Collapse file tree 4 files changed +9
-20
lines changed Original file line number Diff line number Diff line change @@ -94,7 +94,6 @@ impl TransactionAction for FastAppendAction {
9494 vec ! [ ] ,
9595 vec ! [ ] ,
9696 vec ! [ ] ,
97- None ,
9897 ) ;
9998
10099 // validate added files
Original file line number Diff line number Diff line change @@ -151,16 +151,15 @@ impl TransactionAction for RewriteFilesAction {
151151 self . added_delete_files . clone ( ) ,
152152 self . deleted_data_files . clone ( ) ,
153153 self . deleted_delete_files . clone ( ) ,
154- self . data_sequence_number . clone ( ) ,
155154 ) ;
156155
157156 let rewrite_operation = RewriteFilesOperation {
158157 added_data_files : self . added_data_files . clone ( ) ,
159158 added_delete_files : self . added_delete_files . clone ( ) ,
160159 deleted_data_files : self . deleted_data_files . clone ( ) ,
161160 deleted_delete_files : self . deleted_delete_files . clone ( ) ,
162- starting_snapshot_id : self . starting_snapshot_id . clone ( ) ,
163- data_sequence_number : self . data_sequence_number . clone ( ) ,
161+ starting_snapshot_id : self . starting_snapshot_id ,
162+ data_sequence_number : self . data_sequence_number ,
164163 } ;
165164
166165 // todo should be able to configure to use the merge manifest process
Original file line number Diff line number Diff line change @@ -82,7 +82,6 @@ pub(crate) struct SnapshotProducer<'a> {
8282 // It starts from 0 and increments for each new manifest file.
8383 // Note: This counter is limited to the range of (0..u64::MAX).
8484 manifest_counter : RangeFrom < u64 > ,
85- starting_sequence_number : Option < i64 > ,
8685}
8786
8887impl < ' a > SnapshotProducer < ' a > {
@@ -97,7 +96,6 @@ impl<'a> SnapshotProducer<'a> {
9796 added_delete_files : Vec < DataFile > ,
9897 deleted_data_files : Vec < DataFile > ,
9998 deleted_delete_files : Vec < DataFile > ,
100- starting_sequence_number : Option < i64 > ,
10199 ) -> Self {
102100 Self {
103101 table,
@@ -110,7 +108,6 @@ impl<'a> SnapshotProducer<'a> {
110108 deleted_data_files,
111109 deleted_delete_files,
112110 manifest_counter : ( 0 ..) ,
113- starting_sequence_number,
114111 }
115112 }
116113
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ pub(crate) trait SnapshotValidator {
9191 let snapshots = ancestors_between (
9292 & Arc :: new ( base. metadata ( ) . clone ( ) ) ,
9393 to_snapshot_id,
94- from_snapshot_id. clone ( ) ,
94+ from_snapshot_id,
9595 ) ;
9696
9797 for current_snapshot in snapshots {
@@ -193,18 +193,12 @@ pub(crate) trait SnapshotValidator {
193193 }
194194
195195 // Get starting seq num from starting snapshot if available
196- let starting_sequence_number = if from_snapshot_id. is_some ( )
197- && base
198- . metadata ( )
199- . snapshots
200- . get ( & from_snapshot_id. unwrap ( ) )
201- . is_some ( )
202- {
203- base. metadata ( )
204- . snapshots
205- . get ( & from_snapshot_id. unwrap ( ) )
206- . unwrap ( )
207- . sequence_number ( )
196+
197+ let starting_sequence_number = if let Some ( from_snapshot_id) = from_snapshot_id {
198+ match base. metadata ( ) . snapshots . get ( & from_snapshot_id) {
199+ Some ( snapshot) => snapshot. sequence_number ( ) ,
200+ None => INITIAL_SEQUENCE_NUMBER ,
201+ }
208202 } else {
209203 INITIAL_SEQUENCE_NUMBER
210204 } ;
You can’t perform that action at this time.
0 commit comments