From b41538e7e35fe0cee2b9233fe9b945739183f1a1 Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Tue, 16 Sep 2025 23:21:10 +0900 Subject: [PATCH v2] vacuumdb: Do not run VACUUM (ONLY_DATABASE_STATS) when --analyze-only. Previously, vacuumdb --analyze-only issued VACUUM (ONLY_DATABASE_STATS) at the end. Since --analyze-only is meant to update optimizer statistics only, this extra VACUUM command is unnecessary. This commit prevents vacuumdb --analyze-only from running that redundant VACUUM command. Author: Fujii Masao Reviewed-by: Mircea Cadariu Discussion: https://postgr.es/m/CAHGQGwEqHGa-k=wbRMucUVihHVXk4NQkK94GNN=ym9cQ5HBSHg@mail.gmail.com --- src/bin/scripts/t/100_vacuumdb.pl | 6 ++++++ src/bin/scripts/vacuumdb.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl index 945c30df156..a16fad593f7 100644 --- a/src/bin/scripts/t/100_vacuumdb.pl +++ b/src/bin/scripts/t/100_vacuumdb.pl @@ -351,5 +351,11 @@ $node->issues_sql_like( ], qr/statement: ANALYZE public.parent_table/s, '--analyze-only updates statistics for partitioned tables'); +$node->issues_sql_unlike( + [ + 'vacuumdb', '--analyze-only', 'postgres' + ], + qr/statement:\ VACUUM/sx, + '--analyze-only does not run vacuum'); done_testing(); diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c index fd236087e90..6e30f223efe 100644 --- a/src/bin/scripts/vacuumdb.c +++ b/src/bin/scripts/vacuumdb.c @@ -750,7 +750,8 @@ vacuum_one_database(ConnParams *cparams, } /* If we used SKIP_DATABASE_STATS, mop up with ONLY_DATABASE_STATS */ - if (vacopts->skip_database_stats && stage == ANALYZE_NO_STAGE) + if (vacopts->skip_database_stats && stage == ANALYZE_NO_STAGE && + !vacopts->analyze_only) { const char *cmd = "VACUUM (ONLY_DATABASE_STATS);"; ParallelSlot *free_slot = ParallelSlotsGetIdle(sa, NULL); -- 2.50.1