=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Apr 15 04:37:31 UTC 2026 On branch cf/5542 nothing to commit, working tree clean === using 'git am' to apply patch ./v14-0001-Add-vectorized-API-for-visibility-map-lookup.patch === Applying: Add vectorized API for visibility map lookup Using index info to reconstruct a base tree... M src/backend/access/heap/visibilitymap.c M src/include/access/visibilitymap.h Falling back to patching base and 3-way merge... Auto-merging src/include/access/visibilitymap.h CONFLICT (content): Merge conflict in src/include/access/visibilitymap.h Auto-merging src/backend/access/heap/visibilitymap.c CONFLICT (content): Merge conflict in src/backend/access/heap/visibilitymap.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 Add vectorized API for visibility map lookup 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 ./v14-0001-Add-vectorized-API-for-visibility-map-lookup.patch === patching file src/backend/access/heap/visibilitymap.c Hunk #1 FAILED at 16. Hunk #2 succeeded at 131 (offset 12 lines). Hunk #3 succeeded at 300 (offset -94 lines). Hunk #4 succeeded at 336 (offset -94 lines). Hunk #5 succeeded at 346 (offset -94 lines). 1 out of 5 hunks FAILED -- saving rejects to file src/backend/access/heap/visibilitymap.c.rej patching file src/include/access/visibilitymap.h Hunk #1 FAILED at 41. 1 out of 1 hunk FAILED -- saving rejects to file src/include/access/visibilitymap.h.rej Unstaged changes after reset: M src/backend/access/heap/visibilitymap.c Removing src/backend/access/heap/visibilitymap.c.rej Removing src/include/access/visibilitymap.h.rej === using 'git apply' to apply patch ./v14-0001-Add-vectorized-API-for-visibility-map-lookup.patch === Applied patch to 'src/backend/access/heap/visibilitymap.c' with conflicts. Applied patch to 'src/include/access/visibilitymap.h' with conflicts. U src/backend/access/heap/visibilitymap.c U src/include/access/visibilitymap.h diff --cc src/backend/access/heap/visibilitymap.c index 4fd470702aa,40cff906eeb..00000000000 --- a/src/backend/access/heap/visibilitymap.c +++ b/src/backend/access/heap/visibilitymap.c @@@ -14,8 -14,9 +14,14 @@@ * visibilitymap_clear - clear bits for one page in the visibility map * visibilitymap_pin - pin a map page for setting a bit * visibilitymap_pin_ok - check whether correct map page is already pinned ++<<<<<<< ours + * visibilitymap_set - set bit(s) in a previously pinned page + * visibilitymap_get_status - get status of bits ++======= + * visibilitymap_set - set bit(s) in a previously pinned page and log + * visibilitymap_set_vmbits - set bit(s) in a pinned page + * visibilitymap_get_status_v - get status of bits ++>>>>>>> theirs * visibilitymap_count - count number of bits set in visibility map * visibilitymap_prepare_truncate - * prepare for truncation of the visibility map diff --cc src/include/access/visibilitymap.h index e4e0cfa989e,1fce032a48c..00000000000 --- a/src/include/access/visibilitymap.h +++ b/src/include/access/visibilitymap.h @@@ -31,13 -32,30 +31,38 @@@ extern bool visibilitymap_clear(Relatio extern void visibilitymap_pin(Relation rel, BlockNumber heapBlk, Buffer *vmbuf); extern bool visibilitymap_pin_ok(BlockNumber heapBlk, Buffer vmbuf); ++<<<<<<< ours +extern void visibilitymap_set(BlockNumber heapBlk, + Buffer vmBuf, uint8 flags, + const RelFileLocator rlocator); +extern uint8 visibilitymap_get_status(Relation rel, BlockNumber heapBlk, Buffer *vmbuf); ++======= + extern uint8 visibilitymap_set(Relation rel, + BlockNumber heapBlk, Buffer heapBuf, + XLogRecPtr recptr, + Buffer vmBuf, + TransactionId cutoff_xid, + uint8 flags); + extern uint8 visibilitymap_set_vmbits(BlockNumber heapBlk, + Buffer vmBuf, uint8 flags, + const RelFileLocator rlocator); + extern void visibilitymap_get_statusv(Relation rel, const BlockNumber *heapBlks, + uint8 *statusv, int nblocks, + Buffer *vmbuf); ++>>>>>>> theirs extern void visibilitymap_count(Relation rel, BlockNumber *all_visible, BlockNumber *all_frozen); extern BlockNumber visibilitymap_prepare_truncate(Relation rel, BlockNumber nheapblocks); +extern BlockNumber visibilitymap_truncation_length(BlockNumber nheapblocks); + static inline uint8 + visibilitymap_get_status(Relation rel, BlockNumber heapBlk, Buffer *vmbuf) + { + uint8 status; + + visibilitymap_get_statusv(rel, &heapBlk, &status, 1, vmbuf); + + return status; + } + #endif /* VISIBILITYMAP_H */