=== Applying patches on top of PostgreSQL commit ID 07211f64ace0150c92a00769a1cfe8b9305b9e78 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jul 8 00:15:35 UTC 2026 On branch cf/5012 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Track-table-VM-stability.patch === Applying: Track table VM stability. === using 'git am' to apply patch ./0002-Extended-vacuum-statistics-core-heap-and-tuple-metri.patch === Applying: Extended vacuum statistics: core heap and tuple metrics for tables and indexes error: sha1 information is lacking or useless (src/backend/catalog/system_views.sql). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Extended vacuum statistics: core heap and tuple metrics for tables and indexes 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 ./0002-Extended-vacuum-statistics-core-heap-and-tuple-metri.patch === patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 9137 (offset 27 lines). patching file doc/src/sgml/system-views.sgml Hunk #1 succeeded at 5783 (offset 1 line). patching file src/backend/access/heap/vacuumlazy.c patching file src/backend/catalog/heap.c patching file src/backend/catalog/index.c patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 1570 (offset 11 lines). patching file src/backend/commands/vacuumparallel.c patching file src/backend/utils/activity/Makefile Hunk #1 succeeded at 29 with fuzz 1 (offset 1 line). patching file src/backend/utils/activity/meson.build Hunk #1 succeeded at 18 (offset 1 line). patching file src/backend/utils/activity/pgstat.c patching file src/backend/utils/activity/pgstat_relation.c patching file src/backend/utils/activity/pgstat_vacuum.c patching file src/backend/utils/adt/pgstatfuncs.c Hunk #1 succeeded at 2407 (offset 40 lines). patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 3228 (offset 8 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 705 (offset 3 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12663 (offset 25 lines). Hunk #2 succeeded at 12738 (offset 25 lines). patching file src/include/pgstat.h Hunk #4 succeeded at 923 (offset 13 lines). Hunk #5 succeeded at 945 (offset 13 lines). patching file src/include/utils/pgstat_internal.h patching file src/include/utils/pgstat_kind.h patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 2429 (offset 8 lines). patching file src/test/regress/expected/vacuum_stats.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/vacuum_stats.sql [cf/5012 ce06f3a76ed] Extended vacuum statistics: core heap and tuple metrics for tables and indexes Author: Alena Rybakina Date: Tue Jun 16 10:06:53 2026 +0300 23 files changed, 903 insertions(+), 3 deletions(-) create mode 100644 src/backend/utils/activity/pgstat_vacuum.c create mode 100644 src/test/regress/expected/vacuum_stats.out create mode 100644 src/test/regress/sql/vacuum_stats.sql === using 'git am' to apply patch ./0003-Extended-vacuum-statistics-recently-dead-and-missed-.patch === Applying: Extended vacuum statistics: recently-dead and missed dead tuples for tables error: sha1 information is lacking or useless (doc/src/sgml/system-views.sgml). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Extended vacuum statistics: recently-dead and missed dead tuples for tables 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 ./0003-Extended-vacuum-statistics-recently-dead-and-missed-.patch === patching file doc/src/sgml/system-views.sgml Hunk #1 succeeded at 5869 (offset 1 line). patching file src/backend/access/heap/vacuumlazy.c patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 1580 (offset 11 lines). patching file src/backend/utils/activity/pgstat_vacuum.c patching file src/backend/utils/adt/pgstatfuncs.c Hunk #1 succeeded at 2414 (offset 40 lines). Hunk #2 succeeded at 2444 (offset 40 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12668 (offset 25 lines). patching file src/include/pgstat.h patching file src/test/modules/test_misc/meson.build Hunk #1 FAILED at 22. 1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/test_misc/meson.build.rej patching file src/test/modules/test_misc/t/014_vacuum_stats.pl patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 2448 (offset 8 lines). patching file src/test/regress/expected/vacuum_stats.out patching file src/test/regress/sql/vacuum_stats.sql Unstaged changes after reset: M doc/src/sgml/system-views.sgml M src/backend/access/heap/vacuumlazy.c M src/backend/catalog/system_views.sql M src/backend/utils/activity/pgstat_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 M src/test/regress/expected/vacuum_stats.out M src/test/regress/sql/vacuum_stats.sql Removing src/test/modules/test_misc/meson.build.rej Removing src/test/modules/test_misc/t/014_vacuum_stats.pl === using 'git apply' to apply patch ./0003-Extended-vacuum-statistics-recently-dead-and-missed-.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/utils/activity/pgstat_vacuum.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/test/modules/test_misc/meson.build' with conflicts. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/test/regress/expected/vacuum_stats.out' cleanly. Applied patch to 'src/test/regress/sql/vacuum_stats.sql' cleanly. U src/test/modules/test_misc/meson.build diff --cc src/test/modules/test_misc/meson.build index ee290698b31,267145163a9..00000000000 --- a/src/test/modules/test_misc/meson.build +++ b/src/test/modules/test_misc/meson.build @@@ -22,7 -22,7 +22,11 @@@ tests += 't/011_lock_stats.pl', 't/012_ddlutils.pl', 't/013_temp_obj_multisession.pl', ++<<<<<<< ours + 't/014_log_statement_max_length.pl', ++======= + 't/014_vacuum_stats.pl', ++>>>>>>> theirs ], # The injection points are cluster-wide, so disable installcheck 'runningcheck': false,