Clean up server_version_ge_16 from tests part 2

src/test/regress/expected/alter_table_set_access_method.out

@@ -776,15 +776,8 @@ RESET client_min_messages;
 create table events (event_id bigserial, event_time timestamptz default now(), payload text);
 create index on events (event_id);
 insert into events (payload) select 'hello-'||s from generate_series(1,10) s;
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
 BEGIN;
-  \if :server_version_ge_16
   SET LOCAL debug_parallel_query = regress;
-  \else
-  SET LOCAL force_parallel_mode = regress;
-  \endif
   SET LOCAL min_parallel_table_scan_size = 1;
   SET LOCAL parallel_tuple_cost = 0;
   SET LOCAL max_parallel_workers = 4;

src/test/regress/expected/columnar_fallback_scan.out

@@ -21,14 +21,7 @@ select count(*), min(i), max(i), avg(i) from fallback_scan;
 -- Negative test: try to force a parallel plan with at least two
 -- workers, but columnar should reject it and use a non-parallel scan.
 --
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
-\if :server_version_ge_16
 set debug_parallel_query = regress;
-\else
-set force_parallel_mode = regress;
-\endif
 set min_parallel_table_scan_size = 1;
 set parallel_tuple_cost = 0;
 set max_parallel_workers = 4;
@@ -46,11 +39,7 @@ select count(*), min(i), max(i), avg(i) from fallback_scan;
  150000 |   1 | 150000 | 75000.500000000000
 (1 row)
 
-\if :server_version_ge_16
 set debug_parallel_query = default;
-\else
-set force_parallel_mode = default;
-\endif
 set min_parallel_table_scan_size to default;
 set parallel_tuple_cost to default;
 set max_parallel_workers to default;

src/test/regress/expected/columnar_indexes.out

@@ -556,9 +556,6 @@ create table events (event_id bigserial, event_time timestamptz default now(), p
 BEGIN;
   -- this wouldn't flush any data
   insert into events (payload) select 'hello-'||s from generate_series(1, 10) s;
-  SHOW server_version \gset
-  SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-  \gset
   -- Since table is large enough, normally postgres would prefer using
   -- parallel workers when building the index.
   --
@@ -570,11 +567,7 @@ BEGIN;
   -- by postgres and throws an error. For this reason, here we don't expect
   -- following commnad to fail since we prevent using parallel workers for
   -- columnar tables.
-  \if :server_version_ge_16
   SET LOCAL debug_parallel_query = regress;
-  \else
-  SET LOCAL force_parallel_mode = regress;
-  \endif
   SET LOCAL min_parallel_table_scan_size = 1;
   SET LOCAL parallel_tuple_cost = 0;
   SET LOCAL max_parallel_workers = 4;

src/test/regress/expected/columnar_partitioning.out

@@ -20,15 +20,8 @@ INSERT INTO parent SELECT '2020-03-15', 30, 300, 'three thousand'
   FROM generate_series(1,100000);
 INSERT INTO parent SELECT '2020-04-15', 30, 300, 'three thousand'
   FROM generate_series(1,100000);
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
 -- run parallel plans
-\if :server_version_ge_16
 SET debug_parallel_query = regress;
-\else
-SET force_parallel_mode = regress;
-\endif
 SET min_parallel_table_scan_size = 1;
 SET parallel_tuple_cost = 0;
 SET max_parallel_workers = 4;
@@ -104,11 +97,7 @@ SELECT count(*), sum(i), min(i), max(i) FROM parent;
 (1 row)
 
 SET columnar.enable_custom_scan TO DEFAULT;
-\if :server_version_ge_16
 SET debug_parallel_query TO DEFAULT;
-\else
-SET force_parallel_mode TO DEFAULT;
-\endif
 SET min_parallel_table_scan_size TO DEFAULT;
 SET parallel_tuple_cost TO DEFAULT;
 SET max_parallel_workers TO DEFAULT;

src/test/regress/expected/create_drop_database_propagation_pg16.out

@@ -1,13 +1,3 @@
---
--- PG16
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
-\if :server_version_ge_16
-\else
-\q
-\endif
 -- create/drop database for pg >= 16
 set citus.enable_create_database_propagation=on;
 -- test icu_rules

src/test/regress/expected/create_drop_database_propagation_pg16_0.out

@@ -1,9 +0,0 @@
---
--- PG16
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
-\if :server_version_ge_16
-\else
-\q

src/test/regress/expected/metadata_sync_helpers.out

@@ -1287,21 +1287,14 @@ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;
 	SET application_name to 'citus_internal gpid=10000000001';
 	-- with an ugly trick, update the vartype of table from int to bigint
 	-- so that making two tables colocated fails
-	-- include varnullingrels for PG16+
-    SHOW server_version \gset
-    SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-    \gset
 	-- include varreturningtype for PG18+
 	SELECT substring(:'server_version', '\d+')::int >= 18 AS server_version_ge_18
     \gset
 	\if :server_version_ge_18
 	UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varnullingrels (b) :varlevelsup 1 :varreturningtype 0 :varnoold 1 :varoattno 1 :location -1}'
 	WHERE logicalrelid = 'test_2'::regclass;
-    \elif :server_version_ge_16
-    UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varnullingrels (b) :varlevelsup 1 :varnoold 1 :varoattno 1 :location -1}'
-	WHERE logicalrelid = 'test_2'::regclass;
     \else
-	UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varlevelsup 1 :varnoold 1 :varoattno 1 :location -1}'
+    UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varnullingrels (b) :varlevelsup 1 :varnoold 1 :varoattno 1 :location -1}'
 	WHERE logicalrelid = 'test_2'::regclass;
     \endif
 	SELECT citus_internal.update_relation_colocation('test_2'::regclass, 251);

src/test/regress/expected/multi_complex_count_distinct.out

@@ -1,18 +1,6 @@
 --
 -- COMPLEX_COUNT_DISTINCT
 --
--- This test file has an alternative output because of the following in PG16:
--- https://github.com/postgres/postgres/commit/1349d2790bf48a4de072931c722f39337e72055e
--- https://github.com/postgres/postgres/commit/f4c7c410ee4a7baa06f51ebb8d5333c169691dd3
--- The alternative output can be deleted when we drop support for PG15
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16;
- server_version_ge_16
----------------------------------------------------------------------
- t
-(1 row)
-
 SET citus.next_shard_id TO 240000;
 SET citus.shard_count TO 8;
 SET citus.shard_replication_factor TO 1;

src/test/regress/expected/multi_explain.out

@@ -1,22 +1,11 @@
 --
 -- MULTI_EXPLAIN
 --
--- This test file has an alternative output because of the following in PG16:
--- https://github.com/postgres/postgres/commit/1349d2790bf48a4de072931c722f39337e72055e
--- https://github.com/postgres/postgres/commit/f4c7c410ee4a7baa06f51ebb8d5333c169691dd3
--- The alternative output can be deleted when we drop support for PG15
---
 -- This test file has an alternative output because of the following in PG18:
 -- https://github.com/postgres/postgres/commit/161320b4b960ee4fe918959be6529ae9b106ea5a
 -- The alternative output can be deleted when we drop support for PG17
 --
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16;
- server_version_ge_16
----------------------------------------------------------------------
- t
-(1 row)
-
 SELECT substring(:'server_version', '\d+')::int >= 18 AS server_version_ge_18;
  server_version_ge_18
 ---------------------------------------------------------------------

src/test/regress/expected/multi_explain_0.out

@@ -1,22 +1,11 @@
 --
 -- MULTI_EXPLAIN
 --
--- This test file has an alternative output because of the following in PG16:
--- https://github.com/postgres/postgres/commit/1349d2790bf48a4de072931c722f39337e72055e
--- https://github.com/postgres/postgres/commit/f4c7c410ee4a7baa06f51ebb8d5333c169691dd3
--- The alternative output can be deleted when we drop support for PG15
---
 -- This test file has an alternative output because of the following in PG18:
 -- https://github.com/postgres/postgres/commit/161320b4b960ee4fe918959be6529ae9b106ea5a
 -- The alternative output can be deleted when we drop support for PG17
 --
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16;
- server_version_ge_16
----------------------------------------------------------------------
- t
-(1 row)
-
 SELECT substring(:'server_version', '\d+')::int >= 18 AS server_version_ge_18;
  server_version_ge_18
 ---------------------------------------------------------------------

src/test/regress/expected/multi_mx_create_table.out

@@ -58,8 +58,6 @@ CREATE OPERATOR citus_mx_test_schema.=== (
 );
 SET search_path TO public;
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
 SELECT substring(:'server_version', '\d+')::int >= 17 AS server_version_ge_17
 \gset
 \if :server_version_ge_17
@@ -67,12 +65,10 @@ SELECT substring(:'server_version', '\d+')::int >= 17 AS server_version_ge_17
 -- Relevant PG commit:
 -- https://github.com/postgres/postgres/commit/f696c0cd5f299f1b51e214efc55a22a782cc175d
 SELECT quote_ident((SELECT CASE WHEN datlocprovider='i' THEN datlocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) as current_locale \gset
-\elif :server_version_ge_16
+\else
 -- In PG16, read-only server settings lc_collate and lc_ctype are removed
 -- Relevant PG commit: b0f6c437160db640d4ea3e49398ebc3ba39d1982
 SELECT quote_ident((SELECT CASE WHEN datlocprovider='i' THEN daticulocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) as current_locale \gset
-\else
-SELECT quote_ident(current_setting('lc_collate')) as current_locale \gset
 \endif
 CREATE COLLATION citus_mx_test_schema.english (LOCALE=:current_locale);
 CREATE TYPE citus_mx_test_schema.new_composite_type as (key1 text, key2 text);

src/test/regress/sql/alter_table_set_access_method.sql

@@ -266,16 +266,8 @@ create table events (event_id bigserial, event_time timestamptz default now(), p
 create index on events (event_id);
 insert into events (payload) select 'hello-'||s from generate_series(1,10) s;
 
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
-
 BEGIN;
-  \if :server_version_ge_16
   SET LOCAL debug_parallel_query = regress;
-  \else
-  SET LOCAL force_parallel_mode = regress;
-  \endif
   SET LOCAL min_parallel_table_scan_size = 1;
   SET LOCAL parallel_tuple_cost = 0;
   SET LOCAL max_parallel_workers = 4;

src/test/regress/sql/columnar_fallback_scan.sql

@@ -20,16 +20,7 @@ select count(*), min(i), max(i), avg(i) from fallback_scan;
 -- Negative test: try to force a parallel plan with at least two
 -- workers, but columnar should reject it and use a non-parallel scan.
 --
-
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
-
-\if :server_version_ge_16
 set debug_parallel_query = regress;
-\else
-set force_parallel_mode = regress;
-\endif
 set min_parallel_table_scan_size = 1;
 set parallel_tuple_cost = 0;
 set max_parallel_workers = 4;
@@ -37,11 +28,7 @@ set max_parallel_workers_per_gather = 4;
 explain (costs off) select count(*), min(i), max(i), avg(i) from fallback_scan;
 select count(*), min(i), max(i), avg(i) from fallback_scan;
 
-\if :server_version_ge_16
 set debug_parallel_query = default;
-\else
-set force_parallel_mode = default;
-\endif
 set min_parallel_table_scan_size to default;
 set parallel_tuple_cost to default;
 set max_parallel_workers to default;

src/test/regress/sql/columnar_indexes.sql

@@ -414,10 +414,6 @@ BEGIN;
   -- this wouldn't flush any data
   insert into events (payload) select 'hello-'||s from generate_series(1, 10) s;
 
-  SHOW server_version \gset
-  SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-  \gset
-
   -- Since table is large enough, normally postgres would prefer using
   -- parallel workers when building the index.
   --
@@ -430,11 +426,7 @@ BEGIN;
   -- following commnad to fail since we prevent using parallel workers for
   -- columnar tables.
 
-  \if :server_version_ge_16
   SET LOCAL debug_parallel_query = regress;
-  \else
-  SET LOCAL force_parallel_mode = regress;
-  \endif
   SET LOCAL min_parallel_table_scan_size = 1;
   SET LOCAL parallel_tuple_cost = 0;
   SET LOCAL max_parallel_workers = 4;

src/test/regress/sql/columnar_partitioning.sql

@@ -24,16 +24,9 @@ INSERT INTO parent SELECT '2020-03-15', 30, 300, 'three thousand'
 INSERT INTO parent SELECT '2020-04-15', 30, 300, 'three thousand'
   FROM generate_series(1,100000);
 
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
-
 -- run parallel plans
-\if :server_version_ge_16
 SET debug_parallel_query = regress;
-\else
+
-SET force_parallel_mode = regress;
-\endif
 SET min_parallel_table_scan_size = 1;
 SET parallel_tuple_cost = 0;
 SET max_parallel_workers = 4;
@@ -57,11 +50,8 @@ EXPLAIN (costs off) SELECT count(*), sum(i), min(i), max(i) FROM parent;
 SELECT count(*), sum(i), min(i), max(i) FROM parent;
 SET columnar.enable_custom_scan TO DEFAULT;
 
-\if :server_version_ge_16
 SET debug_parallel_query TO DEFAULT;
-\else
+
-SET force_parallel_mode TO DEFAULT;
-\endif
 SET min_parallel_table_scan_size TO DEFAULT;
 SET parallel_tuple_cost TO DEFAULT;
 SET max_parallel_workers TO DEFAULT;

src/test/regress/sql/create_drop_database_propagation_pg16.sql

@@ -1,14 +1,3 @@
---
--- PG16
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
-\if :server_version_ge_16
-\else
-\q
-\endif
-
 -- create/drop database for pg >= 16
 
 set citus.enable_create_database_propagation=on;

src/test/regress/sql/metadata_sync_helpers.sql

@@ -798,21 +798,14 @@ BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;
 	-- with an ugly trick, update the vartype of table from int to bigint
 	-- so that making two tables colocated fails
 
-    -- include varnullingrels for PG16+
-    SHOW server_version \gset
-    SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-    \gset
 	-- include varreturningtype for PG18+
 	SELECT substring(:'server_version', '\d+')::int >= 18 AS server_version_ge_18
     \gset
 	\if :server_version_ge_18
 	UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varnullingrels (b) :varlevelsup 1 :varreturningtype 0 :varnoold 1 :varoattno 1 :location -1}'
 	WHERE logicalrelid = 'test_2'::regclass;
-    \elif :server_version_ge_16
-    UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varnullingrels (b) :varlevelsup 1 :varnoold 1 :varoattno 1 :location -1}'
-	WHERE logicalrelid = 'test_2'::regclass;
     \else
-	UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varlevelsup 1 :varnoold 1 :varoattno 1 :location -1}'
+    UPDATE pg_dist_partition SET partkey = '{VAR :varno 1 :varattno 1 :vartype 20 :vartypmod -1 :varcollid 0 :varnullingrels (b) :varlevelsup 1 :varnoold 1 :varoattno 1 :location -1}'
 	WHERE logicalrelid = 'test_2'::regclass;
     \endif
 

src/test/regress/sql/multi_complex_count_distinct.sql

@@ -1,14 +1,6 @@
 --
 -- COMPLEX_COUNT_DISTINCT
 --
--- This test file has an alternative output because of the following in PG16:
--- https://github.com/postgres/postgres/commit/1349d2790bf48a4de072931c722f39337e72055e
--- https://github.com/postgres/postgres/commit/f4c7c410ee4a7baa06f51ebb8d5333c169691dd3
--- The alternative output can be deleted when we drop support for PG15
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16;
-
 SET citus.next_shard_id TO 240000;
 SET citus.shard_count TO 8;
 SET citus.shard_replication_factor TO 1;

src/test/regress/sql/multi_explain.sql

@@ -1,17 +1,11 @@
 --
 -- MULTI_EXPLAIN
 --
--- This test file has an alternative output because of the following in PG16:
--- https://github.com/postgres/postgres/commit/1349d2790bf48a4de072931c722f39337e72055e
--- https://github.com/postgres/postgres/commit/f4c7c410ee4a7baa06f51ebb8d5333c169691dd3
--- The alternative output can be deleted when we drop support for PG15
---
 -- This test file has an alternative output because of the following in PG18:
 -- https://github.com/postgres/postgres/commit/161320b4b960ee4fe918959be6529ae9b106ea5a
 -- The alternative output can be deleted when we drop support for PG17
 --
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16;
 SELECT substring(:'server_version', '\d+')::int >= 18 AS server_version_ge_18;
 
 SET citus.next_shard_id TO 570000;

src/test/regress/sql/multi_mx_create_table.sql

@@ -59,8 +59,6 @@ CREATE OPERATOR citus_mx_test_schema.=== (
 SET search_path TO public;
 
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16
-\gset
 SELECT substring(:'server_version', '\d+')::int >= 17 AS server_version_ge_17
 \gset
 
@@ -69,12 +67,10 @@ SELECT substring(:'server_version', '\d+')::int >= 17 AS server_version_ge_17
 -- Relevant PG commit:
 -- https://github.com/postgres/postgres/commit/f696c0cd5f299f1b51e214efc55a22a782cc175d
 SELECT quote_ident((SELECT CASE WHEN datlocprovider='i' THEN datlocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) as current_locale \gset
-\elif :server_version_ge_16
+\else
 -- In PG16, read-only server settings lc_collate and lc_ctype are removed
 -- Relevant PG commit: b0f6c437160db640d4ea3e49398ebc3ba39d1982
 SELECT quote_ident((SELECT CASE WHEN datlocprovider='i' THEN daticulocale ELSE datcollate END FROM pg_database WHERE datname = current_database())) as current_locale \gset
-\else
-SELECT quote_ident(current_setting('lc_collate')) as current_locale \gset
 \endif
 
 CREATE COLLATION citus_mx_test_schema.english (LOCALE=:current_locale);