=== Applying patches on top of PostgreSQL commit ID 71ff232a5bc40f36365be985da72b8b6fa275811 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Apr 9 22:50:35 UTC 2026 On branch cf/4351 nothing to commit, working tree clean === using 'git am' to apply patch ./v24-0001-Add-slot-based-table-AM-index-scan-interface.patch === Applying: Add slot-based table AM index scan interface. Using index info to reconstruct a base tree... M src/backend/access/heap/heapam_handler.c M src/backend/access/index/genam.c M src/backend/access/index/indexam.c M src/backend/commands/explain.c M src/backend/executor/execIndexing.c M src/backend/executor/nodeBitmapIndexscan.c M src/backend/executor/nodeIndexonlyscan.c M src/backend/executor/nodeIndexscan.c M src/backend/utils/adt/ri_triggers.c M src/include/access/genam.h M src/include/access/relscan.h M src/include/access/tableam.h M src/include/executor/instrument_node.h M src/include/nodes/execnodes.h Falling back to patching base and 3-way merge... Auto-merging src/include/nodes/execnodes.h Auto-merging src/include/executor/instrument_node.h Auto-merging src/include/access/tableam.h Auto-merging src/include/access/relscan.h CONFLICT (content): Merge conflict in src/include/access/relscan.h Auto-merging src/include/access/genam.h Auto-merging src/backend/utils/adt/ri_triggers.c Auto-merging src/backend/executor/nodeIndexscan.c Auto-merging src/backend/executor/nodeIndexonlyscan.c Auto-merging src/backend/executor/nodeBitmapIndexscan.c Auto-merging src/backend/executor/execIndexing.c Auto-merging src/backend/commands/explain.c Auto-merging src/backend/access/index/indexam.c Auto-merging src/backend/access/index/genam.c Auto-merging src/backend/access/heap/heapam_handler.c CONFLICT (content): Merge conflict in src/backend/access/heap/heapam_handler.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 slot-based table AM index scan interface. 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 ./v24-0001-Add-slot-based-table-AM-index-scan-interface.patch === patching file src/include/access/genam.h Hunk #2 succeeded at 179 (offset -5 lines). patching file src/include/access/heapam.h patching file src/include/access/relscan.h Hunk #2 FAILED at 25. Hunk #3 succeeded at 124 (offset 6 lines). Hunk #4 succeeded at 174 (offset 6 lines). Hunk #5 succeeded at 189 (offset 6 lines). Hunk #6 succeeded at 210 (offset 6 lines). Hunk #7 succeeded at 230 (offset 5 lines). 1 out of 7 hunks FAILED -- saving rejects to file src/include/access/relscan.h.rej patching file src/include/access/tableam.h Hunk #2 succeeded at 447 (offset 4 lines). Hunk #3 succeeded at 1242 (offset 5 lines). Hunk #4 succeeded at 1264 (offset 5 lines). Hunk #5 succeeded at 1373 (offset 5 lines). patching file src/include/executor/instrument_node.h Hunk #1 succeeded at 105 (offset 57 lines). patching file src/include/nodes/execnodes.h Hunk #1 succeeded at 1790 (offset 1 line). Hunk #2 succeeded at 1812 (offset 1 line). patching file src/backend/access/heap/heapam_handler.c Hunk #1 FAILED at 657. Hunk #2 succeeded at 722 (offset 26 lines). Hunk #3 succeeded at 2663 (offset 106 lines). Hunk #4 succeeded at 2672 (offset 106 lines). 1 out of 4 hunks FAILED -- saving rejects to file src/backend/access/heap/heapam_handler.c.rej patching file src/backend/access/heap/heapam_indexscan.c patching file src/backend/access/heap/visibilitymap.c patching file src/backend/access/index/genam.c Hunk #2 succeeded at 464 (offset 8 lines). Hunk #3 succeeded at 528 (offset 8 lines). Hunk #4 succeeded at 727 (offset 8 lines). Hunk #5 succeeded at 747 (offset 8 lines). patching file src/backend/access/index/indexam.c Hunk #8 succeeded at 540 (offset -39 lines). Hunk #9 succeeded at 557 (offset -39 lines). Hunk #10 succeeded at 614 (offset -39 lines). Hunk #11 succeeded at 626 (offset -39 lines). patching file src/backend/access/nbtree/nbtinsert.c patching file src/backend/access/table/tableam.c patching file src/backend/access/table/tableamapi.c patching file src/backend/commands/constraint.c patching file src/backend/commands/explain.c Hunk #1 succeeded at 137 with fuzz 1 (offset 1 line). Hunk #2 succeeded at 1978 (offset 5 lines). Hunk #3 succeeded at 1992 (offset 5 lines). Hunk #4 succeeded at 3864 (offset 8 lines). Hunk #5 succeeded at 3894 (offset 8 lines). Hunk #6 succeeded at 3918 (offset 8 lines). patching file src/backend/executor/execIndexing.c Hunk #1 succeeded at 823 (offset 8 lines). patching file src/backend/executor/execReplication.c patching file src/backend/executor/nodeBitmapIndexscan.c patching file src/backend/executor/nodeIndexonlyscan.c Hunk #10 succeeded at 679 (offset -25 lines). Hunk #11 succeeded at 729 (offset -43 lines). patching file src/backend/executor/nodeIndexscan.c Hunk #6 succeeded at 1757 (offset 23 lines). Hunk #7 FAILED at 1801. 1 out of 7 hunks FAILED -- saving rejects to file src/backend/executor/nodeIndexscan.c.rej patching file src/backend/utils/adt/ri_triggers.c patching file src/backend/utils/adt/selfuncs.c Unstaged changes after reset: M src/backend/access/heap/heapam_handler.c M src/backend/access/heap/heapam_indexscan.c M src/backend/access/heap/visibilitymap.c M src/backend/access/index/genam.c M src/backend/access/index/indexam.c M src/backend/access/nbtree/nbtinsert.c M src/backend/access/table/tableam.c M src/backend/access/table/tableamapi.c M src/backend/commands/constraint.c M src/backend/commands/explain.c M src/backend/executor/execIndexing.c M src/backend/executor/execReplication.c M src/backend/executor/nodeBitmapIndexscan.c M src/backend/executor/nodeIndexonlyscan.c M src/backend/executor/nodeIndexscan.c M src/backend/utils/adt/ri_triggers.c M src/backend/utils/adt/selfuncs.c M src/include/access/genam.h M src/include/access/heapam.h M src/include/access/relscan.h M src/include/access/tableam.h M src/include/executor/instrument_node.h M src/include/nodes/execnodes.h Removing src/backend/access/heap/heapam_handler.c.rej Removing src/backend/executor/nodeIndexscan.c.rej Removing src/include/access/relscan.h.rej === using 'git apply' to apply patch ./v24-0001-Add-slot-based-table-AM-index-scan-interface.patch === Applied patch to 'src/include/access/genam.h' cleanly. Applied patch to 'src/include/access/heapam.h' cleanly. Applied patch to 'src/include/access/relscan.h' with conflicts. Applied patch to 'src/include/access/tableam.h' cleanly. Applied patch to 'src/include/executor/instrument_node.h' cleanly. Applied patch to 'src/include/nodes/execnodes.h' cleanly. Applied patch to 'src/backend/access/heap/heapam_handler.c' with conflicts. Applied patch to 'src/backend/access/heap/heapam_indexscan.c' cleanly. Applied patch to 'src/backend/access/heap/visibilitymap.c' cleanly. Applied patch to 'src/backend/access/index/genam.c' cleanly. Applied patch to 'src/backend/access/index/indexam.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtinsert.c' cleanly. Applied patch to 'src/backend/access/table/tableam.c' cleanly. Applied patch to 'src/backend/access/table/tableamapi.c' cleanly. Applied patch to 'src/backend/commands/constraint.c' cleanly. Applied patch to 'src/backend/commands/explain.c' cleanly. Applied patch to 'src/backend/executor/execIndexing.c' cleanly. Applied patch to 'src/backend/executor/execReplication.c' cleanly. Applied patch to 'src/backend/executor/nodeBitmapIndexscan.c' cleanly. Applied patch to 'src/backend/executor/nodeIndexonlyscan.c' cleanly. Applied patch to 'src/backend/executor/nodeIndexscan.c' cleanly. Applied patch to 'src/backend/utils/adt/ri_triggers.c' cleanly. Applied patch to 'src/backend/utils/adt/selfuncs.c' cleanly. U src/backend/access/heap/heapam_handler.c U src/include/access/relscan.h diff --cc src/backend/access/heap/heapam_handler.c index 20d3b46e062,657ae44144a..00000000000 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@@ -679,10 -657,8 +679,15 @@@ heapam_relation_copy_for_cluster(Relati tableScan = NULL; heapScan = NULL; ++<<<<<<< ours + indexScan = index_beginscan(OldHeap, OldIndex, + snapshot ? snapshot : SnapshotAny, + NULL, 0, 0, + SO_NONE); ++======= + indexScan = index_beginscan(OldHeap, OldIndex, false, + SnapshotAny, NULL, 0, 0, SO_NONE); ++>>>>>>> theirs index_rescan(indexScan, NULL, 0, NULL, 0); } else diff --cc src/include/access/relscan.h index 2ea06a67a63,986b4f5f368..00000000000 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@@ -24,7 -25,7 +25,11 @@@ struct ParallelTableScanDescData; ++<<<<<<< ours +struct TableScanInstrumentation; ++======= + struct TupleTableSlot; ++>>>>>>> theirs /* * Generic descriptor for table scans. This is the base-class for table scans,