=== Applying patches on top of PostgreSQL commit ID 9cfd19bc10ac07139ca6c6d051d4492764441edb === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jul 1 21:07:31 UTC 2026 On branch cf/6968 nothing to commit, working tree clean === using 'git am' to apply patch ./v49-0001-Add-tests-to-cover-a-variety-of-heap-HOT-update-.patch === Applying: Add tests to cover a variety of heap HOT update behaviors === using 'git am' to apply patch ./v49-0002-Identify-modified-indexed-attributes-in-the-exec.patch === Applying: Identify modified indexed attributes in the executor on UPDATE === using 'git am' to apply patch ./v49-0003-Add-the-HOT-indexed-on-disk-format-inline-attr-b.patch === Applying: Add the HOT-indexed on-disk format: inline attr bitmap and stubs === using 'git am' to apply patch ./v49-0004-Add-HOT-indexed-updates-selective-index-maintena.patch === Applying: Add HOT-indexed updates: selective index maintenance and reads === using 'git am' to apply patch ./v49-0005-Collapse-dead-HOT-indexed-chains-to-xid-free-stu.patch === Applying: Collapse dead HOT-indexed chains to xid-free stubs on prune/vacuum === using 'git am' to apply patch ./v49-0006-Teach-amcheck-to-recognize-HOT-indexed-chains-an.patch === Applying: Teach amcheck to recognize HOT-indexed chains and collapse stubs === using 'git am' to apply patch ./v49-0007-Add-HOT-indexed-statistics-and-the-comprehensive.patch === Applying: Add HOT-indexed statistics and the comprehensive test suite Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/test/recovery/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/recovery/meson.build CONFLICT (content): Merge conflict in src/test/recovery/meson.build Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging doc/src/sgml/monitoring.sgml 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 HOT-indexed statistics and the comprehensive test suite 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 ./v49-0007-Add-HOT-indexed-statistics-and-the-comprehensive.patch === patching file contrib/pg_surgery/Makefile patching file contrib/pg_surgery/expected/heap_surgery.out patching file contrib/pg_surgery/sql/heap_surgery.sql patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 4326 (offset -3 lines). Hunk #2 succeeded at 4809 (offset -3 lines). Hunk #3 succeeded at 5511 (offset -3 lines). patching file src/backend/access/heap/Makefile patching file src/backend/access/heap/README.HOT-INDEXED patching file src/backend/access/heap/hot_indexed_stats.c patching file src/backend/access/heap/meson.build patching file src/backend/catalog/system_views.sql patching file src/backend/utils/adt/pgstatfuncs.c Hunk #2 succeeded at 1857 (offset -40 lines). patching file src/include/catalog/pg_proc.dat Hunk #2 succeeded at 6186 (offset -8 lines). patching file src/test/isolation/expected/hot_indexed_adversarial.out patching file src/test/isolation/isolation_schedule patching file src/test/isolation/specs/hot_indexed_adversarial.spec patching file src/test/recovery/Makefile patching file src/test/recovery/meson.build Hunk #1 FAILED at 63. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/055_hot_indexed_recovery.pl patching file src/test/regress/expected/hot_indexed_updates.out patching file src/test/regress/expected/rules.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/hot_indexed_updates.sql Unstaged changes after reset: M contrib/pg_surgery/Makefile M contrib/pg_surgery/expected/heap_surgery.out M contrib/pg_surgery/sql/heap_surgery.sql M doc/src/sgml/monitoring.sgml M src/backend/access/heap/Makefile M src/backend/access/heap/README.HOT-INDEXED M src/backend/access/heap/meson.build M src/backend/catalog/system_views.sql M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/test/isolation/isolation_schedule M src/test/recovery/Makefile M src/test/regress/expected/rules.out M src/test/regress/parallel_schedule Removing src/backend/access/heap/hot_indexed_stats.c Removing src/test/isolation/expected/hot_indexed_adversarial.out Removing src/test/isolation/specs/hot_indexed_adversarial.spec Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/055_hot_indexed_recovery.pl Removing src/test/regress/expected/hot_indexed_updates.out Removing src/test/regress/sql/hot_indexed_updates.sql === using 'git apply' to apply patch ./v49-0007-Add-HOT-indexed-statistics-and-the-comprehensive.patch === Applied patch to 'contrib/pg_surgery/Makefile' cleanly. Applied patch to 'contrib/pg_surgery/expected/heap_surgery.out' cleanly. Applied patch to 'contrib/pg_surgery/sql/heap_surgery.sql' cleanly. Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/access/heap/Makefile' cleanly. Applied patch to 'src/backend/access/heap/README.HOT-INDEXED' cleanly. Falling back to direct application... Applied patch to 'src/backend/access/heap/meson.build' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Falling back to direct application... Applied patch to 'src/test/isolation/isolation_schedule' cleanly. Falling back to direct application... Applied patch to 'src/test/recovery/Makefile' cleanly. Applied patch to 'src/test/recovery/meson.build' with conflicts. Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Falling back to direct application... U src/test/recovery/meson.build diff --cc src/test/recovery/meson.build index 9eb8ed11425,8dbcda35775..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -62,6 -62,8 +62,11 @@@ tests += 't/051_effective_wal_level.pl', 't/052_checkpoint_segment_missing.pl', 't/053_standby_login_event_trigger.pl', ++<<<<<<< ours ++======= + 't/054_unlogged_sequence_promotion.pl', + 't/055_hot_indexed_recovery.pl', ++>>>>>>> theirs ], }, }