=== Applying patches on top of PostgreSQL commit ID 87762cbaa4fefa2911c156f73f585b3ba522bab0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Sep 25 20:49:25 UTC 2026 On branch cf/7095 nothing to commit, working tree clean === using 'git am' to apply patch ./v7-0001-Report-per-index-vacuum-progress-in-pg_stat_progr.patch === Applying: Report per-index vacuum progress in pg_stat_progress_vacuum. Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/access/heap/vacuumlazy.c M src/backend/commands/vacuumparallel.c Falling back to patching base and 3-way merge... Auto-merging src/backend/commands/vacuumparallel.c CONFLICT (content): Merge conflict in src/backend/commands/vacuumparallel.c Auto-merging src/backend/access/heap/vacuumlazy.c CONFLICT (content): Merge conflict in src/backend/access/heap/vacuumlazy.c 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 Report per-index vacuum progress in pg_stat_progress_vacuum. 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 ./v7-0001-Report-per-index-vacuum-progress-in-pg_stat_progr.patch === patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 7685 (offset 15 lines). Hunk #2 succeeded at 7947 (offset 15 lines). patching file src/backend/access/heap/vacuumlazy.c Hunk #1 FAILED at 3038. Hunk #2 succeeded at 3070 (offset 1 line). Hunk #3 FAILED at 3094. Hunk #4 succeeded at 3126 (offset 2 lines). 2 out of 4 hunks FAILED -- saving rejects to file src/backend/access/heap/vacuumlazy.c.rej patching file src/backend/catalog/system_views.sql patching file src/backend/commands/vacuumparallel.c Hunk #2 FAILED at 1098. Hunk #3 succeeded at 1109 (offset 1 line). Hunk #4 succeeded at 1134 (offset 1 line). Hunk #5 succeeded at 1219 (offset 1 line). Hunk #6 succeeded at 1343 (offset 1 line). Hunk #7 succeeded at 1365 (offset 1 line). 1 out of 7 hunks FAILED -- saving rejects to file src/backend/commands/vacuumparallel.c.rej patching file src/include/commands/progress.h patching file src/test/regress/expected/rules.out 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/vacuumparallel.c M src/include/commands/progress.h M src/test/regress/expected/rules.out Removing src/backend/access/heap/vacuumlazy.c.rej Removing src/backend/commands/vacuumparallel.c.rej === using 'git apply' to apply patch ./v7-0001-Report-per-index-vacuum-progress-in-pg_stat_progr.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/access/heap/vacuumlazy.c' with conflicts. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/vacuumparallel.c' with conflicts. Applied patch to 'src/include/commands/progress.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. U src/backend/access/heap/vacuumlazy.c U src/backend/commands/vacuumparallel.c diff --cc src/backend/access/heap/vacuumlazy.c index 997d84a77b3,a23af936b7f..00000000000 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@@ -3042,8 -3048,7 +3048,12 @@@ lazy_vacuum_one_index(Relation indrel, ivinfo.index = indrel; ivinfo.heaprel = vacrel->rel; ivinfo.analyze_only = false; ++<<<<<<< ours + ivinfo.is_autovacuum = AmAutoVacuumWorkerProcess(); + ivinfo.report_progress = false; ++======= + ivinfo.report_progress = true; ++>>>>>>> theirs ivinfo.estimated_count = true; ivinfo.message_level = DEBUG2; ivinfo.num_heap_tuples = reltuples; @@@ -3093,8 -3114,7 +3119,12 @@@ lazy_cleanup_one_index(Relation indrel ivinfo.index = indrel; ivinfo.heaprel = vacrel->rel; ivinfo.analyze_only = false; ++<<<<<<< ours + ivinfo.is_autovacuum = AmAutoVacuumWorkerProcess(); + ivinfo.report_progress = false; ++======= + ivinfo.report_progress = true; ++>>>>>>> theirs ivinfo.estimated_count = estimated_count; ivinfo.message_level = DEBUG2; diff --cc src/backend/commands/vacuumparallel.c index 4532da60c84,607c57c8eba..00000000000 --- a/src/backend/commands/vacuumparallel.c +++ b/src/backend/commands/vacuumparallel.c @@@ -1087,8 -1098,7 +1098,12 @@@ parallel_vacuum_process_one_index(Paral ivinfo.index = indrel; ivinfo.heaprel = pvs->heaprel; ivinfo.analyze_only = false; ++<<<<<<< ours + ivinfo.is_autovacuum = pvs->shared->is_autovacuum; + ivinfo.report_progress = false; ++======= + ivinfo.report_progress = true; ++>>>>>>> theirs ivinfo.message_level = DEBUG2; ivinfo.estimated_count = pvs->shared->estimated_count; ivinfo.num_heap_tuples = pvs->shared->reltuples;