old var name is better

Author: CTTY

crates/iceberg/src/transaction/rewrite_files.rs

@@ -32,8 +32,8 @@ pub struct RewriteFilesAction {
     commit_uuid: Option<Uuid>,
     key_metadata: Option<Vec<u8>>,
     snapshot_properties: HashMap<String, String>,
-    data_files_to_add: Vec<DataFile>,
-    data_files_to_delete: Vec<DataFile>,
+    added_data_files: Vec<DataFile>,
+    deleted_data_files: Vec<DataFile>,
 }
 
 pub struct RewriteFilesOperation;
@@ -44,26 +44,26 @@ impl RewriteFilesAction {
             commit_uuid: None,
             key_metadata: None,
             snapshot_properties: Default::default(),
-            data_files_to_add: vec![],
-            data_files_to_delete: vec![],
+            added_data_files: vec![],
+            deleted_data_files: vec![],
         }
     }
 
-    /// Add data files to the snapshot.
+    /// Add added data files to the snapshot.
     pub fn add_data_files(
         mut self,
         data_files: impl IntoIterator<Item = DataFile>,
     ) -> Result<Self> {
-        self.data_files_to_add.extend(data_files);
+        self.added_data_files.extend(data_files);
         Ok(self)
     }
 
-    /// Add data files to delete to the snapshot.
+    /// Add deleted data files to the snapshot.
     pub fn delete_data_files(
         mut self,
         data_files: impl IntoIterator<Item = DataFile>,
     ) -> Result<Self> {
-        self.data_files_to_delete.extend(data_files);
+        self.deleted_data_files.extend(data_files);
         Ok(self)
     }
 
@@ -94,8 +94,8 @@ impl TransactionAction for RewriteFilesAction {
             self.commit_uuid.unwrap_or_else(Uuid::now_v7),
             self.key_metadata.clone(),
             self.snapshot_properties.clone(),
-            self.data_files_to_add.clone(),
-            self.data_files_to_delete.clone(),
+            self.added_data_files.clone(),
+            self.deleted_data_files.clone(),
         );
 
         // todo should be able to configure merge manifest process
@@ -140,7 +140,7 @@ impl SnapshotProduceOperation for RewriteFilesOperation {
         &self,
         snapshot_producer: &SnapshotProducer<'_>,
     ) -> Result<Vec<ManifestEntry>> {
-        // Find entries that are associated with files to delete
+        // Find entries that are associated with deleted files
         let snapshot = snapshot_producer.table.metadata().current_snapshot();
 
         if let Some(snapshot) = snapshot {
@@ -151,7 +151,7 @@ impl SnapshotProduceOperation for RewriteFilesOperation {
                 )
                 .await?;
 
-            let mut deleted_entries = Vec::new();
+            let mut delete_entries = Vec::new();
 
             for manifest_file in manifest_list.entries() {
                 let manifest = manifest_file
@@ -160,16 +160,16 @@ impl SnapshotProduceOperation for RewriteFilesOperation {
 
                 for entry in manifest.entries() {
                     if snapshot_producer
-                        .data_files_to_delete
+                        .deleted_data_files
                         .iter()
                         .any(|f| f.file_path == entry.data_file().file_path)
                     {
-                        deleted_entries.push(copy_with_deleted_status(entry)?);
+                        delete_entries.push(copy_with_deleted_status(entry)?);
                     }
                 }
             }
 
-            Ok(deleted_entries)
+            Ok(delete_entries)
         } else {
             Ok(vec![])
         }
@@ -203,7 +203,7 @@ impl SnapshotProduceOperation for RewriteFilesOperation {
                 .iter()
                 .filter_map(|entry| {
                     if snapshot_producer
-                        .data_files_to_delete
+                        .deleted_data_files
                         .iter()
                         .any(|f| f.file_path == entry.data_file().file_path)
                     {
@@ -220,8 +220,8 @@ impl SnapshotProduceOperation for RewriteFilesOperation {
                 // All files from the existing manifest entries are still valid
                 existing_files.push(manifest_file.clone());
             } else {
-                // Some files are about to be deleted
-                // Rewrite the manifest file and exclude the data files to delete
+                // Some files are deleted already
+                // Rewrite the manifest file and exclude the deleted data files
                 let mut manifest_writer = snapshot_producer.new_manifest_writer(
                     ManifestContentType::Data,
                     manifest_file.partition_spec_id,

crates/iceberg/src/transaction/snapshot.rs

@@ -73,8 +73,8 @@ pub(crate) struct SnapshotProducer<'a> {
     commit_uuid: Uuid,
     key_metadata: Option<Vec<u8>>,
     snapshot_properties: HashMap<String, String>,
-    data_files_to_add: Vec<DataFile>,
-    pub data_files_to_delete: Vec<DataFile>,
+    added_data_files: Vec<DataFile>,
+    pub deleted_data_files: Vec<DataFile>,
     // A counter used to generate unique manifest file names.
     // It starts from 0 and increments for each new manifest file.
     // Note: This counter is limited to the range of (0..u64::MAX).
@@ -87,17 +87,17 @@ impl<'a> SnapshotProducer<'a> {
         commit_uuid: Uuid,
         key_metadata: Option<Vec<u8>>,
         snapshot_properties: HashMap<String, String>,
-        data_files_to_add: Vec<DataFile>,
-        data_files_to_delete: Vec<DataFile>,
+        added_data_files: Vec<DataFile>,
+        deleted_data_files: Vec<DataFile>,
     ) -> Self {
         Self {
             table,
             snapshot_id: Self::generate_unique_snapshot_id(table),
             commit_uuid,
             key_metadata,
             snapshot_properties,
-            data_files_to_add,
-            data_files_to_delete,
+            added_data_files,
+            deleted_data_files,
             manifest_counter: (0..),
         }
     }
@@ -263,8 +263,8 @@ impl<'a> SnapshotProducer<'a> {
 
     // Write manifest file for added data files and return the ManifestFile for ManifestList.
     async fn write_added_manifest(&mut self) -> Result<ManifestFile> {
-        let data_files_to_add = std::mem::take(&mut self.data_files_to_add);
-        if data_files_to_add.is_empty() {
+        let added_data_files = std::mem::take(&mut self.added_data_files);
+        if added_data_files.is_empty() {
             return Err(Error::new(
                 ErrorKind::PreconditionFailed,
                 "No added data files found when write an added manifest file",
@@ -273,7 +273,7 @@ impl<'a> SnapshotProducer<'a> {
 
         let snapshot_id = self.snapshot_id;
         let format_version = self.table.metadata().format_version();
-        let manifest_entries = data_files_to_add.into_iter().map(|data_file| {
+        let manifest_entries = added_data_files.into_iter().map(|data_file| {
             let builder = ManifestEntry::builder()
                 .status(crate::spec::ManifestStatus::Added)
                 .data_file(data_file);
@@ -358,7 +358,7 @@ impl<'a> SnapshotProducer<'a> {
         // TODO: Allowing snapshot property setup with no added data files is a workaround.
         // We should clean it up after all necessary actions are supported.
         // For details, please refer to https://github.com/apache/iceberg-rust/issues/1548
-        if self.data_files_to_add.is_empty() && self.snapshot_properties.is_empty() {
+        if self.added_data_files.is_empty() && self.snapshot_properties.is_empty() {
             return Err(Error::new(
                 ErrorKind::PreconditionFailed,
                 "No added data files or added snapshot properties found when write a manifest file",
@@ -369,7 +369,7 @@ impl<'a> SnapshotProducer<'a> {
         let mut manifest_files = existing_manifests;
 
         // Process added entries.
-        if !self.data_files_to_add.is_empty() {
+        if !self.added_data_files.is_empty() {
             let added_manifest = self.write_added_manifest().await?;
             manifest_files.push(added_manifest);
         }
@@ -406,7 +406,7 @@ impl<'a> SnapshotProducer<'a> {
 
         summary_collector.set_partition_summary_limit(partition_summary_limit);
 
-        for data_file in &self.data_files_to_add {
+        for data_file in &self.added_data_files {
             summary_collector.add_file(
                 data_file,
                 table_metadata.current_schema().clone(),