DanielLeens commented on PR #11503:
URL: https://github.com/apache/seatunnel/pull/11503#issuecomment-5553104904
## Merge conflict with `dev` resolved — head is now `9a51685e` (merge of
`dev@af0a647d`)
GitHub had flipped this PR to `mergeable: false` / `dirty` after #11271
("Prune removed tables from restored incremental splits", `af0a647d`) landed on
`dev`. davidzollo merged `dev` into the branch (merge commit, no rebase —
history untouched). Exactly three paths needed a hand decision; everything else
auto-merged:
1. **`IncrementalSourceReader.java` — changed on both sides.** Only one
conflict hunk: both sides inserted helper methods at the same spot before
`snapshotState()`. This branch's static `restoreCheckpointState` /
`restoreLegacyCheckpointTables` / `toLegacyCheckpointTable` /
`toCheckpointTablePaths` and dev's instance `discoverCapturedTables` /
`pruneRestoredIncrementalSplit` / `hasRestoredCheckpointMetadata` are kept
**verbatim, both** — the two features are independent (schema restore in
`initializeSplitState` vs. split pruning in `addSplits`). Verified
mechanically: every added line from each side's diff-against-base is present in
the merged file (0 missing either way); the shared
`io.debezium.relational.TableId` import was an identical add.
2. **`IncrementalSourceReaderTest.java` — created on both sides.** Unioned
into one class: dev's 4 `testAddSplits*` tests + their helpers (`createReader`,
`restoredIncrementalSplit`, `catalogTable`, the two `TableId` constants) and
this branch's 5 `restoreCheckpointState*` tests — 9 tests total, no name
collisions, imports merged and regrouped to the repo's import order.
3. **`CouchbaseWriterCloseTest.java`** — deleted on dev, never touched here
→ follows dev's deletion.
Sanity on the merged tree: 9159 entries = dev's 9154 + this PR's 5 new
files; it differs from `dev` in exactly this PR's own 46 files (set difference
vs. the pre-merge diff is empty); `google-java-format` reports no non-import
diffs on the two hand-merged files. CI has re-queued on `9a51685e`; I'll
re-verify from scratch once it reports, since the merged reader now runs with
dev's pruning in the same restore path.
--
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]
