=== Applying patches on top of PostgreSQL commit ID 2cff363715efe3fd2dfbb04f9aa52fd5638f8f0d === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Apr 9 05:34:23 UTC 2026 On branch cf/6639 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Track-skipped-vacuum-and-analyze-activity-per-rel.patch === Applying: Track skipped vacuum and analyze activity per relation Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/backend/commands/vacuum.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/pgstat.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 Auto-merging src/include/pgstat.h Auto-merging src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/commands/vacuum.c Auto-merging src/backend/catalog/system_views.sql 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 Track skipped vacuum and analyze activity per relation 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 ./v3-0001-Track-skipped-vacuum-and-analyze-activity-per-rel.patch === patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 4387 (offset 15 lines). Hunk #2 succeeded at 4407 (offset 15 lines). Hunk #3 succeeded at 4426 (offset 15 lines). Hunk #4 succeeded at 4446 (offset 15 lines). Hunk #5 succeeded at 4466 (offset 15 lines). Hunk #6 succeeded at 4486 (offset 15 lines). Hunk #7 succeeded at 4505 (offset 15 lines). Hunk #8 succeeded at 4525 (offset 15 lines). patching file src/backend/catalog/system_views.sql patching file src/backend/commands/vacuum.c Hunk #1 succeeded at 793 (offset 1 line). Hunk #2 succeeded at 812 (offset 1 line). Hunk #3 succeeded at 915 (offset 1 line). Hunk #4 succeeded at 927 (offset 1 line). patching file src/backend/utils/activity/pgstat_relation.c patching file src/backend/utils/adt/pgstatfuncs.c patching file src/include/catalog/pg_proc.dat Hunk #1 FAILED at 5667. 1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/pg_proc.dat.rej patching file src/include/pgstat.h Hunk #2 succeeded at 712 (offset -4 lines). patching file src/test/regress/expected/rules.out Hunk #2 succeeded at 2354 (offset 53 lines). Hunk #3 succeeded at 2417 (offset 53 lines). Unstaged changes after reset: M doc/src/sgml/monitoring.sgml 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/include/pgstat.h M src/test/regress/expected/rules.out Removing src/include/catalog/pg_proc.dat.rej === using 'git apply' to apply patch ./v3-0001-Track-skipped-vacuum-and-analyze-activity-per-rel.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' 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/utils/activity/pgstat_relation.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' with conflicts. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. U src/include/catalog/pg_proc.dat diff --cc src/include/catalog/pg_proc.dat index fa9ae79082b,ccfe3d9e02a..00000000000 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@@ -5673,13 -5667,38 +5673,48 @@@ proname => 'pg_stat_get_total_autoanalyze_time', provolatile => 's', proparallel => 'r', prorettype => 'float8', proargtypes => 'oid', prosrc => 'pg_stat_get_total_autoanalyze_time' }, ++<<<<<<< ours +{ oid => '8409', descr => 'autovacuum scores', + proname => 'pg_stat_get_autovacuum_scores', prorows => '100', proretset => 't', + provolatile => 's', proparallel => 'r', prorettype => 'record', proargtypes => '', + proallargtypes => '{oid,float8,float8,float8,float8,float8,float8,bool,bool,bool}', + proargmodes => '{o,o,o,o,o,o,o,o,o,o}', + proargnames => '{oid,score,xid_score,mxid_score,vacuum_score,vacuum_insert_score,analyze_score,do_vacuum,do_analyze,for_wraparound}', + prosrc => 'pg_stat_get_autovacuum_scores' }, ++======= + { oid => '8142', descr => 'statistics: last skipped vacuum time for a table', + proname => 'pg_stat_get_last_skipped_vacuum_time', provolatile => 's', + proparallel => 'r', prorettype => 'timestamptz', proargtypes => 'oid', + prosrc => 'pg_stat_get_last_skipped_vacuum_time' }, + { oid => '8143', descr => 'statistics: last skipped auto vacuum time for a table', + proname => 'pg_stat_get_last_skipped_autovacuum_time', provolatile => 's', + proparallel => 'r', prorettype => 'timestamptz', proargtypes => 'oid', + prosrc => 'pg_stat_get_last_skipped_autovacuum_time' }, + { oid => '8144', descr => 'statistics: last skipped analyze time for a table', + proname => 'pg_stat_get_last_skipped_analyze_time', provolatile => 's', + proparallel => 'r', prorettype => 'timestamptz', proargtypes => 'oid', + prosrc => 'pg_stat_get_last_skipped_analyze_time' }, + { oid => '8145', descr => 'statistics: last skipped auto analyze time for a table', + proname => 'pg_stat_get_last_skipped_autoanalyze_time', provolatile => 's', + proparallel => 'r', prorettype => 'timestamptz', proargtypes => 'oid', + prosrc => 'pg_stat_get_last_skipped_autoanalyze_time' }, + { oid => '8146', descr => 'statistics: number of skipped vacuum for a table', + proname => 'pg_stat_get_skipped_vacuum_count', provolatile => 's', + proparallel => 'r', prorettype => 'int8', proargtypes => 'oid', + prosrc => 'pg_stat_get_skipped_vacuum_count' }, + { oid => '8147', descr => 'statistics: number of skipped auto vacuum for a table', + proname => 'pg_stat_get_skipped_autovacuum_count', provolatile => 's', + proparallel => 'r', prorettype => 'int8', proargtypes => 'oid', + prosrc => 'pg_stat_get_skipped_autovacuum_count' }, + { oid => '8148', descr => 'statistics: number of skipped analyzes for a table', + proname => 'pg_stat_get_skipped_analyze_count', provolatile => 's', + proparallel => 'r', prorettype => 'int8', proargtypes => 'oid', + prosrc => 'pg_stat_get_skipped_analyze_count' }, + { oid => '8149', descr => 'statistics: number of skipped auto analyzes for a table', + proname => 'pg_stat_get_skipped_autoanalyze_count', provolatile => 's', + proparallel => 'r', prorettype => 'int8', proargtypes => 'oid', + prosrc => 'pg_stat_get_skipped_autoanalyze_count' }, ++>>>>>>> theirs { oid => '1936', descr => 'statistics: currently active backend IDs', proname => 'pg_stat_get_backend_idset', prorows => '100', proretset => 't', provolatile => 's', proparallel => 'r', prorettype => 'int4',