=== Applying patches on top of PostgreSQL commit ID aecc558666ad62fbecb08ff7af1394656811a581 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 28 22:33:42 UTC 2026 On branch cf/5012 nothing to commit, working tree clean === using 'git am' to apply patch ./v27-0001-Introduce-new-statistics-tracking-the-number-of-time.patch === Applying: Introduce new statistics tracking the number of times the all-visible and all-frozen bits are cleared in the visibility map (rev_all_visible_pages and rev_all_frozen_pages). These counters, together with the existing per-vacuum frozen page statistics (vm_new_frozen_pages, vm_new_visible_pages), help assess how aggressively vacuum is configured and how frequently the backend has to revoke all-frozen/all-visible bits due to concurrent modifications. === using 'git am' to apply patch ./v27-0002-Add-machinery-for-grabbing-an-extended-vacuum-statis.patch === Applying: Add machinery for grabbing an extended vacuum statistics. error: sha1 information is lacking or useless (src/backend/catalog/system_views.sql). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add machinery for grabbing an extended vacuum statistics. 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 ./v27-0002-Add-machinery-for-grabbing-an-extended-vacuum-statis.patch === patching file src/backend/access/heap/vacuumlazy.c Hunk #1 succeeded at 281 (offset 1 line). Hunk #2 succeeded at 403 (offset 2 lines). Hunk #3 succeeded at 420 (offset 2 lines). Hunk #4 succeeded at 493 (offset 2 lines). Hunk #5 succeeded at 865 (offset 2 lines). Hunk #6 succeeded at 872 (offset 2 lines). Hunk #7 succeeded at 891 (offset 2 lines). Hunk #8 succeeded at 904 (offset 2 lines). Hunk #9 succeeded at 922 (offset 2 lines). Hunk #10 succeeded at 931 (offset 2 lines). Hunk #11 succeeded at 1036 (offset 2 lines). Hunk #12 succeeded at 1199 (offset 2 lines). Hunk #13 succeeded at 1212 (offset 2 lines). Hunk #14 succeeded at 1232 (offset 2 lines). Hunk #15 succeeded at 1248 (offset 2 lines). Hunk #16 FAILED at 2189. Hunk #17 succeeded at 2913 (offset 2 lines). Hunk #18 succeeded at 3273 (offset 2 lines). Hunk #19 succeeded at 3356 (offset 2 lines). Hunk #20 succeeded at 3395 (offset 2 lines). Hunk #21 succeeded at 3421 (offset 2 lines). Hunk #22 succeeded at 3430 (offset 2 lines). Hunk #23 succeeded at 3462 (offset 2 lines). Hunk #24 succeeded at 3486 (offset 2 lines). 1 out of 24 hunks FAILED -- saving rejects to file src/backend/access/heap/vacuumlazy.c.rej patching file src/backend/catalog/heap.c patching file src/backend/catalog/index.c patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 1475 (offset 21 lines). patching file src/backend/commands/dbcommands.c Hunk #1 succeeded at 1822 (offset 7 lines). patching file src/backend/commands/vacuum.c patching file src/backend/commands/vacuumparallel.c Hunk #1 succeeded at 869 (offset 1 line). Hunk #2 succeeded at 879 (offset 1 line). Hunk #3 succeeded at 910 (offset 1 line). Hunk #4 succeeded at 1064 (offset 1 line). patching file src/backend/utils/activity/Makefile patching file src/backend/utils/activity/pgstat.c patching file src/backend/utils/activity/pgstat_database.c patching file src/backend/utils/activity/pgstat_relation.c patching file src/backend/utils/activity/pgstat_vacuum.c patching file src/backend/utils/adt/pgstatfuncs.c Hunk #1 succeeded at 2325 (offset 12 lines). patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 3110 (offset 19 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 688 (offset 19 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12704 (offset 64 lines). Hunk #2 succeeded at 12778 (offset 64 lines). patching file src/include/commands/vacuum.h patching file src/include/pgstat.h Hunk #1 succeeded at 118 (offset 4 lines). Hunk #2 succeeded at 174 (offset 4 lines). Hunk #3 succeeded at 304 (offset 4 lines). Hunk #4 succeeded at 936 (offset 3 lines). Hunk #5 succeeded at 962 (offset 3 lines). patching file src/include/utils/pgstat_internal.h patching file src/include/utils/pgstat_kind.h patching file src/test/isolation/expected/vacuum-extending-in-repetable-read.out patching file src/test/isolation/isolation_schedule Hunk #1 succeeded at 101 (offset 1 line). patching file src/test/isolation/specs/vacuum-extending-in-repetable-read.spec patching file src/test/recovery/t/052_vacuum_extending_basic_test.pl patching file src/test/recovery/t/053_vacuum_extending_freeze_test.pl patching file src/test/regress/expected/rules.out Unstaged changes after reset: M src/backend/access/heap/vacuumlazy.c M src/backend/catalog/heap.c M src/backend/catalog/index.c M src/backend/catalog/system_views.sql M src/backend/commands/dbcommands.c M src/backend/commands/vacuum.c M src/backend/commands/vacuumparallel.c M src/backend/utils/activity/Makefile M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/pgstat_database.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/misc/guc_parameters.dat 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/pgstat_internal.h M src/include/utils/pgstat_kind.h M src/test/isolation/isolation_schedule M src/test/regress/expected/rules.out Removing src/backend/access/heap/vacuumlazy.c.rej Removing src/backend/utils/activity/pgstat_vacuum.c 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/recovery/t/052_vacuum_extending_basic_test.pl Removing src/test/recovery/t/053_vacuum_extending_freeze_test.pl === using 'git apply' to apply patch ./v27-0002-Add-machinery-for-grabbing-an-extended-vacuum-statis.patch === /work/patches/./v27-0002-Add-machinery-for-grabbing-an-extended-vacuum-statis.patch:937: indent with spaces. (dst->substruct.field += src->substruct.field) Applied patch to 'src/backend/access/heap/vacuumlazy.c' with conflicts. Applied patch to 'src/backend/catalog/heap.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/commands/dbcommands.c' 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/Makefile' cleanly. Applied patch to 'src/backend/utils/activity/pgstat.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_database.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_relation.c' cleanly. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/commands/vacuum.h' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/utils/pgstat_internal.h' cleanly. Applied patch to 'src/include/utils/pgstat_kind.h' cleanly. Falling back to direct application... Applied patch to 'src/test/isolation/isolation_schedule' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... U src/backend/access/heap/vacuumlazy.c warning: 1 line adds whitespace errors. diff --cc src/backend/access/heap/vacuumlazy.c index 5d271d80967,60db695b8f0..00000000000 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@@ -1941,8 -2188,9 +2190,14 @@@ lazy_scan_new_or_empty(LVRelState *vacr END_CRIT_SECTION(); /* Count the newly all-frozen pages for logging */ ++<<<<<<< ours + vacrel->new_all_visible_pages++; + vacrel->new_all_visible_all_frozen_pages++; ++======= + vacrel->vm_new_visible_pages++; + vacrel->vm_new_frozen_pages++; + vacrel->vm_new_visible_frozen_pages++; ++>>>>>>> theirs } freespace = PageGetHeapFreeSpace(page);