=== Applying patches on top of PostgreSQL commit ID 9ea3b6f751abd7701f3f32d9df26d66410754c94 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Aug 6 19:39:21 UTC 2025 On branch cf/5880 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Generate-the-WaitClassTable.patch === Applying: Generate the WaitClassTable[] === using 'git am' to apply patch ./v1-0002-Add-wait-events-statistics.patch === Applying: Add wait events statistics Using index info to reconstruct a base tree... M src/backend/utils/activity/pgstat.c M src/include/pgstat.h M src/include/utils/pgstat_internal.h M src/include/utils/pgstat_kind.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_kind.h Auto-merging src/include/utils/pgstat_internal.h CONFLICT (content): Merge conflict in src/include/utils/pgstat_internal.h Auto-merging src/include/pgstat.h Auto-merging src/backend/utils/activity/pgstat.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 wait events 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". Unstaged changes after reset: M src/backend/utils/activity/Makefile M src/backend/utils/activity/meson.build M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/wait_event.c M src/include/pgstat.h M src/include/utils/pgstat_internal.h M src/include/utils/pgstat_kind.h M src/include/utils/wait_event.h M src/tools/pgindent/typedefs.list Removing src/backend/utils/activity/pgstat_waitevent.c === using patch(1) to apply patch ./v1-0002-Add-wait-events-statistics.patch === patching file src/backend/utils/activity/Makefile patching file src/backend/utils/activity/meson.build patching file src/backend/utils/activity/pgstat.c Hunk #1 succeeded at 480 (offset 1 line). patching file src/backend/utils/activity/pgstat_waitevent.c patching file src/backend/utils/activity/wait_event.c patching file src/include/pgstat.h patching file src/include/utils/pgstat_internal.h Hunk #1 succeeded at 396 (offset -7 lines). Hunk #2 succeeded at 502 (offset -7 lines). Hunk #3 succeeded at 537 (offset -7 lines). Hunk #4 succeeded at 773 with fuzz 2 (offset -18 lines). patching file src/include/utils/pgstat_kind.h patching file src/include/utils/wait_event.h patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2222 (offset 7 lines). Hunk #2 succeeded at 2243 (offset 7 lines). Hunk #3 succeeded at 2259 (offset 7 lines). [cf/5880 97a57e9133f] Add wait events statistics Author: Bertrand Drouvot Date: Fri Jun 20 11:24:32 2025 +0000 10 files changed, 302 insertions(+), 4 deletions(-) create mode 100644 src/backend/utils/activity/pgstat_waitevent.c === using 'git am' to apply patch ./v1-0003-Add-the-pg_stat_wait_event-view.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v1-0003-Add-the-pg_stat_wait_event-view.patch === patching file doc/src/sgml/monitoring.sgml Hunk #2 succeeded at 4843 (offset 13 lines). Hunk #3 succeeded at 5145 (offset 13 lines). patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 950 (offset 8 lines). patching file src/backend/utils/adt/pgstatfuncs.c patching file src/include/catalog/pg_proc.dat patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 2287 (offset 10 lines). patching file src/test/regress/expected/stats.out patching file src/test/regress/sql/stats.sql [cf/5880 72b15e6e6dc] Add the pg_stat_wait_event view Author: Bertrand Drouvot Date: Fri Jun 20 12:11:21 2025 +0000 7 files changed, 227 insertions(+) === using 'git am' to apply patch ./v1-0004-switching-PGSTAT_KIND_WAIT_EVENT-to-variable-size.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v1-0004-switching-PGSTAT_KIND_WAIT_EVENT-to-variable-size.patch === patching file src/backend/utils/activity/generate-wait_event_types.pl patching file src/backend/utils/activity/pgstat.c Hunk #1 succeeded at 379 (offset 4 lines). Hunk #2 succeeded at 497 (offset 1 line). patching file src/backend/utils/activity/pgstat_waitevent.c patching file src/backend/utils/adt/pgstatfuncs.c patching file src/include/pgstat.h patching file src/include/utils/pgstat_internal.h Hunk #1 succeeded at 396 (offset -7 lines). Hunk #2 succeeded at 456 (offset -7 lines). Hunk #3 succeeded at 500 (offset -7 lines). Hunk #4 succeeded at 534 (offset -7 lines). Hunk #5 succeeded at 773 (offset -18 lines). patching file src/include/utils/pgstat_kind.h [cf/5880 2d28bbb0173] switching PGSTAT_KIND_WAIT_EVENT to variable sized Author: Bertrand Drouvot Date: Fri Jun 27 05:55:43 2025 +0000 7 files changed, 129 insertions(+), 125 deletions(-)