=== Applying patches on top of PostgreSQL commit ID ef5f559b95e2883c32d20d309d316f0572fd84b5 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Dec 14 02:25:21 UTC 2025 On branch cf/5151 nothing to commit, working tree clean === using 'git am' to apply patch ./v16-0001-This-patch-introduces-new-injection-points-and-T.patch === Applying: This patch introduces new injection points and TAP tests to reproduce and verify conflict detection issues that arise during SNAPSHOT_DIRTY index scans in logical replication. .git/rebase-apply/patch:59: trailing whitespace. during non-MVCC scans (SnapshotDirty and SnapshotSelf). This issue can occur if a .git/rebase-apply/patch:60: trailing whitespace. concurrent transaction deletes a tuple and inserts a new tuple with a new TID in the .git/rebase-apply/patch:63: trailing whitespace. backend-local storage, it might skip the old tuple due to deletion and miss the new warning: 3 lines add whitespace errors. Using index info to reconstruct a base tree... M src/backend/executor/execIndexing.c M src/backend/replication/logical/worker.c Falling back to patching base and 3-way merge... Auto-merging src/backend/replication/logical/worker.c Auto-merging src/backend/executor/execIndexing.c CONFLICT (content): Merge conflict in src/backend/executor/execIndexing.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 This patch introduces new injection points and TAP tests to reproduce and verify conflict detection issues that arise during SNAPSHOT_DIRTY index scans in logical replication. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M src/backend/access/index/indexam.c M src/backend/access/nbtree/README M src/backend/executor/execIndexing.c M src/backend/replication/logical/worker.c M src/include/utils/snapshot.h M src/test/subscription/meson.build Removing src/test/subscription/t/037_delete_missing_race.pl Removing src/test/subscription/t/038_update_missing_race.pl Removing src/test/subscription/t/039_update_missing_with_retain.pl Removing src/test/subscription/t/040_update_missing_simulation.pl === using patch(1) to apply patch ./v16-0001-This-patch-introduces-new-injection-points-and-T.patch === patching file src/backend/access/index/indexam.c patching file src/backend/access/nbtree/README patching file src/backend/executor/execIndexing.c Hunk #1 succeeded at 118 (offset 1 line). Hunk #2 succeeded at 782 (offset 1 line). Hunk #3 succeeded at 952 with fuzz 2 (offset 6 lines). patching file src/backend/replication/logical/worker.c Hunk #2 succeeded at 2986 (offset 23 lines). patching file src/include/utils/snapshot.h patching file src/test/subscription/meson.build patching file src/test/subscription/t/037_delete_missing_race.pl patching file src/test/subscription/t/038_update_missing_race.pl patching file src/test/subscription/t/039_update_missing_with_retain.pl patching file src/test/subscription/t/040_update_missing_simulation.pl [cf/5151 d81e1c8b2cf] This patch introduces new injection points and TAP tests to reproduce and verify conflict detection issues that arise during SNAPSHOT_DIRTY index scans in logical replication. Author: nkey Date: Sat Nov 23 13:25:11 2024 +0100 10 files changed, 594 insertions(+), 1 deletion(-) create mode 100644 src/test/subscription/t/037_delete_missing_race.pl create mode 100644 src/test/subscription/t/038_update_missing_race.pl create mode 100644 src/test/subscription/t/039_update_missing_with_retain.pl create mode 100644 src/test/subscription/t/040_update_missing_simulation.pl === using 'git am' to apply patch ./v16-0002-Fix-logical-replication-conflict-detection-durin.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v16-0002-Fix-logical-replication-conflict-detection-durin.patch === patching file src/backend/executor/execReplication.c Hunk #7 succeeded at 363 with fuzz 2. [cf/5151 7a4a7513e72] Fix logical replication conflict detection during tuple lookup Author: nkey Date: Wed Sep 3 19:08:55 2025 +0200 1 file changed, 18 insertions(+), 45 deletions(-)