Rework tests, add VACUUM ANALYZE test

src/test/regress/expected/multi_utilities.out

@@ -106,6 +106,41 @@ SELECT pg_stat_get_analyze_count('dustbunnies_990002'::regclass);
                          1
 (1 row)
 
+-- get file node to verify VACUUM FULL
+SELECT relfilenode AS oldnode FROM pg_class WHERE oid='dustbunnies_990002'::regclass
+\gset
+-- send a VACUUM FULL and a VACUUM ANALYZE
+\c - - - :master_port
+VACUUM (FULL) dustbunnies;
+VACUUM ANALYZE dustbunnies;
+-- verify that relfilenode changed
+\c - - - :worker_1_port
+SELECT relfilenode != :oldnode AS table_rewritten FROM pg_class
+WHERE oid='dustbunnies_990002'::regclass;
+ table_rewritten 
+-----------------
+ t
+(1 row)
+
+-- verify the VACUUM ANALYZE incremented both vacuum and analyze counts
+SELECT pg_sleep(.500);
+ pg_sleep 
+----------
+ 
+(1 row)
+
+SELECT pg_stat_get_vacuum_count('dustbunnies_990002'::regclass);
+ pg_stat_get_vacuum_count 
+--------------------------
+                        2
+(1 row)
+
+SELECT pg_stat_get_analyze_count('dustbunnies_990002'::regclass);
+ pg_stat_get_analyze_count 
+---------------------------
+                         2
+(1 row)
+
 -- disable auto-VACUUM for next test
 ALTER TABLE dustbunnies_990002 SET (autovacuum_enabled = false);
 SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid='dustbunnies_990002'::regclass
@@ -123,21 +158,6 @@ WHERE oid='dustbunnies_990002'::regclass;
  t
 (1 row)
 
--- get file node to verify VACUUM FULL
-SELECT relfilenode AS oldnode FROM pg_class WHERE oid='dustbunnies_990002'::regclass
-\gset
--- send a VACUUM FULL
-\c - - - :master_port
-VACUUM (FULL) dustbunnies;
--- verify that relfrozenxid increased
-\c - - - :worker_1_port
-SELECT relfilenode != :oldnode AS table_rewritten FROM pg_class
-WHERE oid='dustbunnies_990002'::regclass;
- table_rewritten 
------------------
- t
-(1 row)
-
 \c - - - :master_port
 -- verify warning for unqualified VACUUM
 VACUUM;

src/test/regress/sql/multi_utilities.sql

@@ -66,6 +66,25 @@ SELECT pg_sleep(.500);
 SELECT pg_stat_get_vacuum_count('dustbunnies_990002'::regclass);
 SELECT pg_stat_get_analyze_count('dustbunnies_990002'::regclass);
 
+-- get file node to verify VACUUM FULL
+SELECT relfilenode AS oldnode FROM pg_class WHERE oid='dustbunnies_990002'::regclass
+\gset
+
+-- send a VACUUM FULL and a VACUUM ANALYZE
+\c - - - :master_port
+VACUUM (FULL) dustbunnies;
+VACUUM ANALYZE dustbunnies;
+
+-- verify that relfilenode changed
+\c - - - :worker_1_port
+SELECT relfilenode != :oldnode AS table_rewritten FROM pg_class
+WHERE oid='dustbunnies_990002'::regclass;
+
+-- verify the VACUUM ANALYZE incremented both vacuum and analyze counts
+SELECT pg_sleep(.500);
+SELECT pg_stat_get_vacuum_count('dustbunnies_990002'::regclass);
+SELECT pg_stat_get_analyze_count('dustbunnies_990002'::regclass);
+
 -- disable auto-VACUUM for next test
 ALTER TABLE dustbunnies_990002 SET (autovacuum_enabled = false);
 SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid='dustbunnies_990002'::regclass
@@ -81,19 +100,6 @@ VACUUM (FREEZE) dustbunnies;
 SELECT relfrozenxid::text::integer > :frozenxid AS frozen_performed FROM pg_class
 WHERE oid='dustbunnies_990002'::regclass;
 
--- get file node to verify VACUUM FULL
-SELECT relfilenode AS oldnode FROM pg_class WHERE oid='dustbunnies_990002'::regclass
-\gset
-
--- send a VACUUM FULL
-\c - - - :master_port
-VACUUM (FULL) dustbunnies;
-
--- verify that relfrozenxid increased
-\c - - - :worker_1_port
-SELECT relfilenode != :oldnode AS table_rewritten FROM pg_class
-WHERE oid='dustbunnies_990002'::regclass;
-
 \c - - - :master_port
 -- verify warning for unqualified VACUUM
 VACUUM;