=== Applying patches on top of PostgreSQL commit ID 72e6c08fea7cf59f5166e138aab927ad87570aa4 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Jul 11 13:51:26 UTC 2025 On branch cf/5483 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Add-very-basic-test-for-kill_prior_tuples.patch === Applying: Add very basic test for kill_prior_tuples === using 'git am' to apply patch ./0002-heapam-Move-logic-to-handle-HEAP_MOVED-into-a-helper.patch === Applying: heapam: Move logic to handle HEAP_MOVED into a helper function === using 'git am' to apply patch ./0003-bufmgr-Add-BufferLockHeldByMe.patch === Applying: bufmgr: Add BufferLockHeldByMe() === using 'git am' to apply patch ./0004-heapam-Use-exclusive-lock-on-old-page-in-CLUSTER.patch === Applying: heapam: Use exclusive lock on old page in CLUSTER === using 'git am' to apply patch ./0005-bufmgr-Separate-slow-fast-path-of-LockBufHdr.patch === Applying: bufmgr: Separate slow/fast path of LockBufHdr === using 'git am' to apply patch ./0006-heapam-Add-batch-mode-mvcc-check-and-use-it-in-page-.patch === Applying: heapam: Add batch mode mvcc check and use it in page mode === using 'git am' to apply patch ./0007-bufmgr-Add-interface-to-acquire-right-to-set-hint-bi.patch === Applying: bufmgr: Add interface to acquire right to set hint bits error: sha1 information is lacking or useless (src/backend/storage/buffer/bufmgr.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 bufmgr: Add interface to acquire right to set hint bits 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". === using patch(1) to apply patch ./0007-bufmgr-Add-interface-to-acquire-right-to-set-hint-bi.patch === patching file src/backend/storage/buffer/README patching file src/backend/storage/buffer/bufmgr.c Hunk #1 succeeded at 231 (offset 3 lines). Hunk #2 succeeded at 252 (offset 3 lines). Hunk #3 succeeded at 2147 (offset 3 lines). Hunk #4 succeeded at 2504 (offset 3 lines). Hunk #5 succeeded at 5429 (offset 75 lines). Hunk #6 succeeded at 5557 (offset 75 lines). Hunk #7 succeeded at 6021 (offset 75 lines). Hunk #8 succeeded at 6050 (offset 75 lines). Hunk #9 succeeded at 6126 (offset 75 lines). Hunk #10 succeeded at 6143 (offset 75 lines). Hunk #11 succeeded at 6183 (offset 75 lines). Hunk #12 succeeded at 6242 (offset 75 lines). Hunk #13 succeeded at 6849 with fuzz 1 (offset 202 lines). Hunk #14 succeeded at 7676 (offset 221 lines). patching file src/backend/utils/activity/wait_event_names.txt patching file src/include/storage/buf_internals.h patching file src/include/storage/bufmgr.h Hunk #1 succeeded at 317 with fuzz 2 (offset 10 lines). [cf/5483 6f5634679c6] bufmgr: Add interface to acquire right to set hint bits Author: Andres Freund Date: Thu Oct 17 13:59:13 2024 -0400 5 files changed, 351 insertions(+), 49 deletions(-) === using 'git am' to apply patch ./0008-heapam-Acquire-right-to-set-hint-bits.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./0008-heapam-Acquire-right-to-set-hint-bits.patch === patching file src/backend/access/heap/heapam_visibility.c patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2709 (offset 30 lines). [cf/5483 1e4373812a9] heapam: Acquire right to set hint bits Author: Andres Freund Date: Thu Oct 17 14:05:15 2024 -0400 2 files changed, 97 insertions(+), 18 deletions(-) === using 'git am' to apply patch ./0009-Acquire-right-to-set-hint-bits-in-the-remaining-plac.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./0009-Acquire-right-to-set-hint-bits-in-the-remaining-plac.patch === patching file src/backend/access/gist/gistget.c patching file src/backend/access/hash/hashutil.c patching file src/backend/access/nbtree/nbtinsert.c patching file src/backend/access/nbtree/nbtutils.c Hunk #1 succeeded at 3402 (offset 910 lines). Hunk #2 FAILED at 2515. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/access/nbtree/nbtutils.c.rej patching file src/backend/storage/freespace/freespace.c patching file src/backend/storage/freespace/fsmpage.c Unstaged changes after reset: M src/backend/access/gist/gistget.c M src/backend/access/hash/hashutil.c M src/backend/access/nbtree/nbtinsert.c M src/backend/access/nbtree/nbtutils.c M src/backend/storage/freespace/freespace.c M src/backend/storage/freespace/fsmpage.c Removing src/backend/access/nbtree/nbtutils.c.rej === using 'git apply' to apply patch ./0009-Acquire-right-to-set-hint-bits-in-the-remaining-plac.patch === Applied patch to 'src/backend/access/gist/gistget.c' cleanly. Applied patch to 'src/backend/access/hash/hashutil.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtinsert.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtutils.c' with conflicts. Applied patch to 'src/backend/storage/freespace/freespace.c' cleanly. Applied patch to 'src/backend/storage/freespace/fsmpage.c' cleanly. U src/backend/access/nbtree/nbtutils.c diff --cc src/backend/access/nbtree/nbtutils.c index 9aed207995f,53ad7b5017d..00000000000 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@@ -3421,13 -2515,11 +3425,21 @@@ _bt_killitems(IndexScanDesc scan if (killedsomething) { opaque->btpo_flags |= BTP_HAS_GARBAGE; ++<<<<<<< ours + MarkBufferDirtyHint(buf, true); + } + + if (!so->dropPin) + _bt_unlockbuf(rel, buf); + else + _bt_relbuf(rel, buf); ++======= + BufferFinishSetHintBits(so->currPos.buf, true, true); + } + + unlock_page: + _bt_unlockbuf(scan->indexRelation, so->currPos.buf); ++>>>>>>> theirs }