anoopj commented on code in PR #3564: URL: https://github.com/apache/iceberg-rust/pull/3564#discussion_r4429608478
########## crates/iceberg/src/transaction/snapshot/manifest_filter.rs: ########## @@ -0,0 +1,227 @@ +// 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. + +//! Rewrites existing manifests to mark files as deleted. + +use std::collections::{HashMap, HashSet}; + +use uuid::Uuid; + +use super::{manifest_path, new_manifest_writer}; +use crate::error::{Result, invalid_data}; +use crate::io::object_cache::ManifestKey; +use crate::spec::{DataFile, FormatVersion, ManifestContentType, ManifestFile}; +use crate::table::Table; + +/// Removes a fixed set of files from the manifests of one content type. +/// +/// One manager lives for one logical execution of an action and is driven +/// once per attempt via [`ManifestFilterManager::filter`]. A manifest that +/// references none of the files passes through untouched. One that does is +/// rewritten with those entries marked `Deleted` and the rest `Existing`. +/// +/// A rewrite is reused across attempts while its inputs are unchanged. Its +/// entries carry the sequence numbers and row ids the source's entries +/// inherited from the manifest list when they were read, so the reuse key is +/// the source's [`ManifestKey`], not its path alone: a transaction-local +/// source manifest keeps its path across attempts but inherits new values +/// after a rebase. +pub(crate) struct ManifestFilterManager { + content: ManifestContentType, + /// Paths of the files to remove. Fixed for the execution. + files_to_remove: HashSet<String>, + /// Source manifest → rewritten result. + filtered: HashMap<ManifestKey, FilteredManifest>, + /// Format version the rewrites were written under. Per spec, v1 entries + /// cannot inherit sequence numbers, so an upgrade invalidates them. + format_version: Option<FormatVersion>, +} + +/// One rewritten manifest and the files it marked as deleted. +#[derive(Clone)] +struct FilteredManifest { + manifest: ManifestFile, + removed_files: Vec<DataFile>, +} + +/// The result of one filter pass. +pub(crate) struct Filtered { + /// The resulting manifests, in input order. + pub manifests: Vec<ManifestFile>, + /// The files that were live and are now marked deleted, including their + /// metrics as read from the source manifests. + pub removed_files: Vec<DataFile>, +} + +impl ManifestFilterManager { + pub(crate) fn new(content: ManifestContentType, files_to_remove: &[DataFile]) -> Self { + Self { + content, + files_to_remove: files_to_remove + .iter() + .map(|f| f.file_path().to_string()) + .collect(), Review Comment: Could we retain (`file_path`, `content_offset`, `content_size_in_bytes`) as the identity of delete entries? The spec permits multiple DVs in one Puffin file. If it contains `DV(A)` and `DV(B)`, replacing only `DV(A)` currently marks both old entries deleted because they share a path. `B` remains live but loses its deletes, potentially making deleted rows visible again. The missing-target check also conflates different blobs. -- 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]
