zhjwpku commented on code in PR #774: URL: https://github.com/apache/iceberg-cpp/pull/774#discussion_r3523525085
########## src/iceberg/update/rewrite_manifests.cc: ########## @@ -0,0 +1,499 @@ +/* + * 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. + */ + +#include "iceberg/update/rewrite_manifests.h" + +#include <algorithm> +#include <memory> +#include <optional> +#include <span> +#include <tuple> +#include <unordered_map> +#include <utility> +#include <vector> + +#include "iceberg/constants.h" +#include "iceberg/inheritable_metadata.h" +#include "iceberg/manifest/manifest_entry.h" +#include "iceberg/manifest/manifest_list.h" +#include "iceberg/manifest/manifest_reader.h" +#include "iceberg/manifest/manifest_writer.h" +#include "iceberg/snapshot.h" +#include "iceberg/table.h" // IWYU pragma: keep +#include "iceberg/table_metadata.h" +#include "iceberg/transaction.h" +#include "iceberg/util/executor_util_internal.h" +#include "iceberg/util/macros.h" + +namespace iceberg { + +namespace { + +void SetSnapshotId(ManifestFile& manifest, int64_t snapshot_id) { + manifest.added_snapshot_id = snapshot_id; +} + +struct RewriteCandidate { + ManifestFile manifest; + std::shared_ptr<PartitionSpec> spec; +}; + +struct ManifestEntries { + ManifestFile manifest; + std::shared_ptr<PartitionSpec> spec; + std::vector<ManifestEntry> entries; +}; + +struct RewriteWriter { + std::shared_ptr<PartitionSpec> spec; + ManifestContent content; + std::unique_ptr<ManifestWriter> writer; +}; + +} // namespace + +Result<std::unique_ptr<RewriteManifests>> RewriteManifests::Make( + std::string table_name, std::shared_ptr<TransactionContext> ctx) { + ICEBERG_PRECHECK(!table_name.empty(), "Table name cannot be empty"); + ICEBERG_PRECHECK(ctx != nullptr, "Cannot create RewriteManifests without a context"); + return std::unique_ptr<RewriteManifests>( + new RewriteManifests(std::move(table_name), std::move(ctx))); +} + +RewriteManifests::RewriteManifests(std::string table_name, + std::shared_ptr<TransactionContext> ctx) + : SnapshotUpdate(std::move(ctx)), table_name_(std::move(table_name)) {} + +RewriteManifests& RewriteManifests::ClusterBy(ClusterByFunc func) { + ICEBERG_BUILDER_CHECK(static_cast<bool>(func), "Cluster function cannot be null"); + cluster_by_func_ = std::move(func); + return *this; +} + +RewriteManifests& RewriteManifests::RewriteIf(RewritePredicate predicate) { + ICEBERG_BUILDER_CHECK(static_cast<bool>(predicate), "Rewrite predicate cannot be null"); + predicate_ = std::move(predicate); + return *this; +} + +RewriteManifests& RewriteManifests::DeleteManifest(const ManifestFile& manifest) { + auto [_, inserted] = deleted_manifest_paths_.insert(manifest.manifest_path); + if (inserted) { + deleted_manifests_.push_back(manifest); + } + return *this; +} + +RewriteManifests& RewriteManifests::AddManifest(const ManifestFile& manifest) { + // Reject added/deleted files unconditionally, matching Java's checkArgument. A + // missing count is treated as non-zero (has_*_files defaults to true), so the + // error is reported at the AddManifest call site rather than deferred to Apply. + ICEBERG_BUILDER_CHECK(!manifest.has_added_files(), + "Cannot add manifest with added files"); + ICEBERG_BUILDER_CHECK(!manifest.has_deleted_files(), + "Cannot add manifest with deleted files"); + ICEBERG_BUILDER_CHECK(manifest.added_snapshot_id == kInvalidSnapshotId, + "Snapshot id must be assigned during commit"); + ICEBERG_BUILDER_CHECK(manifest.sequence_number == kInvalidSequenceNumber, + "Sequence number must be assigned during commit"); + + if (can_inherit_snapshot_id()) { + added_manifests_.push_back(manifest); + } else { + // The manifest must be rewritten with this update's snapshot ID. CopyManifest + // also validates that the manifest only contains existing entries. + ICEBERG_BUILDER_ASSIGN_OR_RETURN(auto copied_manifest, CopyManifest(manifest)); + rewritten_added_manifests_.push_back(std::move(copied_manifest)); + } + return *this; +} + +Status RewriteManifests::ValidateTargetBranch(const std::string& branch) const { + return NotSupported( + "Cannot commit to branch {}: RewriteManifests does not support branch commits", + branch); +} + +std::string RewriteManifests::operation() { return DataOperation::kReplace; } + +Result<std::vector<ManifestFile>> RewriteManifests::Apply( + const TableMetadata& /*metadata_to_update*/, + const std::shared_ptr<Snapshot>& snapshot) { + ICEBERG_PRECHECK(snapshot != nullptr, + "Cannot rewrite manifests without a current snapshot"); + + SnapshotCache cached_snapshot(snapshot.get()); + ICEBERG_ASSIGN_OR_RAISE(auto current_manifests, + cached_snapshot.Manifests(ctx_->table->io())); + + std::unordered_set<std::string> current_manifest_paths; + current_manifest_paths.reserve(current_manifests.size()); + for (const auto& manifest : current_manifests) { + current_manifest_paths.insert(manifest.manifest_path); + } + + ICEBERG_RETURN_UNEXPECTED( + ValidateDeletedManifests(current_manifest_paths, snapshot->snapshot_id)); + + if (RequiresRewrite(current_manifest_paths)) { + ICEBERG_ASSIGN_OR_RAISE(auto rewritten, Rewrite(current_manifests)); + new_manifests_ = std::move(rewritten); + } else { + // Keep any existing manifests as-is that were not processed. Previously + // created manifests in new_manifests_ are reused across commit retries. + kept_manifests_.clear(); + for (const auto& manifest : current_manifests) { + if (!rewritten_manifest_paths_.contains(manifest.manifest_path) && + !deleted_manifest_paths_.contains(manifest.manifest_path)) { + kept_manifests_.push_back(manifest); + } + } + } + + ICEBERG_RETURN_UNEXPECTED(ValidateActiveFiles()); + + std::vector<ManifestFile> manifests; + manifests.reserve(new_manifests_.size() + added_manifests_.size() + + rewritten_added_manifests_.size() + kept_manifests_.size()); + + const int64_t snapshot_id = SnapshotId(); + for (auto& manifest : new_manifests_) { + SetSnapshotId(manifest, snapshot_id); + manifests.push_back(manifest); + } + for (auto& manifest : added_manifests_) { + SetSnapshotId(manifest, snapshot_id); + manifests.push_back(manifest); + } + for (auto& manifest : rewritten_added_manifests_) { + SetSnapshotId(manifest, snapshot_id); + manifests.push_back(manifest); + } + // Kept manifests are carried over unchanged, matching Java which adds them + // as-is without recomputing counts. + for (const auto& manifest : kept_manifests_) { + manifests.push_back(manifest); + } + + manifest_count_summary_ = BuildManifestCountSummary( + manifests, + static_cast<int32_t>(rewritten_manifests_.size() + deleted_manifests_.size())); + return manifests; +} + +std::unordered_map<std::string, std::string> RewriteManifests::Summary() { + summary_.Clear(); + summary_.SetPartitionSummaryLimit(0); + for (const auto& [property, value] : custom_summary_properties_) { + summary_.Set(property, value); + } + summary_.Merge(manifest_count_summary_); + summary_.Set(SnapshotSummaryFields::kEntriesProcessed, std::to_string(entry_count_)); + return summary_.Build(); +} + +void RewriteManifests::SetSummaryProperty(const std::string& property, + const std::string& value) { + custom_summary_properties_[property] = value; + SnapshotUpdate::SetSummaryProperty(property, value); +} + +Status RewriteManifests::CleanUncommitted( + const std::unordered_set<std::string>& committed) { + if (committed.empty() && !cleanup_all_) { + return {}; + } + ICEBERG_RETURN_UNEXPECTED(DeleteUncommitted(new_manifests_, committed, + /*clear=*/false)); + ICEBERG_RETURN_UNEXPECTED(DeleteUncommitted(rewritten_added_manifests_, committed, + /*clear=*/false)); + return {}; +} + +Status RewriteManifests::Finalize(Result<const TableMetadata*> commit_result) { + if (!commit_result.has_value() && + commit_result.error().kind != ErrorKind::kCommitStateUnknown) { + cleanup_all_ = true; + } + auto status = SnapshotUpdate::Finalize(std::move(commit_result)); + cleanup_all_ = false; + return status; +} + +bool RewriteManifests::RequiresRewrite( + const std::unordered_set<std::string>& current_manifest_paths) const { + const bool has_direct_replacements = !deleted_manifests_.empty() || + !added_manifests_.empty() || + !rewritten_added_manifests_.empty(); + if (!cluster_by_func_ && !predicate_ && has_direct_replacements) { Review Comment: Not intentional. I changed RequiresRewrite to match Java. -- 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]
