Fix two oversights from 9ebe057 which refactored cluster_rel

michaelpq · michaelpq · commit 9f7ba88aa447 · 2018-07-29T22:00:42.000+09:00
The recheck option became a no-op as ClusterOption failed to set proper
values for each element.  There was a second code path where local
options got overwritten.

Both issues have been spotted by Coverity.
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -1551,17 +1551,17 @@ vacuum_rel(Oid relid, RangeVar *relation, int options, VacuumParams *params)
 	 */
 	if (options & VACOPT_FULL)
 	{
-		int			options = 0;
+		int			cluster_options = 0;
 
 		/* close relation before vacuuming, but hold lock until commit */
 		relation_close(onerel, NoLock);
 		onerel = NULL;
 
 		if ((options & VACOPT_VERBOSE) != 0)
-			options |= CLUOPT_VERBOSE;
+			cluster_options |= CLUOPT_VERBOSE;
 
 		/* VACUUM FULL is now a variant of CLUSTER; see cluster.c */
-		cluster_rel(relid, InvalidOid, options);
+		cluster_rel(relid, InvalidOid, cluster_options);
 	}
 	else
 		lazy_vacuum_rel(onerel, options, params, vac_strategy);
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -3114,8 +3114,8 @@ typedef struct AlterSystemStmt
  */
 typedef enum ClusterOption
 {
-	CLUOPT_RECHECK,				/* recheck relation state */
-	CLUOPT_VERBOSE				/* print progress info */
+	CLUOPT_RECHECK = 1 << 0,	/* recheck relation state */
+	CLUOPT_VERBOSE = 1 << 1		/* print progress info */
 } ClusterOption;
 
 typedef struct ClusterStmt
