=== Applying patches on top of PostgreSQL commit ID 901ed9b352b41f034e17bc540725082a488fce31 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun May 10 14:46:22 UTC 2026 On branch cf/6604 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Add-pg_stat_vfdcache-view-for-VFD-cache-statistics.patch === Applying: Add pg_stat_vfdcache view for VFD cache statistics Using index info to reconstruct a base tree... M src/backend/storage/file/fd.c M src/backend/utils/adt/pgstatfuncs.c M src/test/regress/expected/stats.out Falling back to patching base and 3-way merge... Auto-merging src/test/regress/expected/stats.out CONFLICT (content): Merge conflict in src/test/regress/expected/stats.out Auto-merging src/backend/utils/adt/pgstatfuncs.c CONFLICT (content): Merge conflict in src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/storage/file/fd.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 Add pg_stat_vfdcache view for VFD cache 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 ./v4-0001-Add-pg_stat_vfdcache-view-for-VFD-cache-statistics.patch === patching file doc/src/sgml/monitoring.sgml patching file src/backend/catalog/system_views.sql patching file src/backend/storage/file/fd.c patching file src/backend/utils/activity/Makefile patching file src/backend/utils/activity/meson.build patching file src/backend/utils/activity/pgstat.c patching file src/backend/utils/activity/pgstat_vfdcache.c patching file src/backend/utils/adt/pgstatfuncs.c Hunk #4 FAILED at 2024. 1 out of 4 hunks FAILED -- saving rejects to file src/backend/utils/adt/pgstatfuncs.c.rej patching file src/include/catalog/pg_proc.dat patching file src/include/pgstat.h patching file src/include/utils/pgstat_internal.h patching file src/include/utils/pgstat_kind.h patching file src/test/regress/expected/rules.out patching file src/test/regress/expected/stats.out Hunk #1 FAILED at 1161. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/stats.out.rej 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/storage/file/fd.c M src/backend/utils/activity/Makefile M src/backend/utils/activity/meson.build M src/backend/utils/activity/pgstat.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/pgstat.h M src/include/utils/pgstat_internal.h M src/include/utils/pgstat_kind.h M src/test/regress/expected/rules.out M src/test/regress/sql/stats.sql Removing src/backend/utils/activity/pgstat_vfdcache.c Removing src/backend/utils/adt/pgstatfuncs.c.rej Removing src/test/regress/expected/stats.out.rej === using 'git apply' to apply patch ./v4-0001-Add-pg_stat_vfdcache-view-for-VFD-cache-statistics.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/storage/file/fd.c' cleanly. Applied patch to 'src/backend/utils/activity/Makefile' cleanly. Applied patch to 'src/backend/utils/activity/meson.build' cleanly. Applied patch to 'src/backend/utils/activity/pgstat.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' with conflicts. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/include/utils/pgstat_internal.h' cleanly. Applied patch to 'src/include/utils/pgstat_kind.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/expected/stats.out' with conflicts. Applied patch to 'src/test/regress/sql/stats.sql' cleanly. U src/backend/utils/adt/pgstatfuncs.c U src/test/regress/expected/stats.out diff --cc src/backend/utils/adt/pgstatfuncs.c index 7a9dfa9ba3b,f35513d7081..00000000000 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@@ -1987,7 -2032,7 +2032,11 @@@ pg_stat_reset_shared(PG_FUNCTION_ARGS ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("unrecognized reset target: \"%s\"", target), ++<<<<<<< ours + errhint("Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"lock\", \"recovery_prefetch\", \"slru\", or \"wal\"."))); ++======= + errhint("Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", \"slru\", \"vfdcache\", or \"wal\"."))); ++>>>>>>> theirs PG_RETURN_VOID(); } diff --cc src/test/regress/expected/stats.out index c551abb1178,04daadca909..00000000000 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@@ -1164,7 -1178,7 +1178,11 @@@ SELECT stats_reset > :'vfdcache_reset_t -- Test error case for reset_shared with unknown stats type SELECT pg_stat_reset_shared('unknown'); ERROR: unrecognized reset target: "unknown" ++<<<<<<< ours +HINT: Target must be "archiver", "bgwriter", "checkpointer", "io", "lock", "recovery_prefetch", "slru", or "wal". ++======= + HINT: Target must be "archiver", "bgwriter", "checkpointer", "io", "recovery_prefetch", "slru", "vfdcache", or "wal". ++>>>>>>> theirs -- Test that reset works for pg_stat_database and pg_stat_database_conflicts -- Since pg_stat_database stats_reset starts out as NULL, reset it once first so that we -- have a baseline for comparison. The same for pg_stat_database_conflicts as it shares