=== Applying patches on top of PostgreSQL commit ID 883339c170d1c73162283506c85536f735e42baa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri May 23 05:32:24 UTC 2025
On branch cf/5721
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v01-0001-Expose-visibility-checking-shim-for-index-usage.patch ===
Applying: Expose visibility checking shim for index usage
=== using 'git am' to apply patch ./v01-0002-GIST-Fix-visibility-issues-in-IOS.patch ===
Applying: GIST: Fix visibility issues in IOS
Using index info to reconstruct a base tree...
M	src/backend/access/gist/gistget.c
M	src/backend/access/gist/gistscan.c
M	src/backend/access/gist/gistvacuum.c
M	src/include/access/gist_private.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/gist_private.h
Auto-merging src/backend/access/gist/gistvacuum.c
Auto-merging src/backend/access/gist/gistscan.c
Auto-merging src/backend/access/gist/gistget.c
=== using 'git am' to apply patch ./v01-0003-SP-GIST-Fix-visibility-issues-in-IOS.patch ===
Applying: SP-GIST: Fix visibility issues in IOS
Using index info to reconstruct a base tree...
M	src/backend/access/spgist/spgscan.c
M	src/backend/access/spgist/spgvacuum.c
M	src/include/access/spgist_private.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/spgist_private.h
Auto-merging src/backend/access/spgist/spgvacuum.c
CONFLICT (content): Merge conflict in src/backend/access/spgist/spgvacuum.c
Auto-merging src/backend/access/spgist/spgscan.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 SP-GIST: Fix visibility issues in IOS
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/spgist/spgscan.c
M	src/backend/access/spgist/spgvacuum.c
M	src/include/access/spgist_private.h
=== using patch(1) to apply patch ./v01-0003-SP-GIST-Fix-visibility-issues-in-IOS.patch ===
patching file src/include/access/spgist_private.h
patching file src/backend/access/spgist/spgscan.c
Hunk #4 succeeded at 393 with fuzz 2 (offset -1 lines).
patching file src/backend/access/spgist/spgvacuum.c
Hunk #1 FAILED at 629.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/spgist/spgvacuum.c.rej
Unstaged changes after reset:
M	src/backend/access/spgist/spgscan.c
M	src/include/access/spgist_private.h
Removing src/backend/access/spgist/spgvacuum.c.rej
=== using 'git apply' to apply patch ./v01-0003-SP-GIST-Fix-visibility-issues-in-IOS.patch ===
Applied patch to 'src/include/access/spgist_private.h' cleanly.
Applied patch to 'src/backend/access/spgist/spgscan.c' cleanly.
Applied patch to 'src/backend/access/spgist/spgvacuum.c' with conflicts.
U src/backend/access/spgist/spgvacuum.c
diff --cc src/backend/access/spgist/spgvacuum.c
index 2678f7ab782,d0680a5073e..00000000000
--- a/src/backend/access/spgist/spgvacuum.c
+++ b/src/backend/access/spgist/spgvacuum.c
@@@ -619,13 -618,18 +619,22 @@@ vacuumRedirectAndPlaceholder(Relation i
   * Process one page during a bulkdelete scan
   */
  static void
 -spgvacuumpage(spgBulkDeleteState *bds, BlockNumber blkno)
 +spgvacuumpage(spgBulkDeleteState *bds, Buffer buffer)
  {
  	Relation	index = bds->info->index;
 -	Buffer		buffer;
 +	BlockNumber blkno = BufferGetBlockNumber(buffer);
  	Page		page;
  
++<<<<<<< ours
 +	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
++=======
+ 	/* call vacuum_delay_point while not holding any buffer lock */
+ 	vacuum_delay_point();
+ 
+ 	buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
+ 								RBM_NORMAL, bds->info->strategy);
+ 	LockBufferForCleanup(buffer);
++>>>>>>> theirs
  	page = (Page) BufferGetPage(buffer);
  
  	if (PageIsNew(page))