zhjwpku commented on code in PR #774: URL: https://github.com/apache/iceberg-cpp/pull/774#discussion_r4443762908
########## src/iceberg/update/rewrite_manifests.cc: ########## @@ -0,0 +1,484 @@ +/* + * 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 <array> +#include <memory> +#include <optional> +#include <ranges> +#include <span> +#include <tuple> +#include <unordered_map> +#include <utility> +#include <vector> + +#include "iceberg/constants.h" +#include "iceberg/manifest/manifest_entry.h" +#include "iceberg/manifest/manifest_list.h" +#include "iceberg/manifest/manifest_reader.h" +#include "iceberg/manifest/manifest_util_internal.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 { + +struct RewriteCandidate { + ManifestFile manifest; + std::shared_ptr<PartitionSpec> spec; +}; + +struct ManifestStream { + ManifestFile manifest; + std::shared_ptr<PartitionSpec> spec; + ManifestEntryStreamPtr entries; +}; + +struct RewriteWriter { + std::shared_ptr<PartitionSpec> spec; + std::unique_ptr<ManifestWriter> writer; +}; + +} // namespace + +Result<std::shared_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::shared_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); + rewrite_dirty_ = true; + return *this; +} + +RewriteManifests& RewriteManifests::RewriteIf(RewritePredicate predicate) { + ICEBERG_BUILDER_CHECK(static_cast<bool>(predicate), "Rewrite predicate cannot be null"); + predicate_ = std::move(predicate); + rewrite_dirty_ = true; + return *this; +} + +RewriteManifests& RewriteManifests::DeleteManifest(const ManifestFile& manifest) { + deleted_manifests_.insert(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.has_value() || + 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() && !manifest.added_snapshot_id.has_value()) { + added_manifests_.push_back(manifest); + } else { + // Retain the input so Apply can recreate the copy after retry cleanup. + added_manifests_to_copy_.push_back(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"); + + SnapshotReader snapshot_reader(snapshot.get()); + ICEBERG_ASSIGN_OR_RAISE(auto current_manifests, + snapshot_reader.Manifests(ctx_->table->io())); + + auto current_manifest_set = + current_manifests | std::ranges::to<std::unordered_set<ManifestFile>>(); + + ICEBERG_RETURN_UNEXPECTED( + ValidateDeletedManifests(current_manifest_set, snapshot->snapshot_id)); + + if (base().format_version > 1) { + for (auto it = added_manifests_.begin(); it != added_manifests_.end();) { + ICEBERG_ASSIGN_OR_RAISE(auto format_version, + ReadManifestFormatVersion(*it, ctx_->table->io())); + if (format_version == 1) { + // Reusing a v1 manifest with a new positive commit sequence would leave + // its EXISTING entries without sequence numbers. Copy it on this apply, + // including when the table was upgraded before transaction replay. + added_manifests_to_copy_.push_back(*it); + it = added_manifests_.erase(it); + } else { + ++it; + } + } + } + for (size_t i = rewritten_added_manifests_.size(); i < added_manifests_to_copy_.size(); + ++i) { + ICEBERG_ASSIGN_OR_RAISE(auto copied_manifest, + CopyManifest(added_manifests_to_copy_[i])); + rewritten_added_manifests_.push_back(std::move(copied_manifest)); + } + + if (RequiresRewrite(current_manifest_set)) { + ICEBERG_RETURN_UNEXPECTED(Rewrite(current_manifests)); + } else { + kept_manifests_ = current_manifests | + std::views::filter([this](const auto& manifest) { + return !rewritten_manifests_.contains(manifest) && + !deleted_manifests_.contains(manifest); + }) | + std::ranges::to<std::vector>(); + } + + ICEBERG_RETURN_UNEXPECTED(ValidateFilesCounts()); + + const std::array created_manifests{std::span(new_manifests_), + std::span(added_manifests_), + std::span(rewritten_added_manifests_)}; + auto manifests = + created_manifests | std::views::join | + std::views::transform([snapshot_id = SnapshotId()](ManifestFile manifest) { + manifest.added_snapshot_id = snapshot_id; + return manifest; + }) | + std::ranges::to<std::vector>(); + manifests.insert(manifests.end(), kept_manifests_.begin(), kept_manifests_.end()); + + 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_.Set(SnapshotSummaryFields::kManifestsCreated, + std::to_string(new_manifests_.size() + added_manifests_.size() + + rewritten_added_manifests_.size())); + summary_.Set(SnapshotSummaryFields::kManifestsKept, + std::to_string(kept_manifests_.size())); + summary_.Set(SnapshotSummaryFields::kManifestsReplaced, + std::to_string(rewritten_manifests_.size() + deleted_manifests_.size())); + 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); Review Comment: You're right, `Clear` preserves properties_, and the base setter already stores custom properties there. I'll remove the duplication and verify this with the existing commit-conflict regression. -- 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]
