vacuumdb: Add missing PQfinish() calls to vacuum_one_database().

nathan-bossart · nathan-bossart · commit eeaf6891be48 · 2025-02-04T13:26:57.000-06:00
A few of the version checks in vacuum_one_database() do not call PQfinish() before exiting. This precedent was unintentionally established in commit 00d1e88, and while it's probably not too problematic, it seems better to properly close the connection. Reviewed-by: Daniel Gustafsson <daniel@yesql.se> Discussion: https://postgr.es/m/Z6JAwqN1I8ljTuXp%40nathan Backpatch-through: 13
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -514,20 +514,23 @@ vacuum_one_database(ConnParams *cparams,
 
 	if (vacopts->min_xid_age != 0 && PQserverVersion(conn) < 90600)
 	{
+		PQfinish(conn);
 		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
 					 "--min-xid-age", "9.6");
 		exit(1);
 	}
 
 	if (vacopts->min_mxid_age != 0 && PQserverVersion(conn) < 90600)
 	{
+		PQfinish(conn);
 		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
 					 "--min-mxid-age", "9.6");
 		exit(1);
 	}
 
 	if (vacopts->parallel_workers >= 0 && PQserverVersion(conn) < 130000)
 	{
+		PQfinish(conn);
 		pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
 					 "--parallel", "13");
 		exit(1);

Original file line number	Diff line number	Diff line change
`@@ -514,20 +514,23 @@ vacuum_one_database(ConnParams *cparams,`
`514`	`514`
`515`	`515`	`if (vacopts->min_xid_age != 0 && PQserverVersion(conn) < 90600)`
`516`	`516`	`{`
	`517`	`+ PQfinish(conn);`
`517`	`518`	`pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",`
`518`	`519`	`"--min-xid-age", "9.6");`
`519`	`520`	`exit(1);`
`520`	`521`	`}`
`521`	`522`
`522`	`523`	`if (vacopts->min_mxid_age != 0 && PQserverVersion(conn) < 90600)`
`523`	`524`	`{`
	`525`	`+ PQfinish(conn);`
`524`	`526`	`pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",`
`525`	`527`	`"--min-mxid-age", "9.6");`
`526`	`528`	`exit(1);`
`527`	`529`	`}`
`528`	`530`
`529`	`531`	`if (vacopts->parallel_workers >= 0 && PQserverVersion(conn) < 130000)`
`530`	`532`	`{`
	`533`	`+ PQfinish(conn);`
`531`	`534`	`pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",`
`532`	`535`	`"--parallel", "13");`
`533`	`536`	`exit(1);`