=== Applying patches on top of PostgreSQL commit ID f2ccb8e6c5915617466ccea2abcf2d443d67dab0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Aug 14 00:37:35 UTC 2026 On branch cf/5012 nothing to commit, working tree clean === using 'git am' to apply patch ./v42-0001-Report-per-index-removed-tuples-in-vacuum-instru.patch === Applying: Report per-index removed tuples in vacuum instrumentation. === using 'git am' to apply patch ./v42-0002-Track-vacuum-times-for-indexes-and-databases-and.patch === Applying: Track vacuum times for indexes and databases, and vacuum delay, in pg_stat views. error: sha1 information is lacking or useless (src/backend/access/heap/vacuumlazy.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Track vacuum times for indexes and databases, and vacuum delay, in pg_stat views. 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 ./v42-0002-Track-vacuum-times-for-indexes-and-databases-and.patch === patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 4234 (offset 155 lines). Hunk #2 succeeded at 4624 (offset 155 lines). Hunk #3 succeeded at 4881 (offset 155 lines). patching file src/backend/access/heap/vacuumlazy.c Hunk #5 succeeded at 3051 (offset 24 lines). Hunk #6 succeeded at 3079 (offset 24 lines). Hunk #7 succeeded at 3111 (offset 24 lines). Hunk #8 succeeded at 3138 (offset 24 lines). patching file src/backend/catalog/system_views.sql Hunk #2 FAILED at 871. 1 out of 3 hunks FAILED -- saving rejects to file src/backend/catalog/system_views.sql.rej patching file src/backend/commands/vacuum.c Hunk #2 succeeded at 2541 (offset 19 lines). patching file src/backend/commands/vacuumparallel.c patching file src/backend/utils/activity/pgstat_database.c patching file src/backend/utils/activity/pgstat_relation.c Hunk #1 succeeded at 261 (offset 52 lines). Hunk #2 succeeded at 305 (offset 52 lines). Hunk #3 succeeded at 348 (offset 52 lines). patching file src/backend/utils/adt/pgstatfuncs.c Hunk #1 succeeded at 170 (offset 34 lines). Hunk #2 succeeded at 1307 (offset 62 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 5926 (offset -3 lines). patching file src/include/commands/vacuum.h patching file src/include/pgstat.h Hunk #1 succeeded at 432 (offset 33 lines). Hunk #2 succeeded at 528 (offset 33 lines). Hunk #3 succeeded at 777 (offset 47 lines). patching file src/test/modules/test_misc/meson.build patching file src/test/modules/test_misc/t/016_index_vacuum_time.pl patching file src/test/regress/expected/rules.out Hunk #1 FAILED at 1810. 1 out of 7 hunks FAILED -- saving rejects to file src/test/regress/expected/rules.out.rej Unstaged changes after reset: M doc/src/sgml/monitoring.sgml M src/backend/access/heap/vacuumlazy.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_database.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/commands/vacuum.h M src/include/pgstat.h M src/test/modules/test_misc/meson.build M src/test/regress/expected/rules.out Removing src/backend/catalog/system_views.sql.rej Removing src/test/modules/test_misc/t/016_index_vacuum_time.pl Removing src/test/regress/expected/rules.out.rej === using 'git apply' to apply patch ./v42-0002-Track-vacuum-times-for-indexes-and-databases-and.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... 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_database.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' cleanly. Applied patch to 'src/include/commands/vacuum.h' cleanly. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/test/modules/test_misc/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/rules.out' with conflicts. U src/backend/catalog/system_views.sql U src/test/regress/expected/rules.out diff --cc src/backend/catalog/system_views.sql index 8612d99a890,1e9bb3c3bba..00000000000 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@@ -865,11 -867,15 +867,23 @@@ CREATE VIEW pg_stat_all_indexes A N.nspname AS schemaname, C.relname AS relname, I.relname AS indexrelname, ++<<<<<<< ours + pg_stat_get_idx_numscans(I.oid) AS idx_scan, + pg_stat_get_idx_lastscan(I.oid) AS last_idx_scan, + pg_stat_get_idx_tuples_returned(I.oid) AS idx_tup_read, + pg_stat_get_idx_tuples_fetched(I.oid) AS idx_tup_fetch, + pg_stat_get_idx_stat_reset_time(I.oid) AS stats_reset ++======= + pg_stat_get_numscans(I.oid) AS idx_scan, + pg_stat_get_lastscan(I.oid) AS last_idx_scan, + pg_stat_get_tuples_returned(I.oid) AS idx_tup_read, + pg_stat_get_tuples_fetched(I.oid) AS idx_tup_fetch, + pg_stat_get_total_vacuum_time(I.oid) AS total_vacuum_time, + pg_stat_get_total_autovacuum_time(I.oid) AS total_autovacuum_time, + pg_stat_get_total_vacuum_delay_time(I.oid) AS total_vacuum_delay_time, + pg_stat_get_total_autovacuum_delay_time(I.oid) AS total_autovacuum_delay_time, + pg_stat_get_stat_reset_time(I.oid) AS stats_reset ++>>>>>>> theirs FROM pg_class C JOIN pg_index X ON C.oid = X.indrelid JOIN pg_class I ON I.oid = X.indexrelid diff --cc src/test/regress/expected/rules.out index 1a29d46213e,bd9eca0dcef..00000000000 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@@ -1806,11 -1806,15 +1806,23 @@@ pg_stat_all_indexes| SELECT c.oid AS re n.nspname AS schemaname, c.relname, i.relname AS indexrelname, ++<<<<<<< ours + pg_stat_get_idx_numscans(i.oid) AS idx_scan, + pg_stat_get_idx_lastscan(i.oid) AS last_idx_scan, + pg_stat_get_idx_tuples_returned(i.oid) AS idx_tup_read, + pg_stat_get_idx_tuples_fetched(i.oid) AS idx_tup_fetch, + pg_stat_get_idx_stat_reset_time(i.oid) AS stats_reset ++======= + pg_stat_get_numscans(i.oid) AS idx_scan, + pg_stat_get_lastscan(i.oid) AS last_idx_scan, + pg_stat_get_tuples_returned(i.oid) AS idx_tup_read, + pg_stat_get_tuples_fetched(i.oid) AS idx_tup_fetch, + pg_stat_get_total_vacuum_time(i.oid) AS total_vacuum_time, + pg_stat_get_total_autovacuum_time(i.oid) AS total_autovacuum_time, + pg_stat_get_total_vacuum_delay_time(i.oid) AS total_vacuum_delay_time, + pg_stat_get_total_autovacuum_delay_time(i.oid) AS total_autovacuum_delay_time, + pg_stat_get_stat_reset_time(i.oid) AS stats_reset ++>>>>>>> theirs FROM (((pg_class c JOIN pg_index x ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid)))