Skip to content

refactor: protect merging snapshot update hooks #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
manuzhang wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Draft

refactor: protect merging snapshot update hooks #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/iceberg/test/merging_snapshot_update_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ class TestMergeAppend : public MergingSnapshotUpdate {
std::string operation() override { return "append"; }

// Expose protected API for test access
using MergingSnapshotUpdate::Apply;
using MergingSnapshotUpdate::CleanUncommitted;
using MergingSnapshotUpdate::Summary;

Status AddFile(std::shared_ptr<DataFile> file) { return AddDataFile(std::move(file)); }
Status AddDelete(std::shared_ptr<DataFile> file) {
return AddDeleteFile(std::move(file));
Expand Down Expand Up @@ -268,6 +272,8 @@ class TestOverwriteUpdate : public MergingSnapshotUpdate {
std::string operation() override { return DataOperation::kOverwrite; }
int64_t GeneratedSnapshotId() { return SnapshotId(); }

using MergingSnapshotUpdate::Apply;

Status AddDelete(std::shared_ptr<DataFile> file) {
return AddDeleteFile(std::move(file));
}
Expand Down
2 changes: 1 addition & 1 deletion src/iceberg/update/merging_snapshot_update.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class ICEBERG_EXPORT MergingSnapshotUpdate : public SnapshotUpdate {
public:
~MergingSnapshotUpdate() override = default;

protected:
// SnapshotUpdate overrides
Result<std::vector<ManifestFile>> Apply(
const TableMetadata& metadata_to_update,
Expand All @@ -79,7 +80,6 @@ class ICEBERG_EXPORT MergingSnapshotUpdate : public SnapshotUpdate {

std::unordered_map<std::string, std::string> Summary() override;

protected:
/// \brief Constructor; reads merge configuration from table properties.
explicit MergingSnapshotUpdate(std::string table_name,
std::shared_ptr<TransactionContext> ctx);
Expand Down