Skip to content

Commit 51d2e12

Browse files
committed
fix: remove duplicate code left by main-merge auto-resolution
The merge of main into pr-a-incremental-cleanup auto-resolved by keeping both copies in two places: * transaction.cc: a duplicate Result<const TableMetadata*> finalize_result definition, which made the file fail to compile. * expire_snapshots.cc: an orphaned ReachableFileCleanup direct call plus the obsolete TODO comment after the now-correct dispatch inside Finalize(), which made clang-format fail in CI. Drop the duplicates so the file compiles and matches the intended post-merge state.
1 parent 744ef56 commit 51d2e12

2 files changed

Lines changed: 0 additions & 12 deletions

File tree

src/iceberg/transaction.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,6 @@ Result<std::shared_ptr<Table>> Transaction::Commit() {
368368
? Result<const TableMetadata*>(commit_result.value()->metadata().get())
369369
: std::unexpected(commit_result.error());
370370

371-
Result<const TableMetadata*> finalize_result =
372-
commit_result.has_value()
373-
? Result<const TableMetadata*>(commit_result.value()->metadata().get())
374-
: std::unexpected(commit_result.error());
375-
376371
for (const auto& update : pending_updates_) {
377372
std::ignore = update->Finalize(finalize_result);
378373
}

src/iceberg/update/expire_snapshots.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -929,11 +929,4 @@ Status ExpireSnapshots::Finalize(Result<const TableMetadata*> commit_result) {
929929
expired_ids, cleanup_level_);
930930
}
931931

932-
ReachableFileCleanup strategy(ctx_->table->io(), delete_func_);
933-
return strategy.CleanFiles(metadata_before_expiration, metadata_after_expiration,
934-
expired_ids, cleanup_level_);
935-
}
936-
937-
// TODO(shangxinli): add IncrementalFileCleanup strategy for linear ancestry optimization.
938-
939932
} // namespace iceberg

0 commit comments

Comments
 (0)