=== Applying patches on top of PostgreSQL commit ID c325a7633fcb33dbd73f46ddbbe91e95ddf3b227 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 27 01:16:22 UTC 2025
On branch cf/5542
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-IOS-TableAM-Support-AM-specific-fast-visibility-.patch ===
Applying: IOS/TableAM: Support AM-specific fast visibility tests
=== using 'git am' to apply patch ./v10-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/gistvacuum.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/gist/gistvacuum.c
=== using 'git am' to apply patch ./v10-0003-SP-GIST-Fix-visibility-issues-in-IOS.patch ===
Applying: SP-GIST: Fix visibility issues in IOS
.git/rebase-apply/patch:248: trailing whitespace.
			 * unpin were checked for visibility before we returned any. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/backend/access/spgist/spgvacuum.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/spgist/spgvacuum.c
CONFLICT (content): Merge conflict in src/backend/access/spgist/spgvacuum.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 ./v10-0003-SP-GIST-Fix-visibility-issues-in-IOS.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v10-0003-SP-GIST-Fix-visibility-issues-in-IOS.patch ===
/work/patches/./v10-0003-SP-GIST-Fix-visibility-issues-in-IOS.patch:270: trailing whitespace.
			 * unpin were checked for visibility before we returned any. 
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
warning: 1 line adds whitespace errors.
diff --cc src/backend/access/spgist/spgvacuum.c
index 77deb226b7e,993d4a5b662..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(false);
+ 
+ 	buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
+ 								RBM_NORMAL, bds->info->strategy);
+ 	LockBufferForCleanup(buffer);
++>>>>>>> theirs
  	page = (Page) BufferGetPage(buffer);
  
  	if (PageIsNew(page))