=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Jan 17 07:09:21 UTC 2026 On branch cf/6253 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Fix-bug-in-following-update-chain-when-locking-a-.patch === Applying: Fix bug in following update chain when locking a heap tuple Using index info to reconstruct a base tree... M src/backend/access/heap/heapam.c M src/test/modules/injection_points/Makefile M src/test/modules/injection_points/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/modules/injection_points/meson.build CONFLICT (content): Merge conflict in src/test/modules/injection_points/meson.build Auto-merging src/test/modules/injection_points/Makefile CONFLICT (content): Merge conflict in src/test/modules/injection_points/Makefile Auto-merging src/backend/access/heap/heapam.c CONFLICT (content): Merge conflict in src/backend/access/heap/heapam.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 Fix bug in following update chain when locking a heap tuple 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/heap/heapam.c M src/test/modules/injection_points/Makefile M src/test/modules/injection_points/meson.build === using patch(1) to apply patch ./v4-0001-Fix-bug-in-following-update-chain-when-locking-a-.patch === patching file src/backend/access/heap/heapam.c Hunk #1 FAILED at 85. Hunk #2 FAILED at 4816. Hunk #3 FAILED at 5063. Hunk #4 FAILED at 5721. Hunk #5 FAILED at 5734. Hunk #6 FAILED at 6048. Hunk #7 FAILED at 6066. Hunk #8 FAILED at 6087. 8 out of 8 hunks FAILED -- saving rejects to file src/backend/access/heap/heapam.c.rej patching file src/test/modules/injection_points/Makefile Hunk #1 FAILED at 14. 1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/Makefile.rej The next patch would create the file src/test/modules/injection_points/expected/heap_lock_update.out, which already exists! Skipping patch. 1 out of 1 hunk ignored patching file src/test/modules/injection_points/meson.build Hunk #1 FAILED at 46. 1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/meson.build.rej The next patch would create the file src/test/modules/injection_points/specs/heap_lock_update.spec, which already exists! Skipping patch. 1 out of 1 hunk ignored Removing src/backend/access/heap/heapam.c.rej Removing src/test/modules/injection_points/Makefile.rej Removing src/test/modules/injection_points/meson.build.rej === using 'git apply' to apply patch ./v4-0001-Fix-bug-in-following-update-chain-when-locking-a-.patch === Applied patch to 'src/backend/access/heap/heapam.c' with conflicts. Applied patch to 'src/test/modules/injection_points/Makefile' with conflicts. Performing three-way merge... Applied patch to 'src/test/modules/injection_points/expected/heap_lock_update.out' cleanly. Applied patch to 'src/test/modules/injection_points/meson.build' with conflicts. Performing three-way merge... Applied patch to 'src/test/modules/injection_points/specs/heap_lock_update.spec' cleanly. U src/backend/access/heap/heapam.c U src/test/modules/injection_points/Makefile U src/test/modules/injection_points/meson.build diff --cc src/backend/access/heap/heapam.c index f30a56ecf55,2df1aab6f29..00000000000 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@@ -87,7 -87,7 +87,11 @@@ static void compute_new_xmax_infomask(T uint16 *result_infomask2); static TM_Result heap_lock_updated_tuple(Relation rel, uint16 prior_infomask, ++<<<<<<< ours + TransactionId prior_raw_xmax, ++======= + TransactionId prior_rawxmax, ++>>>>>>> theirs const ItemPointerData *prior_ctid, TransactionId xid, LockTupleMode mode); @@@ -6100,7 -6056,7 +6104,11 @@@ out_unlocked * marks) on the updated versions. * * 'prior_infomask', 'prior_raw_xmax' and 'prior_ctid' are the corresponding ++<<<<<<< ours + * fields from the initial tuple. We will lock the tuples starting from the ++======= + * fields from the initial tuple. We will update the tuples starting from the ++>>>>>>> theirs * one that 'prior_ctid' points to. Note: This function does not lock the * initial tuple itself. * diff --cc src/test/modules/injection_points/Makefile index a41d781f8c9,cc9be6dcdd2..00000000000 --- a/src/test/modules/injection_points/Makefile +++ b/src/test/modules/injection_points/Makefile @@@ -16,6 -16,14 +16,17 @@@ ISOLATION = basic inplace \ syscache-update-pruned \ heap_lock_update ++<<<<<<< ours ++======= + + # Temporarily disabled because of flakiness + #ISOLATION =+ + # index-concurrently-upsert \ + # index-concurrently-upsert-predicate \ + # reindex-concurrently-upsert \ + # reindex-concurrently-upsert-on-constraint \ + # reindex-concurrently-upsert-partitioned ++>>>>>>> theirs # The injection points are cluster-wide, so disable installcheck NO_INSTALLCHECK = 1 diff --cc src/test/modules/injection_points/meson.build index fcc85414515,c9186ae04d1..00000000000 --- a/src/test/modules/injection_points/meson.build +++ b/src/test/modules/injection_points/meson.build @@@ -47,6 -47,12 +47,15 @@@ tests += 'inplace', 'syscache-update-pruned', 'heap_lock_update', ++<<<<<<< ours ++======= + # temporarily disabled because of flakiness + # 'index-concurrently-upsert', + # 'index-concurrently-upsert-predicate', + # 'reindex-concurrently-upsert', + # 'reindex-concurrently-upsert-on-constraint', + # 'reindex-concurrently-upsert-partitioned', ++>>>>>>> theirs ], 'runningcheck': false, # see syscache-update-pruned # Some tests wait for all snapshots, so avoid parallel execution