=== Applying patches on top of PostgreSQL commit ID e8bfad4ca842733b957c01e732ec009778f952cd === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Nov 8 04:38:33 UTC 2025 On branch cf/4971 nothing to commit, working tree clean === using 'git am' to apply patch ./v25-0001-This-is-https-commitfest.postgresql.org-50-5160-.patch === Applying: This is https://commitfest.postgresql.org/50/5160/ and https://commitfest.postgresql.org/patch/5438/ merged in single commit. it is required for stability of stress tests. === using 'git am' to apply patch ./v25-0002-Add-stress-tests-for-concurrent-index-builds.patch === Applying: Add stress tests for concurrent index builds === using 'git am' to apply patch ./v25-0003-Reset-snapshots-periodically-in-non-unique-non-p.patch === Applying: Reset snapshots periodically in non-unique non-parallel concurrent index builds error: sha1 information is lacking or useless (src/backend/commands/indexcmds.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Reset snapshots periodically in non-unique non-parallel concurrent index builds 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 ./v25-0003-Reset-snapshots-periodically-in-non-unique-non-p.patch === patching file contrib/amcheck/verify_nbtree.c patching file contrib/pgstattuple/pgstattuple.c patching file src/backend/access/brin/brin.c patching file src/backend/access/gin/gininsert.c Hunk #2 succeeded at 678 (offset 31 lines). Hunk #3 succeeded at 742 (offset 31 lines). Hunk #4 succeeded at 758 (offset 31 lines). Hunk #5 succeeded at 772 (offset 31 lines). Hunk #6 succeeded at 945 (offset 31 lines). Hunk #7 succeeded at 970 (offset 31 lines). Hunk #8 succeeded at 1022 (offset 31 lines). Hunk #9 succeeded at 1098 (offset 31 lines). Hunk #10 succeeded at 1116 (offset 31 lines). patching file src/backend/access/gist/gistbuild.c patching file src/backend/access/hash/hash.c patching file src/backend/access/heap/heapam.c patching file src/backend/access/heap/heapam_handler.c patching file src/backend/access/index/genam.c patching file src/backend/access/nbtree/nbtsort.c Hunk #1 FAILED at 259. Hunk #6 succeeded at 1418 (offset -2 lines). Hunk #7 succeeded at 1444 (offset -2 lines). Hunk #8 succeeded at 1507 (offset -2 lines). Hunk #9 succeeded at 1603 (offset -2 lines). Hunk #10 succeeded at 1621 (offset -2 lines). 1 out of 10 hunks FAILED -- saving rejects to file src/backend/access/nbtree/nbtsort.c.rej patching file src/backend/access/spgist/spginsert.c patching file src/backend/catalog/index.c patching file src/backend/commands/indexcmds.c patching file src/backend/optimizer/plan/planner.c Hunk #2 succeeded at 6972 (offset 44 lines). Hunk #3 succeeded at 7028 (offset 44 lines). Hunk #4 succeeded at 7090 (offset 44 lines). patching file src/include/access/heapam.h patching file src/include/access/tableam.h patching file src/test/modules/injection_points/Makefile patching file src/test/modules/injection_points/expected/cic_reset_snapshots.out patching file src/test/modules/injection_points/meson.build patching file src/test/modules/injection_points/sql/cic_reset_snapshots.sql Unstaged changes after reset: M contrib/amcheck/verify_nbtree.c M contrib/pgstattuple/pgstattuple.c M src/backend/access/brin/brin.c M src/backend/access/gin/gininsert.c M src/backend/access/gist/gistbuild.c M src/backend/access/hash/hash.c M src/backend/access/heap/heapam.c M src/backend/access/heap/heapam_handler.c M src/backend/access/index/genam.c M src/backend/access/nbtree/nbtsort.c M src/backend/access/spgist/spginsert.c M src/backend/catalog/index.c M src/backend/commands/indexcmds.c M src/backend/optimizer/plan/planner.c M src/include/access/heapam.h M src/include/access/tableam.h M src/test/modules/injection_points/Makefile M src/test/modules/injection_points/meson.build Removing src/backend/access/nbtree/nbtsort.c.rej Removing src/test/modules/injection_points/expected/cic_reset_snapshots.out Removing src/test/modules/injection_points/sql/cic_reset_snapshots.sql === using 'git apply' to apply patch ./v25-0003-Reset-snapshots-periodically-in-non-unique-non-p.patch === Applied patch to 'contrib/amcheck/verify_nbtree.c' cleanly. Applied patch to 'contrib/pgstattuple/pgstattuple.c' cleanly. Applied patch to 'src/backend/access/brin/brin.c' cleanly. Applied patch to 'src/backend/access/gin/gininsert.c' cleanly. Applied patch to 'src/backend/access/gist/gistbuild.c' cleanly. Applied patch to 'src/backend/access/hash/hash.c' cleanly. Applied patch to 'src/backend/access/heap/heapam.c' cleanly. Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly. Applied patch to 'src/backend/access/index/genam.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtsort.c' with conflicts. Applied patch to 'src/backend/access/spgist/spginsert.c' cleanly. Applied patch to 'src/backend/catalog/index.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/optimizer/plan/planner.c' cleanly. Applied patch to 'src/include/access/heapam.h' cleanly. Applied patch to 'src/include/access/tableam.h' cleanly. Applied patch to 'src/test/modules/injection_points/Makefile' cleanly. Falling back to direct application... Applied patch to 'src/test/modules/injection_points/meson.build' cleanly. Falling back to direct application... U src/backend/access/nbtree/nbtsort.c diff --cc src/backend/access/nbtree/nbtsort.c index 454adaee7dc,7b09ad878b7..00000000000 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@@ -257,9 -257,9 +257,15 @@@ typedef struct BTWriteStat static double _bt_spools_heapscan(Relation heap, Relation index, BTBuildState *buildstate, IndexInfo *indexInfo); static void _bt_spooldestroy(BTSpool *btspool); ++<<<<<<< ours +static void _bt_spool(BTSpool *btspool, const ItemPointerData *self, + const Datum *values, const bool *isnull); +static void _bt_leafbuild(BTSpool *btspool, BTSpool *btspool2); ++======= + static void _bt_spool(BTSpool *btspool, ItemPointer self, + Datum *values, bool *isnull); + static void _bt_leafbuild(BTSpool *btspool, BTSpool *btspool2, bool reset_snapshots); ++>>>>>>> theirs static void _bt_build_callback(Relation index, ItemPointer tid, Datum *values, bool *isnull, bool tupleIsAlive, void *state); static BulkWriteBuffer _bt_blnewpage(BTWriteState *wstate, uint32 level);