=== Applying patches on top of PostgreSQL commit ID e0511883cae27ec70834c52bbde1863aa11d81e1 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Jun 15 12:17:25 UTC 2026 On branch cf/5958 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Adding-per-backend-relation-statistics-tracking.patch === Applying: Adding per backend relation statistics tracking Using index info to reconstruct a base tree... M src/backend/utils/activity/pgstat_backend.c M src/backend/utils/activity/pgstat_relation.c M src/include/pgstat.h M src/include/utils/pgstat_internal.h M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/include/utils/pgstat_internal.h Auto-merging src/include/pgstat.h Auto-merging src/backend/utils/activity/pgstat_relation.c Auto-merging src/backend/utils/activity/pgstat_backend.c === using 'git am' to apply patch ./v3-0002-Adding-the-pg_stat_backend_relation-view.patch === Applying: Adding the pg_stat_backend_relation view Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/test/regress/sql/stats.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/stats.sql Auto-merging src/test/regress/expected/stats.out Auto-merging src/test/regress/expected/rules.out CONFLICT (content): Merge conflict in src/test/regress/expected/rules.out Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/pgstatfuncs.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 Adding the pg_stat_backend_relation view 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-0002-Adding-the-pg_stat_backend_relation-view.patch === patching file doc/src/sgml/monitoring.sgml Hunk #2 succeeded at 1218 (offset 33 lines). Hunk #3 succeeded at 5605 (offset 605 lines). patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 964 (offset 53 lines). patching file src/backend/utils/adt/pgstatfuncs.c Hunk #1 succeeded at 710 (offset 25 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 5694 (offset 53 lines). patching file src/test/regress/expected/rules.out Hunk #1 FAILED at 1847. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/rules.out.rej patching file src/test/regress/expected/stats.out Hunk #1 succeeded at 134 (offset 16 lines). Hunk #2 succeeded at 254 (offset 16 lines). patching file src/test/regress/sql/stats.sql Unstaged changes after reset: M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/test/regress/expected/stats.out M src/test/regress/sql/stats.sql Removing src/test/regress/expected/rules.out.rej === using 'git apply' to apply patch ./v3-0002-Adding-the-pg_stat_backend_relation-view.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/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/test/regress/expected/rules.out' with conflicts. Applied patch to 'src/test/regress/expected/stats.out' cleanly. Applied patch to 'src/test/regress/sql/stats.sql' cleanly. U src/test/regress/expected/rules.out diff --cc src/test/regress/expected/rules.out index a65a5bf0c4f,08063f49545..00000000000 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@@ -1860,21 -1847,10 +1860,28 @@@ pg_stat_archiver| SELECT archived_count last_failed_time, stats_reset FROM pg_stat_get_archiver() s(archived_count, last_archived_wal, last_archived_time, failed_count, last_failed_wal, last_failed_time, stats_reset); ++<<<<<<< ours +pg_stat_autovacuum_scores| SELECT s.oid AS relid, + n.nspname AS schemaname, + c.relname, + s.score, + s.xid_score, + s.mxid_score, + s.vacuum_score, + s.vacuum_insert_score, + s.analyze_score, + s.do_vacuum, + s.do_analyze, + s.for_wraparound + FROM ((pg_stat_get_autovacuum_scores() s(oid, score, xid_score, mxid_score, vacuum_score, vacuum_insert_score, analyze_score, do_vacuum, do_analyze, for_wraparound) + JOIN pg_class c ON ((c.oid = s.oid))) + LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))); ++======= + pg_stat_backend_relation| SELECT pid, + seq_scan, + stats_reset + FROM pg_stat_get_backend_relations(NULL::integer) s(pid, seq_scan, stats_reset); ++>>>>>>> theirs pg_stat_bgwriter| SELECT pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean, pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean, pg_stat_get_buf_alloc() AS buffers_alloc,