=== Applying patches on top of PostgreSQL commit ID 74c77052bc20017076100f0649ca0f44b1b98c29 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Sep  4 21:29:31 UTC 2026
On branch cf/6747
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Refactor-some-TOAST-value-ID-code-to-use-Oid8-ins.patch ===
Applying: Refactor some TOAST value ID code to use Oid8 instead of Oid
Using index info to reconstruct a base tree...
M	contrib/amcheck/verify_heapam.c
M	src/backend/access/heap/heaptoast.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/include/access/tableam.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/tableam.h
Auto-merging src/backend/replication/logical/reorderbuffer.c
Auto-merging src/backend/access/heap/heaptoast.c
Auto-merging contrib/amcheck/verify_heapam.c
CONFLICT (content): Merge conflict in contrib/amcheck/verify_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 Refactor some TOAST value ID code to use Oid8 instead of Oid
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 ./v2-0001-Refactor-some-TOAST-value-ID-code-to-use-Oid8-ins.patch ===
patching file src/include/access/heaptoast.h
patching file src/include/access/tableam.h
Hunk #2 succeeded at 1987 (offset 4 lines).
patching file src/backend/access/common/toast_internals.c
patching file src/backend/access/heap/heaptoast.c
Hunk #2 succeeded at 729 (offset 4 lines).
Hunk #3 succeeded at 741 (offset 4 lines).
Hunk #4 succeeded at 756 (offset 4 lines).
Hunk #5 succeeded at 785 (offset 4 lines).
patching file src/backend/replication/logical/reorderbuffer.c
Hunk #2 succeeded at 5010 (offset 13 lines).
Hunk #3 succeeded at 5034 (offset 13 lines).
Hunk #4 succeeded at 5061 (offset 13 lines).
Hunk #5 succeeded at 5174 (offset 13 lines).
Hunk #6 succeeded at 5195 (offset 13 lines).
patching file contrib/amcheck/verify_heapam.c
Hunk #1 FAILED at 1563.
Hunk #2 succeeded at 1574 (offset 4 lines).
Hunk #3 succeeded at 1594 (offset 4 lines).
Hunk #4 succeeded at 1614 (offset 4 lines).
Hunk #5 succeeded at 1626 (offset 4 lines).
Hunk #6 succeeded at 1637 (offset 4 lines).
Hunk #7 succeeded at 1669 (offset 4 lines).
Hunk #8 succeeded at 1778 (offset 4 lines).
Hunk #9 succeeded at 1811 (offset 4 lines).
Hunk #10 succeeded at 1828 (offset 4 lines).
Hunk #11 FAILED at 1870.
Hunk #12 succeeded at 1905 (offset 5 lines).
2 out of 12 hunks FAILED -- saving rejects to file contrib/amcheck/verify_heapam.c.rej
Unstaged changes after reset:
M	contrib/amcheck/verify_heapam.c
M	src/backend/access/common/toast_internals.c
M	src/backend/access/heap/heaptoast.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/include/access/heaptoast.h
M	src/include/access/tableam.h
Removing contrib/amcheck/verify_heapam.c.rej
=== using 'git apply' to apply patch ./v2-0001-Refactor-some-TOAST-value-ID-code-to-use-Oid8-ins.patch ===
Applied patch to 'src/include/access/heaptoast.h' cleanly.
Applied patch to 'src/include/access/tableam.h' cleanly.
Applied patch to 'src/backend/access/common/toast_internals.c' cleanly.
Applied patch to 'src/backend/access/heap/heaptoast.c' cleanly.
Applied patch to 'src/backend/replication/logical/reorderbuffer.c' cleanly.
Applied patch to 'contrib/amcheck/verify_heapam.c' with conflicts.
U contrib/amcheck/verify_heapam.c
diff --cc contrib/amcheck/verify_heapam.c
index 6757baee240,b67fe0cc3f3..00000000000
--- a/contrib/amcheck/verify_heapam.c
+++ b/contrib/amcheck/verify_heapam.c
@@@ -1563,10 -1563,9 +1563,16 @@@ check_toast_tuple(HeapTuple toasttup, H
  	bool		isnull;
  	int32		chunksize;
  	int32		expected_size;
++<<<<<<< ours
 +	int32		max_chunk_size;
 +
 +	max_chunk_size = TOAST_MAX_CHUNK_SIZE;
 +	last_chunk_seq = (extsize - 1) / max_chunk_size;
++=======
+ 	Oid8		toast_valueid;
+ 
+ 	toast_valueid = ta->toast_pointer.va_valueid;
++>>>>>>> theirs
  
  	/* Sanity-check the sequence number. */
  	chunk_seq = DatumGetInt32(fastgetattr(toasttup, 2,
@@@ -1872,10 -1873,10 +1880,14 @@@ check_toasted_attribute(HeapCheckContex
  	uint32		extsize;
  	int32		expected_chunk_seq = 0;
  	int32		last_chunk_seq;
++<<<<<<< ours
 +	int32		max_chunk_size = TOAST_MAX_CHUNK_SIZE;
++=======
+ 	Oid8		toast_valueid;
++>>>>>>> theirs
  
  	extsize = VARATT_EXTERNAL_GET_EXTSIZE(ta->toast_pointer);
 -	last_chunk_seq = (extsize - 1) / TOAST_MAX_CHUNK_SIZE;
 +	last_chunk_seq = (extsize - 1) / max_chunk_size;
  
  	/*
  	 * Setup a scan key to find chunks in toast table with matching va_valueid