Revert "Last try with pg14"

This reverts commit bf86026cda47ee5ea4293e5c7dc4a87ed4776029.

src/test/regress/bin/normalize.sed

@@ -308,5 +308,3 @@ s/permission denied to terminate process/must be a superuser to terminate superu
 s/permission denied to cancel query/must be a superuser to cancel superuser query/g
 
 #endif /* PG_VERSION_NUM < PG_VERSION_16 */
-
-s/.* text to ignore//g

src/test/regress/expected/multi_utilities.out

@@ -424,6 +424,34 @@ FROM pg_total_relation_size('local_vacuum_table') s ;
  35000000
 (1 row)
 
+-- vacuum (process_toast true) should be vacuuming toast tables (default is true)
+select reltoastrelid from pg_class where relname='local_vacuum_table'
+\gset
+SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
+\gset
+insert into local_vacuum_table select i from generate_series(1,10000) i;
+VACUUM (FREEZE, PROCESS_TOAST true) local_vacuum_table;
+SELECT relfrozenxid::text::integer > :frozenxid AS frozen_performed FROM pg_class
+WHERE oid=:reltoastrelid::regclass;
+ frozen_performed
+---------------------------------------------------------------------
+ t
+(1 row)
+
+delete from local_vacuum_table;
+-- vacuum (process_toast false) should not be vacuuming toast tables (default is true)
+SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
+\gset
+insert into local_vacuum_table select i from generate_series(1,10000) i;
+VACUUM (FREEZE, PROCESS_TOAST false) local_vacuum_table;
+SELECT relfrozenxid::text::integer = :frozenxid AS frozen_not_performed FROM pg_class
+WHERE oid=:reltoastrelid::regclass;
+ frozen_not_performed
+---------------------------------------------------------------------
+ t
+(1 row)
+
+delete from local_vacuum_table;
 -- vacuum (truncate false) should not attempt to truncate off any empty pages at the end of the table (default is true)
 insert into local_vacuum_table select i from generate_series(1,1000000) i;
 delete from local_vacuum_table;

src/test/regress/expected/pg14.out

@@ -71,34 +71,6 @@ NOTICE:  issuing VACUUM (FULL,TRUNCATE false,INDEX_CLEANUP auto) pg14.t1_980000
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing VACUUM (FULL,TRUNCATE false,INDEX_CLEANUP auto) pg14.t1_980001
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
--- vacuum (process_toast true) should be vacuuming toast tables (default is true)
-CREATE TABLE local_vacuum_table(name text);
-select reltoastrelid from pg_class where relname='local_vacuum_table'
-\gset
-SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
-\gset
-INSERT INTO local_vacuum_table SELECT i FROM generate_series(1,10000) i;
-VACUUM (FREEZE, PROCESS_TOAST true) local_vacuum_table;
-SELECT relfrozenxid::text::integer > :frozenxid AS frozen_performed FROM pg_class
-WHERE oid=:reltoastrelid::regclass;
- frozen_performed
----------------------------------------------------------------------
- t
-(1 row)
-
-DELETE FROM local_vacuum_table;
--- vacuum (process_toast false) should not be vacuuming toast tables (default is true)
-SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
-\gset
-INSERT INTO local_vacuum_table SELECT i FROM generate_series(1,10000) i;
-VACUUM (FREEZE, PROCESS_TOAST false) local_vacuum_table;
-SELECT relfrozenxid::text::integer = :frozenxid AS frozen_not_performed FROM pg_class
-WHERE oid=:reltoastrelid::regclass;
- frozen_not_performed
----------------------------------------------------------------------
- t
-(1 row)
-
 SET citus.log_remote_commands TO OFF;
 create table dist(a int, b int);
 select create_distributed_table('dist','a');

src/test/regress/sql/multi_utilities.sql

@@ -272,6 +272,27 @@ VACUUM (INDEX_CLEANUP ON, PARALLEL 1) local_vacuum_table;
 SELECT CASE WHEN s BETWEEN 20000000 AND 49999999 THEN 35000000 ELSE s END size
 FROM pg_total_relation_size('local_vacuum_table') s ;
 
+-- vacuum (process_toast true) should be vacuuming toast tables (default is true)
+select reltoastrelid from pg_class where relname='local_vacuum_table'
+\gset
+
+SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
+\gset
+insert into local_vacuum_table select i from generate_series(1,10000) i;
+VACUUM (FREEZE, PROCESS_TOAST true) local_vacuum_table;
+SELECT relfrozenxid::text::integer > :frozenxid AS frozen_performed FROM pg_class
+WHERE oid=:reltoastrelid::regclass;
+delete from local_vacuum_table;
+
+-- vacuum (process_toast false) should not be vacuuming toast tables (default is true)
+SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
+\gset
+insert into local_vacuum_table select i from generate_series(1,10000) i;
+VACUUM (FREEZE, PROCESS_TOAST false) local_vacuum_table;
+SELECT relfrozenxid::text::integer = :frozenxid AS frozen_not_performed FROM pg_class
+WHERE oid=:reltoastrelid::regclass;
+delete from local_vacuum_table;
+
 -- vacuum (truncate false) should not attempt to truncate off any empty pages at the end of the table (default is true)
 insert into local_vacuum_table select i from generate_series(1,1000000) i;
 delete from local_vacuum_table;

src/test/regress/sql/pg14.sql

@@ -22,32 +22,6 @@ VACUUM (INDEX_CLEANUP "AUTOX") t1;
 VACUUM (FULL, FREEZE, VERBOSE false, ANALYZE, SKIP_LOCKED, INDEX_CLEANUP, PROCESS_TOAST, TRUNCATE) t1;
 VACUUM (FULL, FREEZE false, VERBOSE false, ANALYZE false, SKIP_LOCKED false, INDEX_CLEANUP "Auto", PROCESS_TOAST true, TRUNCATE false) t1;
 
--- vacuum (process_toast true) should be vacuuming toast tables (default is true)
-CREATE TABLE local_vacuum_table(name text);
-select reltoastrelid from pg_class where relname='local_vacuum_table'
-\gset
-
-SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
-\gset
-
-INSERT INTO local_vacuum_table SELECT i FROM generate_series(1,10000) i;
-
-VACUUM (FREEZE, PROCESS_TOAST true) local_vacuum_table;
-SELECT relfrozenxid::text::integer > :frozenxid AS frozen_performed FROM pg_class
-WHERE oid=:reltoastrelid::regclass;
-
-DELETE FROM local_vacuum_table;
-
--- vacuum (process_toast false) should not be vacuuming toast tables (default is true)
-SELECT relfrozenxid AS frozenxid FROM pg_class WHERE oid=:reltoastrelid::regclass
-\gset
-
-INSERT INTO local_vacuum_table SELECT i FROM generate_series(1,10000) i;
-
-VACUUM (FREEZE, PROCESS_TOAST false) local_vacuum_table;
-SELECT relfrozenxid::text::integer = :frozenxid AS frozen_not_performed FROM pg_class
-WHERE oid=:reltoastrelid::regclass;
-
 SET citus.log_remote_commands TO OFF;
 
 create table dist(a int, b int);