Commit 51d2e12
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
368 | 368 | | |
369 | 369 | | |
370 | 370 | | |
371 | | - | |
372 | | - | |
373 | | - | |
374 | | - | |
375 | | - | |
376 | 371 | | |
377 | 372 | | |
378 | 373 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
929 | 929 | | |
930 | 930 | | |
931 | 931 | | |
932 | | - | |
933 | | - | |
934 | | - | |
935 | | - | |
936 | | - | |
937 | | - | |
938 | | - | |
939 | 932 | | |
0 commit comments