anoopj commented on code in PR #3564: URL: https://github.com/apache/iceberg-rust/pull/3564#discussion_r4429681366
########## crates/iceberg/src/transaction/snapshot/merging.rs: ########## @@ -0,0 +1,923 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +//! Persistent producer for snapshot actions that add and remove data and +//! delete files. + +use std::collections::{HashMap, HashSet}; + +use uuid::Uuid; + +use super::manifest_filter::ManifestFilterManager; +use super::{ + AddedManifests, SnapshotCommitInput, current_manifests, generate_snapshot_id, + manifest_list_path, manifest_path, validate_partition_value, write_added_manifest, + write_snapshot_commit, +}; +use crate::error::{Result, invalid_data}; +use crate::spec::{DataFile, FormatVersion, ManifestContentType, ManifestFile, Operation}; +use crate::table::Table; +use crate::transaction::ActionCommit; + +/// What a merging action asks the producer to do. +/// +/// Fixed for one logical execution; the producer derives everything else from +/// it and the table of the current attempt. The action validates the +/// table-independent parts (content types, disjoint add/remove sets) before +/// each attempt. +pub(crate) struct MergingIntent { + /// Overrides the generated commit UUID. + pub commit_uuid: Option<Uuid>, + pub operation: Operation, + pub snapshot_properties: HashMap<String, String>, + pub added_data_files: Vec<DataFile>, + pub added_delete_files: Vec<DataFile>, + pub removed_data_files: Vec<DataFile>, + pub removed_delete_files: Vec<DataFile>, + /// Whether the summary resets table totals (a full-table overwrite). + pub truncate_full_table: bool, +} + +/// Retry-persistent state for an action that adds and removes data and delete +/// files. +/// +/// One producer lives for one logical execution of an action and is driven once +/// per attempt via [`MergingSnapshotProducer::apply`]. Per attempt it takes the +/// current snapshot's manifests, rewrites those that reference a removed file, +/// appends manifests for the added files, and writes a manifest list. Identity +/// (commit UUID, snapshot id) is fixed on first use; rewritten and added +/// manifests are reused across attempts while their inputs are unchanged. +pub(crate) struct MergingSnapshotProducer { + intent: MergingIntent, + /// Fixed when the producer is created, so every attempt shares one UUID. + commit_uuid: Uuid, + /// Resolved against the table on the first attempt, then stable. + snapshot_id: Option<i64>, + /// Incremented per attempt; distinguishes manifest-list paths. + attempt: u64, + /// Numbers every manifest this producer writes, including rewrites. Never + /// reset, so paths never collide across attempts. + manifest_counter: u64, + data_filter: ManifestFilterManager, + delete_filter: ManifestFilterManager, + /// Manifests written for the added files, reused across attempts. + added_manifests: Option<AddedManifests>, + /// Metadata files written by this producer (manifests and every attempt's + /// manifest list). + // TODO(#3417): consumed by terminal cleanup once it is wired up. + owned_artifacts: HashSet<String>, +} + +impl MergingSnapshotProducer { + pub(crate) fn new(intent: MergingIntent) -> Self { + Self { + commit_uuid: intent.commit_uuid.unwrap_or_else(Uuid::now_v7), + data_filter: ManifestFilterManager::new( + ManifestContentType::Data, + &intent.removed_data_files, + ), + delete_filter: ManifestFilterManager::new( + ManifestContentType::Deletes, + &intent.removed_delete_files, + ), + intent, + snapshot_id: None, + attempt: 0, + manifest_counter: 0, + added_manifests: None, + owned_artifacts: HashSet::new(), + } + } + + /// Produces the resulting manifest set for the current table and writes + /// this attempt's snapshot. + pub(crate) async fn apply(&mut self, table: &Table) -> Result<ActionCommit> { + let snapshot_id = self.snapshot_id(table); + + let manifests = current_manifests(table).await?; + + // Removals first: filtering only touches the current snapshot's + // manifests, never the ones this producer adds. + let data = self + .data_filter + .filter( + table, + snapshot_id, + self.commit_uuid, + manifests, + &mut self.manifest_counter, + &mut self.owned_artifacts, + ) + .await?; + let deletes = self + .delete_filter + .filter( + table, + snapshot_id, + self.commit_uuid, + data.manifests, + &mut self.manifest_counter, + &mut self.owned_artifacts, + ) + .await?; + let mut manifests = deletes.manifests; + + manifests.extend(self.added_manifests(table, snapshot_id).await?); + + let manifest_list_path = self.next_manifest_list_path(table, snapshot_id)?; + + let added_files: Vec<DataFile> = self + .intent + .added_data_files + .iter() + .chain(&self.intent.added_delete_files) + .cloned() + .collect(); + + write_snapshot_commit(table, SnapshotCommitInput { + snapshot_id, + manifest_list_path, + operation: self.intent.operation.clone(), + properties: self.intent.snapshot_properties.clone(), + added_files: &added_files, + removed_files: &data.removed_files, + removed_delete_files: &deletes.removed_files, + manifests, + truncate_full_table: self.intent.truncate_full_table, + }) + .await + } + + /// Checks that every added file is written under the table's default + /// partition spec with a compatible partition value, and that delete files + /// are only added to tables whose format supports them. + /// + /// Runs against the table the manifests are written for; a later rebase + /// does not invalidate manifests already written under a spec the table + /// still has. + fn validate_added_files(&self, table: &Table) -> Result<()> { + let metadata = table.metadata(); + if !self.intent.added_delete_files.is_empty() + && metadata.format_version() == FormatVersion::V1 + { + return Err(invalid_data!( + "Cannot add delete files to a format version 1 table" + )); Review Comment: Could this enforce delete format compatibility for every supported version? Delete Formats prohibits DVs in v2 and adding ordinary position-delete files in v3. Both currently succeed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
