This is an automated email from the ASF dual-hosted git repository.
gangwu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new c46b38ec fix: SetSnapshotRef::ApplyTo should call SetRef (#540)
c46b38ec is described below
commit c46b38ec278e6b00492edcc02c68f7ac04d64c03
Author: Junwang Zhao <[email protected]>
AuthorDate: Wed Jan 28 10:34:22 2026 +0800
fix: SetSnapshotRef::ApplyTo should call SetRef (#540)
---
src/iceberg/table_update.cc | 13 ++++++-
src/iceberg/test/table_update_test.cc | 72 +++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/src/iceberg/table_update.cc b/src/iceberg/table_update.cc
index 946b2a6a..01612d76 100644
--- a/src/iceberg/table_update.cc
+++ b/src/iceberg/table_update.cc
@@ -19,13 +19,14 @@
#include "iceberg/table_update.h"
-#include "iceberg/exception.h"
#include "iceberg/schema.h"
+#include "iceberg/snapshot.h"
#include "iceberg/sort_order.h"
#include "iceberg/statistics_file.h"
#include "iceberg/table_metadata.h"
#include "iceberg/table_requirements.h"
#include "iceberg/util/checked_cast.h"
+#include "iceberg/util/macros.h"
namespace iceberg {
TableUpdate::~TableUpdate() = default;
@@ -348,7 +349,15 @@ std::unique_ptr<TableUpdate> RemoveSnapshotRef::Clone()
const {
// SetSnapshotRef
void SetSnapshotRef::ApplyTo(TableMetadataBuilder& builder) const {
- builder.SetBranchSnapshot(snapshot_id_, ref_name_);
+ std::shared_ptr<SnapshotRef> ref;
+ if (type_ == SnapshotRefType::kBranch) {
+ ICEBERG_ASSIGN_OR_THROW(
+ ref, SnapshotRef::MakeBranch(snapshot_id_, min_snapshots_to_keep_,
+ max_snapshot_age_ms_, max_ref_age_ms_));
+ } else {
+ ICEBERG_ASSIGN_OR_THROW(ref, SnapshotRef::MakeTag(snapshot_id_,
max_ref_age_ms_));
+ }
+ builder.SetRef(ref_name_, std::move(ref));
}
void SetSnapshotRef::GenerateRequirements(TableUpdateContext& context) const {
diff --git a/src/iceberg/test/table_update_test.cc
b/src/iceberg/test/table_update_test.cc
index 3cd0b722..3e41318c 100644
--- a/src/iceberg/test/table_update_test.cc
+++ b/src/iceberg/test/table_update_test.cc
@@ -37,6 +37,7 @@
#include "iceberg/test/matchers.h"
#include "iceberg/transform.h"
#include "iceberg/type.h"
+#include "iceberg/util/timepoint.h"
namespace iceberg {
@@ -368,4 +369,75 @@ TEST(TableUpdateTest, SetDefaultSortOrderApplyUpdate) {
EXPECT_EQ(metadata->default_sort_order_id, 1);
}
+// Test SetSnapshotRef ApplyTo for both branch and tag
+TEST(TableUpdateTest, SetSnapshotRefApplyUpdate) {
+ // Test branch ref
+ {
+ auto base = CreateBaseMetadata();
+ auto builder = TableMetadataBuilder::BuildFrom(base.get());
+
+ // Add a snapshot that the ref will point to
+ auto snapshot = std::make_shared<Snapshot>(
+ Snapshot{.snapshot_id = 123456789,
+ .sequence_number = 1,
+ .timestamp_ms = TimePointMsFromUnixMs(1000000),
+ .manifest_list = "s3://bucket/manifest-list.avro"});
+ builder->AddSnapshot(snapshot);
+
+ // Apply SetSnapshotRef update for a branch
+ table::SetSnapshotRef branch_update("my-branch", 123456789,
SnapshotRefType::kBranch,
+ 5, 86400000, 604800000);
+ branch_update.ApplyTo(*builder);
+
+ ICEBERG_UNWRAP_OR_FAIL(auto metadata, builder->Build());
+
+ // Verify the branch ref was added
+ ASSERT_EQ(metadata->refs.size(), 1);
+ auto it = metadata->refs.find("my-branch");
+ ASSERT_NE(it, metadata->refs.end());
+
+ const auto& ref = it->second;
+ EXPECT_EQ(ref->snapshot_id, 123456789);
+ EXPECT_EQ(ref->type(), SnapshotRefType::kBranch);
+
+ const auto& branch = std::get<SnapshotRef::Branch>(ref->retention);
+ EXPECT_EQ(branch.min_snapshots_to_keep.value(), 5);
+ EXPECT_EQ(branch.max_snapshot_age_ms.value(), 86400000);
+ EXPECT_EQ(branch.max_ref_age_ms.value(), 604800000);
+ }
+
+ // Test tag ref
+ {
+ auto base = CreateBaseMetadata();
+ auto builder = TableMetadataBuilder::BuildFrom(base.get());
+
+ // Add a snapshot that the ref will point to
+ auto snapshot = std::make_shared<Snapshot>(
+ Snapshot{.snapshot_id = 987654321,
+ .sequence_number = 1,
+ .timestamp_ms = TimePointMsFromUnixMs(2000000),
+ .manifest_list = "s3://bucket/manifest-list.avro"});
+ builder->AddSnapshot(snapshot);
+
+ // Apply SetSnapshotRef update for a tag
+ table::SetSnapshotRef tag_update("release-1.0", 987654321,
SnapshotRefType::kTag,
+ std::nullopt, std::nullopt, 259200000);
+ tag_update.ApplyTo(*builder);
+
+ ICEBERG_UNWRAP_OR_FAIL(auto metadata, builder->Build());
+
+ // Verify the tag ref was added
+ ASSERT_EQ(metadata->refs.size(), 1);
+ auto it = metadata->refs.find("release-1.0");
+ ASSERT_NE(it, metadata->refs.end());
+
+ const auto& ref = it->second;
+ EXPECT_EQ(ref->snapshot_id, 987654321);
+ EXPECT_EQ(ref->type(), SnapshotRefType::kTag);
+
+ const auto& tag = std::get<SnapshotRef::Tag>(ref->retention);
+ EXPECT_EQ(tag.max_ref_age_ms.value(), 259200000);
+ }
+}
+
} // namespace iceberg
