From 1f0ec0fc90ca8dd1f32f7179f520728c86dd8dd9 Mon Sep 17 00:00:00 2001 From: gurkanindibay Date: Mon, 25 Mar 2024 15:00:33 +0300 Subject: [PATCH] Uses enable_ddl_propagation file --- src/test/regress/base_schedule | 1 + src/test/regress/columnar_schedule | 1 + ...enterprise_isolation_logicalrep_1_schedule | 1 + ...enterprise_isolation_logicalrep_2_schedule | 1 + ...enterprise_isolation_logicalrep_3_schedule | 1 + .../regress/enterprise_isolation_schedule | 1 + src/test/regress/enterprise_schedule | 1 + .../expected/enable_ddl_propagation.out | 29 +++++++------------ .../regress/expected/multi_test_helpers.out | 25 ---------------- src/test/regress/failure_base_schedule | 1 + src/test/regress/isolation_schedule | 2 +- src/test/regress/minimal_schedule | 1 + src/test/regress/multi_schedule | 1 + .../regress/sql/enable_ddl_propagation.sql | 13 ++------- .../sql/minimal_cluster_management.sql | 13 --------- src/test/regress/sql/multi_test_helpers.sql | 12 -------- .../regress/sql/single_node_enterprise.sql | 13 --------- 17 files changed, 23 insertions(+), 94 deletions(-) diff --git a/src/test/regress/base_schedule b/src/test/regress/base_schedule index 65f439acc..f56adb5a3 100644 --- a/src/test/regress/base_schedule +++ b/src/test/regress/base_schedule @@ -1,6 +1,7 @@ # ---------- # Only run few basic tests to set up a testing environment # ---------- +test: enable_ddl_propagation test: multi_test_helpers multi_test_helpers_superuser multi_create_fdw columnar_test_helpers failure_test_helpers test: multi_cluster_management test: multi_test_catalog_views diff --git a/src/test/regress/columnar_schedule b/src/test/regress/columnar_schedule index 602af0fc7..ef8b2b288 100644 --- a/src/test/regress/columnar_schedule +++ b/src/test/regress/columnar_schedule @@ -1,3 +1,4 @@ +test: enable_ddl_propagation test: multi_test_helpers multi_test_helpers_superuser columnar_test_helpers test: multi_cluster_management test: multi_test_catalog_views diff --git a/src/test/regress/enterprise_isolation_logicalrep_1_schedule b/src/test/regress/enterprise_isolation_logicalrep_1_schedule index 2656e96d5..509548db1 100644 --- a/src/test/regress/enterprise_isolation_logicalrep_1_schedule +++ b/src/test/regress/enterprise_isolation_logicalrep_1_schedule @@ -4,6 +4,7 @@ test: isolation_setup # isolation_cluster_management such that tests # that come later can be parallelized test: isolation_cluster_management +test: isolation_enable_ddl_propagation test: isolation_logical_replication_single_shard_commands test: isolation_logical_replication_nonsu_nonbypassrls diff --git a/src/test/regress/enterprise_isolation_logicalrep_2_schedule b/src/test/regress/enterprise_isolation_logicalrep_2_schedule index e8915cb27..8aae14af6 100644 --- a/src/test/regress/enterprise_isolation_logicalrep_2_schedule +++ b/src/test/regress/enterprise_isolation_logicalrep_2_schedule @@ -4,6 +4,7 @@ test: isolation_setup # isolation_cluster_management such that tests # that come later can be parallelized test: isolation_cluster_management +test: isolation_enable_ddl_propagation test: isolation_logical_replication_single_shard_commands_on_mx test: isolation_logical_replication_multi_shard_commands_on_mx diff --git a/src/test/regress/enterprise_isolation_logicalrep_3_schedule b/src/test/regress/enterprise_isolation_logicalrep_3_schedule index 105dcc049..06b3aacdd 100644 --- a/src/test/regress/enterprise_isolation_logicalrep_3_schedule +++ b/src/test/regress/enterprise_isolation_logicalrep_3_schedule @@ -4,6 +4,7 @@ test: isolation_setup # isolation_cluster_management such that tests # that come later can be parallelized test: isolation_cluster_management +test: isolation_enable_ddl_propagation test: isolation_logical_replication_with_partitioning test: isolation_logical_replication_binaryless diff --git a/src/test/regress/enterprise_isolation_schedule b/src/test/regress/enterprise_isolation_schedule index 689a7db75..bde8f225d 100644 --- a/src/test/regress/enterprise_isolation_schedule +++ b/src/test/regress/enterprise_isolation_schedule @@ -4,6 +4,7 @@ test: isolation_setup # isolation_cluster_management such that tests # that come later can be parallelized test: isolation_cluster_management +test: isolation_enable_ddl_propagation test: isolation_move_placement_vs_move_placement test: isolation_move_placement_vs_modification diff --git a/src/test/regress/enterprise_schedule b/src/test/regress/enterprise_schedule index 9a832c4d6..59156def7 100644 --- a/src/test/regress/enterprise_schedule +++ b/src/test/regress/enterprise_schedule @@ -1,5 +1,6 @@ # should come before multi_cluster_management # as it touches node metadata +test: enable_ddl_propagation test: single_node_enterprise test: multi_test_helpers multi_test_helpers_superuser diff --git a/src/test/regress/expected/enable_ddl_propagation.out b/src/test/regress/expected/enable_ddl_propagation.out index dc5cc36b2..6ad3f9bcd 100644 --- a/src/test/regress/expected/enable_ddl_propagation.out +++ b/src/test/regress/expected/enable_ddl_propagation.out @@ -1,23 +1,14 @@ -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf +SELECT run_command_on_workers('ALTER SYSTEM SET citus.enable_ddl_propagation TO ON'); + run_command_on_workers --------------------------------------------------------------------- - t -(1 row) + (localhost,57637,t,"ALTER SYSTEM") + (localhost,57638,t,"ALTER SYSTEM") +(2 rows) -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf +SELECT run_command_on_workers('SELECT pg_reload_conf()'); + run_command_on_workers --------------------------------------------------------------------- - t -(1 row) - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) + (localhost,57637,t,t) + (localhost,57638,t,t) +(2 rows) diff --git a/src/test/regress/expected/multi_test_helpers.out b/src/test/regress/expected/multi_test_helpers.out index 36b1be250..cfe6ff204 100644 --- a/src/test/regress/expected/multi_test_helpers.out +++ b/src/test/regress/expected/multi_test_helpers.out @@ -1,28 +1,3 @@ --- File to create functions and helpers needed for subsequent tests -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) - -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) - -\c - - - :master_port -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$ diff --git a/src/test/regress/failure_base_schedule b/src/test/regress/failure_base_schedule index 03ee96ff7..491b3b94a 100644 --- a/src/test/regress/failure_base_schedule +++ b/src/test/regress/failure_base_schedule @@ -1,4 +1,5 @@ # import this file (from psql you can use \i) to use mitmproxy manually +test: enable_ddl_propagation test: failure_test_helpers # this should only be run by pg_regress_multi, you don't need it diff --git a/src/test/regress/isolation_schedule b/src/test/regress/isolation_schedule index 5c5f9ccbb..52aa49f6c 100644 --- a/src/test/regress/isolation_schedule +++ b/src/test/regress/isolation_schedule @@ -1,4 +1,3 @@ -test: isolation_enable_ddl_propagation test: isolation_setup test: isolation_add_remove_node test: isolation_update_node @@ -15,6 +14,7 @@ test: isolation_extension_commands # isolation_cluster_management such that tests # that come later can be parallelized test: isolation_cluster_management +test: isolation_enable_ddl_propagation # the following tests depend on the distributed # transactionId, so should not be parallelized diff --git a/src/test/regress/minimal_schedule b/src/test/regress/minimal_schedule index 8b0cfff70..072039a25 100644 --- a/src/test/regress/minimal_schedule +++ b/src/test/regress/minimal_schedule @@ -1,2 +1,3 @@ test: minimal_cluster_management +test: enable_ddl_propagation test: multi_test_helpers multi_test_helpers_superuser multi_create_fdw columnar_test_helpers multi_test_catalog_views tablespace diff --git a/src/test/regress/multi_schedule b/src/test/regress/multi_schedule index af5921e60..f24ebdeae 100644 --- a/src/test/regress/multi_schedule +++ b/src/test/regress/multi_schedule @@ -1,3 +1,4 @@ +test: enable_ddl_propagation test: multi_test_helpers multi_test_helpers_superuser test: multi_cluster_management test: create_role_propagation diff --git a/src/test/regress/sql/enable_ddl_propagation.sql b/src/test/regress/sql/enable_ddl_propagation.sql index b859d8a28..ff7143359 100644 --- a/src/test/regress/sql/enable_ddl_propagation.sql +++ b/src/test/regress/sql/enable_ddl_propagation.sql @@ -1,11 +1,2 @@ -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - +SELECT run_command_on_workers('ALTER SYSTEM SET citus.enable_ddl_propagation TO ON'); +SELECT run_command_on_workers('SELECT pg_reload_conf()'); diff --git a/src/test/regress/sql/minimal_cluster_management.sql b/src/test/regress/sql/minimal_cluster_management.sql index fffcb18fa..30f69d43d 100644 --- a/src/test/regress/sql/minimal_cluster_management.sql +++ b/src/test/regress/sql/minimal_cluster_management.sql @@ -1,16 +1,3 @@ -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - - -\c - - - :master_port SET citus.next_shard_id TO 1220000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1390000; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1; diff --git a/src/test/regress/sql/multi_test_helpers.sql b/src/test/regress/sql/multi_test_helpers.sql index 5fec8f8ae..7d218361c 100644 --- a/src/test/regress/sql/multi_test_helpers.sql +++ b/src/test/regress/sql/multi_test_helpers.sql @@ -1,17 +1,5 @@ -- File to create functions and helpers needed for subsequent tests -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :master_port -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$ diff --git a/src/test/regress/sql/single_node_enterprise.sql b/src/test/regress/sql/single_node_enterprise.sql index 6cfbbadc8..19393ba24 100644 --- a/src/test/regress/sql/single_node_enterprise.sql +++ b/src/test/regress/sql/single_node_enterprise.sql @@ -1,19 +1,6 @@ -- we already have lots of tests targeting -- single node citus clusters in sql/single_node.sql -- in this file, we are testing enterprise features - -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :master_port CREATE SCHEMA single_node_ent; SET search_path TO single_node_ent; SET citus.shard_count TO 4;