=== Applying patches on top of PostgreSQL commit ID 9d33a5a804db48b254de7a0ad2fde03152f378e3 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jun 11 06:15:32 UTC 2026
On branch cf/6176
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-heapam-store-full-HeapTupleData-in-rs_vistuples-f.patch ===
Applying: heapam: store full HeapTupleData in rs_vistuples[] for pagemode scans
Using index info to reconstruct a base tree...
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/backend/access/heap/heapam_visibility.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/heap/heapam_visibility.c
Auto-merging src/backend/access/heap/heapam_handler.c
Auto-merging src/backend/access/heap/heapam.c
=== using 'git am' to apply patch ./v7-0002-Add-RowBatch-infrastructure-for-batched-tuple-pro.patch ===
Applying: Add RowBatch infrastructure for batched tuple processing
=== using 'git am' to apply patch ./v7-0003-Add-batch-table-AM-API-and-heapam-implementation.patch ===
Applying: Add batch table AM API and heapam implementation
Using index info to reconstruct a base tree...
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/include/access/tableam.h
M	src/include/pgstat.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/pgstat.h
Auto-merging src/include/access/tableam.h
Auto-merging src/backend/access/heap/heapam_handler.c
Auto-merging src/backend/access/heap/heapam.c
CONFLICT (content): Merge conflict in src/backend/access/heap/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 Add batch table AM API and heapam implementation
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 ./v7-0003-Add-batch-table-AM-API-and-heapam-implementation.patch ===
patching file src/backend/access/heap/heapam.c
Hunk #1 FAILED at 43.
Hunk #2 succeeded at 111 (offset 2 lines).
Hunk #3 succeeded at 1218 (offset 3 lines).
Hunk #4 succeeded at 1479 (offset 14 lines).
Hunk #5 succeeded at 1507 (offset 14 lines).
Hunk #6 succeeded at 1874 (offset 14 lines).
1 out of 6 hunks FAILED -- saving rejects to file src/backend/access/heap/heapam.c.rej
patching file src/backend/access/heap/heapam_handler.c
Hunk #1 succeeded at 2294 (offset 49 lines).
Hunk #2 succeeded at 2661 (offset 126 lines).
patching file src/include/access/heapam.h
patching file src/include/access/tableam.h
Hunk #1 succeeded at 307 (offset 4 lines).
Hunk #2 succeeded at 386 (offset 4 lines).
Hunk #3 succeeded at 1156 (offset 5 lines).
patching file src/include/pgstat.h
Unstaged changes after reset:
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/heapam_handler.c
M	src/include/access/heapam.h
M	src/include/access/tableam.h
M	src/include/pgstat.h
Removing src/backend/access/heap/heapam.c.rej
=== using 'git apply' to apply patch ./v7-0003-Add-batch-table-AM-API-and-heapam-implementation.patch ===
Applied patch to 'src/backend/access/heap/heapam.c' with conflicts.
Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly.
Applied patch to 'src/include/access/heapam.h' cleanly.
Applied patch to 'src/include/access/tableam.h' cleanly.
Applied patch to 'src/include/pgstat.h' cleanly.
U src/backend/access/heap/heapam.c
diff --cc src/backend/access/heap/heapam.c
index 117e909ba2c,d45f509fa6b..00000000000
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@@ -43,7 -43,7 +43,11 @@@
  #include "catalog/pg_database.h"
  #include "catalog/pg_database_d.h"
  #include "commands/vacuum.h"
++<<<<<<< ours
 +#include "executor/instrument_node.h"
++=======
+ #include "executor/execRowBatch.h"
++>>>>>>> theirs
  #include "pgstat.h"
  #include "port/pg_bitutils.h"
  #include "storage/lmgr.h"