=== Applying patches on top of PostgreSQL commit ID 50fd428b2b9cb036c9c5982b56443d7e28119707 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Jun 29 04:00:24 UTC 2025 On branch cf/5012 nothing to commit, working tree clean === using 'git am' to apply patch ./v23-0001-Machinery-for-grabbing-an-extended-vacuum-statistics.patch === Applying: Machinery for grabbing an extended vacuum statistics on table relations. Using index info to reconstruct a base tree... M src/backend/access/heap/vacuumlazy.c M src/backend/commands/vacuum.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/catalog/pg_proc.dat M src/include/utils/elog.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/elog.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/commands/vacuum.c Auto-merging src/backend/access/heap/vacuumlazy.c CONFLICT (content): Merge conflict in src/backend/access/heap/vacuumlazy.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 Machinery for grabbing an extended vacuum statistics on table relations. 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". Unstaged changes after reset: M src/backend/access/heap/vacuumlazy.c M src/backend/access/heap/visibilitymap.c M src/backend/catalog/system_views.sql M src/backend/commands/vacuum.c M src/backend/commands/vacuumparallel.c M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/error/elog.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/catalog/pg_proc.dat M src/include/commands/vacuum.h M src/include/pgstat.h M src/include/utils/elog.h M src/test/isolation/isolation_schedule M src/test/regress/expected/rules.out M src/test/regress/parallel_schedule Removing src/test/isolation/expected/vacuum-extending-in-repetable-read.out Removing src/test/isolation/specs/vacuum-extending-in-repetable-read.spec Removing src/test/regress/expected/vacuum_tables_statistics.out Removing src/test/regress/sql/vacuum_tables_statistics.sql === using patch(1) to apply patch ./v23-0001-Machinery-for-grabbing-an-extended-vacuum-statistics.patch === patching file src/backend/access/heap/vacuumlazy.c Hunk #8 FAILED at 881. Hunk #9 succeeded at 1048 (offset 1 line). Hunk #10 succeeded at 1083 (offset 1 line). Hunk #11 succeeded at 3101 (offset -20 lines). 1 out of 11 hunks FAILED -- saving rejects to file src/backend/access/heap/vacuumlazy.c.rej patching file src/backend/access/heap/visibilitymap.c patching file src/backend/catalog/system_views.sql patching file src/backend/commands/vacuum.c Hunk #1 succeeded at 116 (offset 1 line). Hunk #2 succeeded at 2548 (offset 31 lines). patching file src/backend/commands/vacuumparallel.c patching file src/backend/utils/activity/pgstat.c patching file src/backend/utils/activity/pgstat_relation.c patching file src/backend/utils/adt/pgstatfuncs.c patching file src/backend/utils/error/elog.c patching file src/backend/utils/misc/guc_tables.c patching file src/backend/utils/misc/postgresql.conf.sample patching file src/include/catalog/pg_proc.dat patching file src/include/commands/vacuum.h patching file src/include/pgstat.h patching file src/include/utils/elog.h patching file src/test/isolation/expected/vacuum-extending-in-repetable-read.out patching file src/test/isolation/isolation_schedule patching file src/test/isolation/specs/vacuum-extending-in-repetable-read.spec patching file src/test/regress/expected/rules.out patching file src/test/regress/expected/vacuum_tables_statistics.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/vacuum_tables_statistics.sql Unstaged changes after reset: M src/backend/access/heap/vacuumlazy.c M src/backend/access/heap/visibilitymap.c M src/backend/catalog/system_views.sql M src/backend/commands/vacuum.c M src/backend/commands/vacuumparallel.c M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/error/elog.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/catalog/pg_proc.dat M src/include/commands/vacuum.h M src/include/pgstat.h M src/include/utils/elog.h M src/test/isolation/isolation_schedule M src/test/regress/expected/rules.out M src/test/regress/parallel_schedule Removing src/backend/access/heap/vacuumlazy.c.rej Removing src/test/isolation/expected/vacuum-extending-in-repetable-read.out Removing src/test/isolation/specs/vacuum-extending-in-repetable-read.spec Removing src/test/regress/expected/vacuum_tables_statistics.out Removing src/test/regress/sql/vacuum_tables_statistics.sql === using 'git apply' to apply patch ./v23-0001-Machinery-for-grabbing-an-extended-vacuum-statistics.patch === Applied patch to 'src/backend/access/heap/vacuumlazy.c' with conflicts. Applied patch to 'src/backend/access/heap/visibilitymap.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/vacuum.c' cleanly. Applied patch to 'src/backend/commands/vacuumparallel.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_relation.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/backend/utils/error/elog.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/commands/vacuum.h' cleanly. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/include/utils/elog.h' 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/regress/expected/rules.out' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/parallel_schedule' cleanly. Falling back to direct application... U src/backend/access/heap/vacuumlazy.c diff --cc src/backend/access/heap/vacuumlazy.c index 4111a8996b5,ee27e70a798..00000000000 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@@ -757,6 -880,8 +880,11 @@@ heap_vacuum_rel(Relation rel, VacuumPar vacrel->vm_new_visible_pages = 0; vacrel->vm_new_visible_frozen_pages = 0; vacrel->vm_new_frozen_pages = 0; ++<<<<<<< ours ++======= + vacrel->rel_pages = orig_rel_pages = RelationGetNumberOfBlocks(rel); + vacrel->wraparound_failsafe_count = 0; ++>>>>>>> theirs /* * Get cutoffs that determine which deleted tuples are considered DEAD,