=== Applying patches on top of PostgreSQL commit ID 29b039e9166d5ad70b39375faceec2167343d355 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Oct 21 00:20:22 UTC 2025 On branch cf/5012 nothing to commit, working tree clean === using 'git am' to apply patch ./vacuum_statistics.patch === Applying: Core patch. Using index info to reconstruct a base tree... 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/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/error/elog.c 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/regress/expected/rules.out Falling back to patching base and 3-way merge... Auto-merging src/test/regress/expected/rules.out CONFLICT (content): Merge conflict in src/test/regress/expected/rules.out Auto-merging src/include/utils/elog.h Auto-merging src/include/pgstat.h CONFLICT (content): Merge conflict in src/include/pgstat.h Auto-merging src/include/commands/vacuum.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/error/elog.c Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/utils/activity/pgstat_relation.c Auto-merging src/backend/commands/vacuum.c Auto-merging src/backend/catalog/system_views.sql CONFLICT (content): Merge conflict in src/backend/catalog/system_views.sql Auto-merging src/backend/access/heap/visibilitymap.c Auto-merging 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 Core patch. 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_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/error/elog.c 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/regress/expected/rules.out === using patch(1) to apply patch ./vacuum_statistics.patch === patching file src/backend/access/heap/vacuumlazy.c Hunk #3 succeeded at 493 (offset 13 lines). Hunk #4 succeeded at 853 (offset 13 lines). Hunk #5 succeeded at 880 (offset 13 lines). Hunk #6 succeeded at 897 (offset 13 lines). Hunk #7 succeeded at 906 (offset 13 lines). Hunk #8 succeeded at 1008 (offset 13 lines). Hunk #9 succeeded at 1157 (offset 13 lines). Hunk #10 succeeded at 1170 (offset 13 lines). Hunk #11 succeeded at 2882 (offset 20 lines). Hunk #12 succeeded at 3241 (offset 39 lines). Hunk #13 succeeded at 3324 (offset 39 lines). Hunk #14 succeeded at 3363 (offset 39 lines). Hunk #15 succeeded at 3386 (offset 39 lines). Hunk #16 succeeded at 3395 (offset 39 lines). Hunk #17 succeeded at 3429 (offset 39 lines). Hunk #18 succeeded at 3453 (offset 39 lines). Hunk #19 succeeded at 4148 (offset 106 lines). Hunk #20 succeeded at 4166 (offset 106 lines). Hunk #21 succeeded at 4184 (offset 106 lines). patching file src/backend/access/heap/visibilitymap.c Hunk #1 succeeded at 92 (offset 1 line). Hunk #2 succeeded at 162 (offset 1 line). patching file src/backend/catalog/system_views.sql Hunk #1 FAILED at 716. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/catalog/system_views.sql.rej patching file src/backend/commands/vacuum.c Hunk #2 succeeded at 2530 (offset -6 lines). patching file src/backend/commands/vacuumparallel.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 Hunk #1 succeeded at 1636 (offset 9 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12601 (offset 25 lines). patching file src/include/commands/vacuum.h Hunk #2 succeeded at 301 (offset 5 lines). Hunk #3 succeeded at 353 (offset 5 lines). Hunk #4 succeeded at 434 (offset 5 lines). patching file src/include/pgstat.h Hunk #1 succeeded at 101 (offset 1 line). Hunk #2 succeeded at 245 (offset 1 line). Hunk #3 FAILED at 305. Hunk #4 FAILED at 547. Hunk #5 succeeded at 759 (offset 5 lines). Hunk #6 succeeded at 811 (offset 5 lines). Hunk #7 succeeded at 949 (offset 5 lines). 2 out of 7 hunks FAILED -- saving rejects to file src/include/pgstat.h.rej patching file src/include/utils/elog.h Hunk #1 succeeded at 231 (offset 1 line). patching file src/test/regress/expected/rules.out Hunk #1 FAILED at 1833. Hunk #2 FAILED at 2232. Hunk #3 FAILED at 2284. 3 out of 3 hunks FAILED -- saving rejects to file src/test/regress/expected/rules.out.rej Unstaged changes after reset: M src/backend/access/heap/vacuumlazy.c M src/backend/access/heap/visibilitymap.c M src/backend/commands/vacuum.c M src/backend/commands/vacuumparallel.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/include/catalog/pg_proc.dat M src/include/commands/vacuum.h M src/include/pgstat.h M src/include/utils/elog.h Removing src/backend/catalog/system_views.sql.rej Removing src/include/pgstat.h.rej Removing src/test/regress/expected/rules.out.rej === using 'git apply' to apply patch ./vacuum_statistics.patch === Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly. Applied patch to 'src/backend/access/heap/visibilitymap.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' with conflicts. 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_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/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/commands/vacuum.h' cleanly. Applied patch to 'src/include/pgstat.h' with conflicts. Applied patch to 'src/include/utils/elog.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' with conflicts. U src/backend/catalog/system_views.sql U src/include/pgstat.h U src/test/regress/expected/rules.out diff --cc src/backend/catalog/system_views.sql index 823776c1498,b3242dc6f5a..00000000000 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@@ -727,7 -717,8 +727,12 @@@ CREATE VIEW pg_stat_all_tables A pg_stat_get_total_autovacuum_time(C.oid) AS total_autovacuum_time, pg_stat_get_total_analyze_time(C.oid) AS total_analyze_time, pg_stat_get_total_autoanalyze_time(C.oid) AS total_autoanalyze_time, ++<<<<<<< ours + pg_stat_get_stat_reset_time(C.oid) AS stats_reset ++======= + pg_stat_get_rev_all_frozen_pages(C.oid) as rev_all_frozen_pages, + pg_stat_get_rev_all_visible_pages(C.oid) as rev_all_visible_pages ++>>>>>>> theirs FROM pg_class C LEFT JOIN pg_index I ON C.oid = I.indrelid LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) diff --cc src/include/pgstat.h index bc8077cbae6,15da1f27654..00000000000 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@@ -212,7 -305,7 +306,11 @@@ typedef struct PgStat_TableXactStatu * ------------------------------------------------------------ */ ++<<<<<<< ours +#define PGSTAT_FILE_FORMAT_ID 0x01A5BCB9 ++======= + #define PGSTAT_FILE_FORMAT_ID 0x01A5BCB8 ++>>>>>>> theirs typedef struct PgStat_ArchiverStats { @@@ -457,7 -548,8 +555,12 @@@ typedef struct PgStat_StatTabEntr PgStat_Counter total_analyze_time; PgStat_Counter total_autoanalyze_time; ++<<<<<<< ours + TimestampTz stat_reset_time; ++======= + PgStat_Counter rev_all_visible_pages; + PgStat_Counter rev_all_frozen_pages; ++>>>>>>> theirs } PgStat_StatTabEntry; /* ------ diff --cc src/test/regress/expected/rules.out index 16753b2e4c0,4731ca2121e..00000000000 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@@ -1843,7 -1834,8 +1843,12 @@@ pg_stat_all_tables| SELECT c.oid AS rel pg_stat_get_total_autovacuum_time(c.oid) AS total_autovacuum_time, pg_stat_get_total_analyze_time(c.oid) AS total_analyze_time, pg_stat_get_total_autoanalyze_time(c.oid) AS total_autoanalyze_time, ++<<<<<<< ours + pg_stat_get_stat_reset_time(c.oid) AS stats_reset ++======= + pg_stat_get_rev_all_frozen_pages(c.oid) AS rev_all_frozen_pages, + pg_stat_get_rev_all_visible_pages(c.oid) AS rev_all_visible_pages ++>>>>>>> theirs FROM ((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) @@@ -2245,7 -2235,8 +2250,12 @@@ pg_stat_sys_tables| SELECT relid total_autovacuum_time, total_analyze_time, total_autoanalyze_time, ++<<<<<<< ours + stats_reset ++======= + rev_all_frozen_pages, + rev_all_visible_pages ++>>>>>>> theirs FROM pg_stat_all_tables WHERE ((schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (schemaname ~ '^pg_toast'::text)); pg_stat_user_functions| SELECT p.oid AS funcid, @@@ -2300,7 -2289,8 +2310,12 @@@ pg_stat_user_tables| SELECT relid total_autovacuum_time, total_analyze_time, total_autoanalyze_time, ++<<<<<<< ours + stats_reset ++======= + rev_all_frozen_pages, + rev_all_visible_pages ++>>>>>>> theirs FROM pg_stat_all_tables WHERE ((schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (schemaname !~ '^pg_toast'::text)); pg_stat_wal| SELECT wal_records,