diff --git a/src/test/regress/expected/add_coordinator.out b/src/test/regress/expected/add_coordinator.out index d1e5d7cd8..10a85737b 100644 --- a/src/test/regress/expected/add_coordinator.out +++ b/src/test/regress/expected/add_coordinator.out @@ -1,16 +1,16 @@ -- -- ADD_COORDINATOR -- -SELECT master_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset +SELECT citus_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset -- adding the same node again should return the existing nodeid -SELECT master_add_node('localhost', :master_port, groupid => 0) = :master_nodeid; +SELECT citus_add_node('localhost', :master_port, groupid => 0) = :master_nodeid; ?column? --------------------------------------------------------------------- t (1 row) -- adding another node with groupid=0 should error out -SELECT master_add_node('localhost', 12345, groupid => 0) = :master_nodeid; +SELECT citus_add_node('localhost', 12345, groupid => 0) = :master_nodeid; ERROR: group 0 already has a primary node -- start_metadata_sync_to_node() for coordinator should raise a notice SELECT start_metadata_sync_to_node('localhost', :master_port); diff --git a/src/test/regress/expected/alter_database_owner.out b/src/test/regress/expected/alter_database_owner.out index 2e5e54aca..ec48f10ed 100644 --- a/src/test/regress/expected/alter_database_owner.out +++ b/src/test/regress/expected/alter_database_owner.out @@ -37,8 +37,8 @@ $$); (2 rows) -- remove a node to verify addition later -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -72,7 +72,7 @@ $$); -- turn off propagation to verify it does _not_ propagate to new nodes when turned off SET citus.enable_alter_database_owner TO off; -- add back second node to verify the owner of the database was set accordingly -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -94,14 +94,14 @@ $$); -- turn on propagation to verify it does propagate to new nodes when enabled SET citus.enable_alter_database_owner TO on; -SELECT master_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on + citus_remove_node --------------------------------------------------------------------- (1 row) -- add back second node to verify the owner of the database was set accordingly -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/alter_role_propagation.out b/src/test/regress/expected/alter_role_propagation.out index 05072ddff..8e8c30f98 100644 --- a/src/test/regress/expected/alter_role_propagation.out +++ b/src/test/regress/expected/alter_role_propagation.out @@ -23,8 +23,8 @@ SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit, rolcr (localhost,57638,t,"(postgres,t,t,t,t,t,t,t,66,md568701dc40be546e0357027fb0109338c,2032)") (2 rows) -SELECT master_remove_node('localhost', :worker_1_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_1_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -41,7 +41,7 @@ SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit, rolcr (localhost,57638,t,"(postgres,t,t,t,t,t,t,t,0,md53e559cc1fcf0c70f1f8e05c9a79c3133,2052)") (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); ?column? --------------------------------------------------------------------- 1 @@ -83,8 +83,8 @@ SELECT run_command_on_workers('SHOW enable_hashagg'); (2 rows) -- remove 1 node to verify settings are copied when the node gets added back -SELECT master_remove_node('localhost', :worker_1_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_1_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -119,7 +119,7 @@ ALTER ROLE ALL SET public.myguc TO "Hello, World"; -- test for configuration values that should not be downcased even when unquoted ALTER ROLE CURRENT_USER SET lc_messages TO 'C'; -- add worker and check all settings are copied -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); ?column? --------------------------------------------------------------------- 1 @@ -247,14 +247,14 @@ DROP DATABASE "REGRESSION"; -- make sure alter role set is not propagated when the feature is deliberately turned off SET citus.enable_alter_role_set_propagation TO off; -- remove 1 node to verify settings are NOT copied when the node gets added back -SELECT master_remove_node('localhost', :worker_1_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_1_port); + citus_remove_node --------------------------------------------------------------------- (1 row) ALTER ROLE ALL SET enable_hashjoin TO FALSE; -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/alter_table_set_access_method.out b/src/test/regress/expected/alter_table_set_access_method.out index cf72940b1..2d9231e05 100644 --- a/src/test/regress/expected/alter_table_set_access_method.out +++ b/src/test/regress/expected/alter_table_set_access_method.out @@ -429,7 +429,7 @@ ORDER BY conname; -- test different table types SET client_min_messages to WARNING; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId := 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId := 0); ?column? --------------------------------------------------------------------- 1 @@ -801,7 +801,7 @@ DEBUG: pathlist hook for columnar table am RESET client_min_messages; SET client_min_messages TO WARNING; DROP SCHEMA alter_table_set_access_method CASCADE; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/auto_undist_citus_local.out b/src/test/regress/expected/auto_undist_citus_local.out index 260264f9c..bcbd54173 100644 --- a/src/test/regress/expected/auto_undist_citus_local.out +++ b/src/test/regress/expected/auto_undist_citus_local.out @@ -5,7 +5,7 @@ CREATE SCHEMA drop_fkey_cascade; SET search_path TO drop_fkey_cascade; SET client_min_messages TO WARNING; SET citus.next_shard_id TO 1810000; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/citus_local_dist_joins.out b/src/test/regress/expected/citus_local_dist_joins.out index fa40c88c8..6676c35f9 100644 --- a/src/test/regress/expected/citus_local_dist_joins.out +++ b/src/test/regress/expected/citus_local_dist_joins.out @@ -1,7 +1,7 @@ CREATE SCHEMA citus_local_dist_joins; SET search_path TO citus_local_dist_joins; SET client_min_messages to ERROR; -SELECT master_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset +SELECT citus_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset CREATE TABLE citus_local(key int, value text); SELECT citus_add_local_table_to_metadata('citus_local'); citus_add_local_table_to_metadata @@ -499,8 +499,8 @@ DEBUG: Plan XXX query after replacing subqueries and CTEs: SELECT count(*) AS c SET client_min_messages to ERROR; DROP TABLE citus_local; -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/citus_local_table_triggers.out b/src/test/regress/expected/citus_local_table_triggers.out index db1512590..36b42003b 100644 --- a/src/test/regress/expected/citus_local_table_triggers.out +++ b/src/test/regress/expected/citus_local_table_triggers.out @@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_table_triggers; SET search_path TO citus_local_table_triggers; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/citus_local_tables.out b/src/test/regress/expected/citus_local_tables.out index 517c1271b..ebe2e6a36 100644 --- a/src/test/regress/expected/citus_local_tables.out +++ b/src/test/regress/expected/citus_local_tables.out @@ -10,7 +10,7 @@ SET search_path TO citus_local_tables_test_schema; --------------------------------------------------------------------- -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 @@ -26,12 +26,12 @@ SELECT citus_add_local_table_to_metadata('citus_local_table_1'); (1 row) -- try to remove coordinator and observe failure as there exist a citus local table -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ERROR: cannot remove the primary node of a node group which has shard placements DROP TABLE citus_local_table_1; NOTICE: executing the command locally: DROP TABLE IF EXISTS citus_local_tables_test_schema.citus_local_table_1_xxxxx CASCADE -- this should work now as the citus local table is dropped -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 @@ -43,7 +43,7 @@ SELECT citus_add_local_table_to_metadata('citus_local_table_1'); ERROR: could not find the coordinator node in metadata as it is not added as a worker -- let coordinator have citus local tables again for next tests set client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/citus_local_tables_mx.out b/src/test/regress/expected/citus_local_tables_mx.out index fc509e6be..4f8276180 100644 --- a/src/test/regress/expected/citus_local_tables_mx.out +++ b/src/test/regress/expected/citus_local_tables_mx.out @@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_tables_mx; SET search_path TO citus_local_tables_mx; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/citus_local_tables_queries.out b/src/test/regress/expected/citus_local_tables_queries.out index a6d48a7b2..d41c0334d 100644 --- a/src/test/regress/expected/citus_local_tables_queries.out +++ b/src/test/regress/expected/citus_local_tables_queries.out @@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_table_queries; SET search_path TO citus_local_table_queries; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/citus_local_tables_queries_mx.out b/src/test/regress/expected/citus_local_tables_queries_mx.out index 684644476..e38a1b82d 100644 --- a/src/test/regress/expected/citus_local_tables_queries_mx.out +++ b/src/test/regress/expected/citus_local_tables_queries_mx.out @@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_table_queries_mx; SET search_path TO citus_local_table_queries_mx; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/columnar_citus_integration.out b/src/test/regress/expected/columnar_citus_integration.out index f55db78ee..9f8bc11d5 100644 --- a/src/test/regress/expected/columnar_citus_integration.out +++ b/src/test/regress/expected/columnar_citus_integration.out @@ -830,7 +830,7 @@ SELECT compression FROM columnar.options WHERE regclass = 'table_option_referenc DROP TABLE table_option_reference, table_option_reference_2; SET citus.shard_replication_factor TO 1; -- test options on a citus local table -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 @@ -1061,7 +1061,7 @@ SELECT compression FROM columnar.options WHERE regclass = 'table_option_citus_lo (1 row) DROP TABLE table_option_citus_local, table_option_citus_local_2; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/coordinator_shouldhaveshards.out b/src/test/regress/expected/coordinator_shouldhaveshards.out index dcae09dbe..d1edb097a 100644 --- a/src/test/regress/expected/coordinator_shouldhaveshards.out +++ b/src/test/regress/expected/coordinator_shouldhaveshards.out @@ -4,7 +4,7 @@ SET search_path TO coordinator_shouldhaveshards; SET citus.next_shard_id TO 1503000; -- idempotently add node to allow this test to run without add_coordinator SET client_min_messages TO WARNING; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/create_citus_local_table_cascade.out b/src/test/regress/expected/create_citus_local_table_cascade.out index 31d4e6f9c..c3b222dce 100644 --- a/src/test/regress/expected/create_citus_local_table_cascade.out +++ b/src/test/regress/expected/create_citus_local_table_cascade.out @@ -5,7 +5,7 @@ CREATE SCHEMA citus_add_local_table_to_metadata_cascade; SET search_path TO citus_add_local_table_to_metadata_cascade; SET client_min_messages to ERROR; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/create_ref_dist_from_citus_local.out b/src/test/regress/expected/create_ref_dist_from_citus_local.out index a4eceb8e1..5869ce2fa 100644 --- a/src/test/regress/expected/create_ref_dist_from_citus_local.out +++ b/src/test/regress/expected/create_ref_dist_from_citus_local.out @@ -5,7 +5,7 @@ CREATE SCHEMA create_ref_dist_from_citus_local; SET search_path TO create_ref_dist_from_citus_local; SET client_min_messages to ERROR; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/escape_extension_name.out b/src/test/regress/expected/escape_extension_name.out index 45ca2a9a0..b0e082d7f 100644 --- a/src/test/regress/expected/escape_extension_name.out +++ b/src/test/regress/expected/escape_extension_name.out @@ -32,7 +32,7 @@ SELECT run_command_on_workers($$SELECT count(*) FROM pg_extension WHERE extname (2 rows) -- show that extension recreation on new nodes works also fine with extension names that require escaping -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -49,7 +49,7 @@ WHERE name = 'uuid-ossp' \gset :uuid_present_command; -- and add the other node -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/escape_extension_name_0.out b/src/test/regress/expected/escape_extension_name_0.out index d27415e4a..a4cb19c45 100644 --- a/src/test/regress/expected/escape_extension_name_0.out +++ b/src/test/regress/expected/escape_extension_name_0.out @@ -38,7 +38,7 @@ SELECT run_command_on_workers($$SELECT count(*) FROM pg_extension WHERE extname (2 rows) -- show that extension recreation on new nodes works also fine with extension names that require escaping -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -60,7 +60,7 @@ WHERE name = 'uuid-ossp' (1 row) -- and add the other node -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/failure_add_disable_node.out b/src/test/regress/expected/failure_add_disable_node.out index 229b72276..3b5729021 100644 --- a/src/test/regress/expected/failure_add_disable_node.out +++ b/src/test/regress/expected/failure_add_disable_node.out @@ -1,5 +1,5 @@ -- --- failure_add_disable_node tests master_add_node, master_remove_node +-- failure_add_disable_node tests citus_add_node, citus_remove_node -- master_activate_node for failures. -- master_disable_node and master_add_inactive_node can not be -- tested as they don't create network activity @@ -122,14 +122,14 @@ ORDER BY placementid; 200000 | 1 (1 row) --- master_remove_node fails when there are shards on that worker -SELECT master_remove_node('localhost', :worker_2_proxy_port); +-- citus_remove_node fails when there are shards on that worker +SELECT citus_remove_node('localhost', :worker_2_proxy_port); ERROR: cannot remove the last worker node because there are reference tables and it would cause data loss on reference tables HINT: To proceed, either drop the reference tables or use undistribute_table() function to convert them to local tables -- drop event table and re-run remove DROP TABLE event_table; -SELECT master_remove_node('localhost', :worker_2_proxy_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_proxy_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -160,8 +160,8 @@ SELECT master_add_inactive_node('localhost', :worker_2_proxy_port); 3 (1 row) -SELECT master_remove_node('localhost', :worker_2_proxy_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_proxy_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -182,8 +182,8 @@ SELECT citus.mitmproxy('conn.allow()'); (1 row) -SELECT master_add_node('localhost', :worker_2_proxy_port); - master_add_node +SELECT citus_add_node('localhost', :worker_2_proxy_port); + citus_add_node --------------------------------------------------------------------- 4 (1 row) @@ -212,8 +212,8 @@ SELECT citus.mitmproxy('conn.allow()'); (1 row) -SELECT master_add_node('localhost', :worker_1_port); - master_add_node +SELECT citus_add_node('localhost', :worker_1_port); + citus_add_node --------------------------------------------------------------------- 1 (1 row) diff --git a/src/test/regress/expected/failure_setup.out b/src/test/regress/expected/failure_setup.out index 4cbb4b0a4..dc37751be 100644 --- a/src/test/regress/expected/failure_setup.out +++ b/src/test/regress/expected/failure_setup.out @@ -5,14 +5,14 @@ SELECT citus.mitmproxy('conn.allow()'); (1 row) -- add the workers -SELECT master_add_node('localhost', :worker_1_port); - master_add_node +SELECT citus_add_node('localhost', :worker_1_port); + citus_add_node --------------------------------------------------------------------- 1 (1 row) -SELECT master_add_node('localhost', :worker_2_proxy_port); -- an mitmproxy which forwards to the second worker - master_add_node +SELECT citus_add_node('localhost', :worker_2_proxy_port); -- an mitmproxy which forwards to the second worker + citus_add_node --------------------------------------------------------------------- 2 (1 row) diff --git a/src/test/regress/expected/fkeys_between_local_ref.out b/src/test/regress/expected/fkeys_between_local_ref.out index 7a620b84e..b9fe499f7 100644 --- a/src/test/regress/expected/fkeys_between_local_ref.out +++ b/src/test/regress/expected/fkeys_between_local_ref.out @@ -12,7 +12,7 @@ WHERE tablename=logicalrelid::regclass::text AND partmethod = 'n' AND repmodel = 's'; -- remove coordinator if it is added to pg_dist_node and test -- behavior when coordinator is not added to metadata -SELECT COUNT(master_remove_node(nodename, nodeport)) < 2 +SELECT COUNT(citus_remove_node(nodename, nodeport)) < 2 FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:master_port; ?column? --------------------------------------------------------------------- @@ -59,7 +59,7 @@ select create_reference_table('ref2'); drop table if exists ref, ref2, other cascade; -- add coordinator to pg_dist_node for rest of the tests -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/follower_single_node.out b/src/test/regress/expected/follower_single_node.out index b2d3efb4b..73ee2d6e1 100644 --- a/src/test/regress/expected/follower_single_node.out +++ b/src/test/regress/expected/follower_single_node.out @@ -7,7 +7,7 @@ SET search_path TO single_node; SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; SET citus.next_shard_id TO 93630500; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); ?column? --------------------------------------------------------------------- 1 @@ -238,7 +238,7 @@ ERROR: node group 0 does not have a secondary node -- should work this time \c -reuse-previous=off regression - - :master_port SET search_path TO single_node; -SELECT 1 FROM master_add_node('localhost', :follower_master_port, groupid => 0, noderole => 'secondary'); +SELECT 1 FROM citus_add_node('localhost', :follower_master_port, groupid => 0, noderole => 'secondary'); ?column? --------------------------------------------------------------------- 1 @@ -392,14 +392,14 @@ SET search_path TO single_node; SET client_min_messages TO WARNING; DROP SCHEMA single_node CASCADE; -- Remove the coordinator again -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 (1 row) -- Remove the secondary coordinator again -SELECT 1 FROM master_remove_node('localhost', :follower_master_port); +SELECT 1 FROM citus_remove_node('localhost', :follower_master_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/grant_on_schema_propagation.out b/src/test/regress/expected/grant_on_schema_propagation.out index bf2b9366c..46531be96 100644 --- a/src/test/regress/expected/grant_on_schema_propagation.out +++ b/src/test/regress/expected/grant_on_schema_propagation.out @@ -214,8 +214,8 @@ SELECT run_command_on_coordinator_and_workers('DROP SCHEMA non_dist_schema'); -- test if the grantors are propagated correctly -- first remove one of the worker nodes SET citus.shard_replication_factor TO 1; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -257,7 +257,7 @@ SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'grantor_schema' ORDER \c - - - :master_port -- add the previously removed node -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -361,8 +361,8 @@ SELECT run_command_on_coordinator_and_workers('DROP SCHEMA dist_schema CASCADE') -- test grants on public schema -- first remove one of the worker nodes SET citus.shard_replication_factor TO 1; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -396,7 +396,7 @@ SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'public' ORDER BY nspna \c - - - :master_port -- add the previously removed node -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out index 8e99fc100..af389f8ba 100644 --- a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out +++ b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out @@ -16,7 +16,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -42,7 +42,7 @@ nodeport|success|result 57637|t | 10 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -68,7 +68,7 @@ step s2-copy-to-reference-table: COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5'; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -91,7 +91,7 @@ nodeport|success|result 57637|t | 10 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -114,7 +114,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -140,7 +140,7 @@ nodeport|success|result 57637|t | 6 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -166,7 +166,7 @@ step s2-insert-to-reference-table: INSERT INTO test_reference_table VALUES (6); step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -189,7 +189,7 @@ nodeport|success|result 57637|t | 6 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -212,7 +212,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -239,7 +239,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -265,7 +265,7 @@ step s2-ddl-on-reference-table: CREATE INDEX reference_index ON test_reference_table(test_id); step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -289,7 +289,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -312,7 +312,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -345,7 +345,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -376,7 +376,7 @@ create_reference_table (1 row) step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -400,7 +400,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -420,7 +420,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -446,7 +446,7 @@ nodeport|success|result 57637|t | 5 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -469,7 +469,7 @@ step s2-copy-to-reference-table: COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5'; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -492,7 +492,7 @@ nodeport|success|result 57637|t | 5 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -512,7 +512,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -538,7 +538,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -561,7 +561,7 @@ step s2-insert-to-reference-table: INSERT INTO test_reference_table VALUES (6); step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -584,7 +584,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -604,7 +604,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -631,7 +631,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -654,7 +654,7 @@ step s2-ddl-on-reference-table: CREATE INDEX reference_index ON test_reference_table(test_id); step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -678,7 +678,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -698,7 +698,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -731,7 +731,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -759,7 +759,7 @@ create_reference_table (1 row) step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -783,7 +783,7 @@ nodeport|success|result 57637|t | 1 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -803,7 +803,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -831,7 +831,7 @@ nodeport|success|result 57638|t | 5 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -854,7 +854,7 @@ step s2-copy-to-reference-table: COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5'; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -879,7 +879,7 @@ nodeport|success|result 57638|t | 5 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -899,7 +899,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -927,7 +927,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -950,7 +950,7 @@ step s2-insert-to-reference-table: INSERT INTO test_reference_table VALUES (6); step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -975,7 +975,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -995,7 +995,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1023,7 +1023,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1046,7 +1046,7 @@ step s2-ddl-on-reference-table: CREATE INDEX reference_index ON test_reference_table(test_id); step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -1071,7 +1071,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1091,7 +1091,7 @@ step s1-begin: BEGIN; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1124,7 +1124,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1152,7 +1152,7 @@ create_reference_table (1 row) step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -1177,7 +1177,7 @@ nodeport|success|result 57638|t | 1 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1194,7 +1194,7 @@ step s1-do-not-replicate-on-activate: SET citus.replicate_reference_tables_on_activate TO off; step s1-add-second-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1227,7 +1227,7 @@ replicate_reference_tables step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- diff --git a/src/test/regress/expected/isolation_add_remove_node.out b/src/test/regress/expected/isolation_add_remove_node.out index b63147cc9..4641b4263 100644 --- a/src/test/regress/expected/isolation_add_remove_node.out +++ b/src/test/regress/expected/isolation_add_remove_node.out @@ -10,7 +10,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -18,13 +18,13 @@ step s1-add-node-1: (1 row) step s2-remove-node-1: - SELECT * FROM master_remove_node('localhost', 57637); + SELECT * FROM citus_remove_node('localhost', 57637); step s1-commit: COMMIT; step s2-remove-node-1: <... completed> -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -36,7 +36,7 @@ nodename|nodeport|isactive --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (0 rows) @@ -51,7 +51,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -59,7 +59,7 @@ step s1-add-node-1: (1 row) step s2-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s1-commit: COMMIT; @@ -79,7 +79,7 @@ localhost| 57637|t localhost| 57638|t (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -96,7 +96,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -104,7 +104,7 @@ step s1-add-node-1: (1 row) step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); step s1-commit: COMMIT; @@ -123,7 +123,7 @@ nodename |nodeport|isactive localhost| 57637|t (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -139,7 +139,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -147,7 +147,7 @@ step s1-add-node-1: (1 row) step s2-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s1-abort: ABORT; @@ -166,7 +166,7 @@ nodename |nodeport|isactive localhost| 57638|t (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -182,7 +182,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -190,7 +190,7 @@ step s1-add-node-1: (1 row) step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); step s1-abort: ABORT; @@ -209,7 +209,7 @@ nodename |nodeport|isactive localhost| 57637|t (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -222,7 +222,7 @@ starting permutation: s1-add-node-1 s1-add-node-2 s1-begin s1-remove-node-1 s2-r (1 row) step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -230,7 +230,7 @@ step s1-add-node-1: (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -241,21 +241,21 @@ step s1-begin: BEGIN; step s1-remove-node-1: - SELECT * FROM master_remove_node('localhost', 57637); + SELECT * FROM citus_remove_node('localhost', 57637); -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) step s2-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); step s1-commit: COMMIT; step s2-remove-node-2: <... completed> -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -267,7 +267,7 @@ nodename|nodeport|isactive --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (0 rows) @@ -279,7 +279,7 @@ starting permutation: s1-add-node-1 s1-begin s1-remove-node-1 s2-remove-node-1 s (1 row) step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -290,15 +290,15 @@ step s1-begin: BEGIN; step s1-remove-node-1: - SELECT * FROM master_remove_node('localhost', 57637); + SELECT * FROM citus_remove_node('localhost', 57637); -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) step s2-remove-node-1: - SELECT * FROM master_remove_node('localhost', 57637); + SELECT * FROM citus_remove_node('localhost', 57637); step s1-commit: COMMIT; @@ -312,7 +312,7 @@ nodename|nodeport|isactive --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (0 rows) @@ -324,7 +324,7 @@ starting permutation: s1-add-node-1 s1-begin s1-activate-node-1 s2-activate-node (1 row) step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -362,7 +362,7 @@ nodename |nodeport|isactive localhost| 57637|t (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -375,7 +375,7 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-disable-node-1 (1 row) step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -413,7 +413,7 @@ nodename |nodeport|isactive localhost| 57637|f (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -464,7 +464,7 @@ nodename |nodeport|isactive localhost| 57637|t (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -515,7 +515,7 @@ nodename |nodeport|isactive localhost| 57637|f (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -528,7 +528,7 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-activate-node- (1 row) step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -566,7 +566,7 @@ nodename |nodeport|isactive localhost| 57637|t (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -579,7 +579,7 @@ starting permutation: s1-add-node-1 s1-begin s1-activate-node-1 s2-disable-node- (1 row) step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -617,7 +617,7 @@ nodename |nodeport|isactive localhost| 57637|f (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -668,7 +668,7 @@ nodename |nodeport|isactive localhost| 57637|t (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -719,7 +719,7 @@ nodename |nodeport|isactive localhost| 57637|f (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -770,7 +770,7 @@ nodename |nodeport|isactive localhost| 57637|f (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -783,7 +783,7 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-disable-node-1 (1 row) step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -821,7 +821,7 @@ nodename |nodeport|isactive localhost| 57637|f (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/isolation_cluster_management.out b/src/test/regress/expected/isolation_cluster_management.out index 63488f743..dff813d3d 100644 --- a/src/test/regress/expected/isolation_cluster_management.out +++ b/src/test/regress/expected/isolation_cluster_management.out @@ -2,8 +2,8 @@ Parsed test spec with 1 sessions starting permutation: s1a step s1a: - SELECT 1 FROM master_add_node('localhost', 57637); - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- diff --git a/src/test/regress/expected/isolation_create_citus_local_table.out b/src/test/regress/expected/isolation_create_citus_local_table.out index 375bc6ffd..93d540ac4 100644 --- a/src/test/regress/expected/isolation_create_citus_local_table.out +++ b/src/test/regress/expected/isolation_create_citus_local_table.out @@ -14,7 +14,7 @@ step s1-commit: COMMIT; step s2-create-citus-local-table-1: <... completed> ERROR: relation "citus_local_table_1_xxxxxxx" is a shard relation step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -34,7 +34,7 @@ step s1-commit: COMMIT; step s2-create-citus-local-table-3: <... completed> ERROR: relation "citus_local_table_3_xxxxxxx" is a shard relation step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -58,7 +58,7 @@ citus_add_local_table_to_metadata (1 row) step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -81,7 +81,7 @@ a (0 rows) step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -100,7 +100,7 @@ step s2-update: UPDATE citus_local_table_1 SET a=1 WHERE a=2; step s1-commit: COMMIT; step s2-update: <... completed> step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -119,7 +119,7 @@ step s2-truncate: TRUNCATE citus_local_table_1; step s1-commit: COMMIT; step s2-truncate: <... completed> step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -144,7 +144,7 @@ step s2-fkey-to-another: ALTER TABLE citus_local_table_1 ADD CONSTRAINT fkey_c_t step s1-commit: COMMIT; step s2-fkey-to-another: <... completed> step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -159,12 +159,12 @@ citus_add_local_table_to_metadata (1 row) -step s2-remove-coordinator: SELECT master_remove_node('localhost', 57636); +step s2-remove-coordinator: SELECT citus_remove_node('localhost', 57636); step s1-commit: COMMIT; step s2-remove-coordinator: <... completed> ERROR: cannot remove the primary node of a node group which has shard placements step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -179,7 +179,7 @@ step s1-commit: COMMIT; step s2-create-citus-local-table-1: <... completed> ERROR: cannot add local table to metadata, relation does not exist step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -198,7 +198,7 @@ citus_add_local_table_to_metadata (1 row) step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -221,7 +221,7 @@ citus_add_local_table_to_metadata (1 row) step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -230,8 +230,8 @@ master_remove_node starting permutation: s1-begin s2-begin s1-remove-coordinator s2-create-citus-local-table-1 s1-commit s2-commit step s1-begin: BEGIN; step s2-begin: BEGIN; -step s1-remove-coordinator: SELECT master_remove_node('localhost', 57636); -master_remove_node +step s1-remove-coordinator: SELECT citus_remove_node('localhost', 57636); +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -241,21 +241,21 @@ step s1-commit: COMMIT; step s2-create-citus-local-table-1: <... completed> ERROR: could not find the coordinator node in metadata as it is not added as a worker step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (0 rows) starting permutation: s1-remove-coordinator s1-begin s2-begin s1-add-coordinator s2-create-citus-local-table-1 s1-commit s2-commit -step s1-remove-coordinator: SELECT master_remove_node('localhost', 57636); -master_remove_node +step s1-remove-coordinator: SELECT citus_remove_node('localhost', 57636); +citus_remove_node --------------------------------------------------------------------- (1 row) step s1-begin: BEGIN; step s2-begin: BEGIN; -step s1-add-coordinator: SELECT 1 FROM master_add_node('localhost', 57636, 0); +step s1-add-coordinator: SELECT 1 FROM citus_add_node('localhost', 57636, 0); ?column? --------------------------------------------------------------------- 1 @@ -270,7 +270,7 @@ citus_add_local_table_to_metadata (1 row) step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/isolation_create_restore_point.out b/src/test/regress/expected/isolation_create_restore_point.out index 28e8e212b..afcfe6213 100644 --- a/src/test/regress/expected/isolation_create_restore_point.out +++ b/src/test/regress/expected/isolation_create_restore_point.out @@ -232,9 +232,9 @@ step s1-begin: SET citus.multi_shard_commit_protocol TO '2pc'; step s1-remove-node: - SELECT master_remove_node('localhost', 9999); + SELECT citus_remove_node('localhost', 9999); -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out b/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out index 8ea0325e9..72dae5b1b 100644 --- a/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out +++ b/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out @@ -10,7 +10,7 @@ step s1-begin: BEGIN; step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -57,7 +57,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -74,7 +74,7 @@ step s1-begin: BEGIN; step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -121,7 +121,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -148,7 +148,7 @@ create_distributed_table (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -184,7 +184,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -198,7 +198,7 @@ localhost| 57637 (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -209,9 +209,9 @@ step s1-begin: BEGIN; step s1-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -256,7 +256,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -269,7 +269,7 @@ localhost| 57637 (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -280,9 +280,9 @@ step s1-begin: BEGIN; step s1-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -327,7 +327,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -341,7 +341,7 @@ localhost| 57637 (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -363,7 +363,7 @@ create_distributed_table (1 row) step s1-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); step s2-commit: COMMIT; @@ -395,7 +395,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -409,7 +409,7 @@ localhost| 57637 (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -420,9 +420,9 @@ step s1-begin: BEGIN; step s1-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -442,7 +442,7 @@ step s2-select: SELECT * FROM dist_table; ERROR: relation "dist_table" does not exist -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -455,7 +455,7 @@ localhost| 57637 (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -477,7 +477,7 @@ create_distributed_table (1 row) step s1-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); step s2-commit: COMMIT; @@ -491,7 +491,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -505,7 +505,7 @@ localhost| 57637 (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -516,9 +516,9 @@ step s1-begin: BEGIN; step s1-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -550,7 +550,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -563,7 +563,7 @@ localhost| 57637 (1 row) step s1-add-node-2: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -590,7 +590,7 @@ create_distributed_table (1 row) step s1-remove-node-2: - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); step s2-commit: COMMIT; @@ -604,7 +604,7 @@ x|y --------------------------------------------------------------------- (0 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- diff --git a/src/test/regress/expected/isolation_ensure_dependency_activate_node.out b/src/test/regress/expected/isolation_ensure_dependency_activate_node.out index 7c5b1dc83..7f12f61ab 100644 --- a/src/test/regress/expected/isolation_ensure_dependency_activate_node.out +++ b/src/test/regress/expected/isolation_ensure_dependency_activate_node.out @@ -7,7 +7,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-pub (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -19,7 +19,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -66,7 +66,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -75,7 +75,7 @@ step s1-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -153,7 +153,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -167,7 +167,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s1-add-work (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -179,7 +179,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -226,7 +226,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -238,7 +238,7 @@ step s2-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -319,7 +319,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -333,7 +333,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s2-public-s (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -345,7 +345,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -392,7 +392,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -418,7 +418,7 @@ create_distributed_table (1 row) step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -485,7 +485,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -499,7 +499,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-cre (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -511,7 +511,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -558,7 +558,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -567,7 +567,7 @@ step s1-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -647,7 +647,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -661,7 +661,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s1-add-work (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -673,7 +673,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -720,7 +720,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -732,7 +732,7 @@ step s2-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -815,7 +815,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -829,7 +829,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s2-create-s (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -841,7 +841,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -888,7 +888,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -915,7 +915,7 @@ create_distributed_table (1 row) step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -983,7 +983,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -997,7 +997,7 @@ starting permutation: s1-print-distributed-objects s2-create-schema s1-begin s2- (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -1009,7 +1009,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1056,7 +1056,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1075,7 +1075,7 @@ step s3-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1172,7 +1172,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1186,7 +1186,7 @@ starting permutation: s1-print-distributed-objects s1-add-worker s2-create-schem (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -1198,7 +1198,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1245,13 +1245,13 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1354,7 +1354,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1368,7 +1368,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s3-begin s1 (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -1380,7 +1380,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1427,7 +1427,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1442,7 +1442,7 @@ step s3-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1545,7 +1545,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1559,7 +1559,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-pub (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -1571,7 +1571,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1618,7 +1618,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1627,7 +1627,7 @@ step s1-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1698,7 +1698,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1712,7 +1712,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-public-schema s2- (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -1724,7 +1724,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1771,7 +1771,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1786,7 +1786,7 @@ step s2-create-type: CREATE TYPE tt1 AS (a int, b int); step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1850,7 +1850,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -1864,7 +1864,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s2-create-s (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -1876,7 +1876,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -1923,7 +1923,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1953,7 +1953,7 @@ create_distributed_table (1 row) step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); step s2-commit: COMMIT; @@ -2022,7 +2022,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -2036,7 +2036,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-pub (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -2048,7 +2048,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -2095,7 +2095,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -2104,7 +2104,7 @@ step s1-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -2195,7 +2195,7 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -2209,7 +2209,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-public-schema s2- (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -2221,7 +2221,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -2268,7 +2268,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -2303,7 +2303,7 @@ wait_until_metadata_sync (1 row) step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -2375,7 +2375,7 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -2389,7 +2389,7 @@ starting permutation: s1-print-distributed-objects s2-begin s2-create-schema s2- (1 row) step s1-print-distributed-objects: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; -- print if the schema has been created @@ -2401,7 +2401,7 @@ step s1-print-distributed-objects: -- print if the function has been created SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -2448,7 +2448,7 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -2484,7 +2484,7 @@ step s1-begin: BEGIN; step s1-add-worker: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -2557,7 +2557,7 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- diff --git a/src/test/regress/expected/isolation_extension_commands.out b/src/test/regress/expected/isolation_extension_commands.out index d944a87cd..c512b5078 100644 --- a/src/test/regress/expected/isolation_extension_commands.out +++ b/src/test/regress/expected/isolation_extension_commands.out @@ -5,7 +5,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -54,7 +54,7 @@ run_command_on_workers (localhost,57638,t,public) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -66,7 +66,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -115,7 +115,7 @@ run_command_on_workers (localhost,57638,t,public) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -124,7 +124,7 @@ master_remove_node starting permutation: s1-add-node-1 s1-begin s1-remove-node-1 s2-drop-extension s1-commit s1-print step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -135,7 +135,7 @@ step s1-begin: BEGIN; step s1-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -180,7 +180,7 @@ run_command_on_workers (localhost,57638,t,"") (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -191,7 +191,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -240,7 +240,7 @@ run_command_on_workers (localhost,57638,t,schema1) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -252,7 +252,7 @@ step s1-begin: BEGIN; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -300,7 +300,7 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -309,7 +309,7 @@ master_remove_node starting permutation: s1-add-node-1 s1-create-extension-with-schema2 s1-begin s1-remove-node-1 s2-alter-extension-set-schema3 s1-commit s1-print step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -323,7 +323,7 @@ step s1-begin: BEGIN; step s1-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -369,7 +369,7 @@ run_command_on_workers (localhost,57638,t,schema3) (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -377,7 +377,7 @@ master_remove_node starting permutation: s1-add-node-1 s2-drop-extension s1-begin s1-remove-node-1 s2-create-extension-with-schema1 s1-commit s1-print step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -391,7 +391,7 @@ step s1-begin: BEGIN; step s1-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -437,7 +437,7 @@ run_command_on_workers (localhost,57638,t,schema1) (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -445,7 +445,7 @@ master_remove_node starting permutation: s2-add-node-1 s2-drop-extension s2-remove-node-1 s2-begin s2-create-extension-version-11 s1-add-node-1 s2-commit s1-print step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -456,7 +456,7 @@ step s2-drop-extension: drop extension seg; step s2-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -470,7 +470,7 @@ step s2-create-extension-version-11: CREATE extension seg VERSION "1.1"; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -515,7 +515,7 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -527,7 +527,7 @@ step s2-drop-extension: drop extension seg; step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -538,7 +538,7 @@ step s2-create-extension-version-11: CREATE extension seg VERSION "1.1"; step s2-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -552,7 +552,7 @@ step s2-alter-extension-update-to-version-12: ALTER extension seg update to "1.2"; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); step s2-commit: COMMIT; @@ -598,7 +598,7 @@ run_command_on_workers (localhost,57638,t,public) (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -607,7 +607,7 @@ master_remove_node starting permutation: s2-add-node-1 s2-begin s2-drop-extension s1-remove-node-1 s2-commit s1-print step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -621,7 +621,7 @@ step s2-drop-extension: drop extension seg; step s1-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); step s2-commit: COMMIT; @@ -663,7 +663,7 @@ run_command_on_workers (localhost,57638,t,"") (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -677,7 +677,7 @@ step s2-create-extension-with-schema1: CREATE extension seg with schema schema1; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -722,7 +722,7 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -734,7 +734,7 @@ step s2-drop-extension: drop extension seg; step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -751,7 +751,7 @@ step s2-alter-extension-version-13: ALTER extension seg update to "1.3"; step s1-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); step s2-commit: COMMIT; @@ -794,7 +794,7 @@ run_command_on_workers (localhost,57638,t,schema2) (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -805,7 +805,7 @@ step s2-drop-extension: drop extension seg; step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -819,7 +819,7 @@ step s2-create-extension-version-11: CREATE extension seg VERSION "1.1"; step s1-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -861,7 +861,7 @@ run_command_on_workers (localhost,57638,t,"") (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -872,7 +872,7 @@ step s2-drop-extension: drop extension seg; step s2-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -883,7 +883,7 @@ step s2-create-extension-version-11: CREATE extension seg VERSION "1.1"; step s2-remove-node-1: - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); ?column? --------------------------------------------------------------------- @@ -897,7 +897,7 @@ step s2-drop-extension: drop extension seg; step s1-add-node-1: - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); step s2-commit: COMMIT; @@ -942,7 +942,7 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- diff --git a/src/test/regress/expected/isolation_master_update_node.out b/src/test/regress/expected/isolation_master_update_node.out index 46e0d23d5..66d1deca4 100644 --- a/src/test/regress/expected/isolation_master_update_node.out +++ b/src/test/regress/expected/isolation_master_update_node.out @@ -24,7 +24,7 @@ master_update_node (1 row) step s2-abort: ABORT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -60,7 +60,7 @@ server closed the connection unexpectedly This probably means the server terminated abnormally before or while processing the request. -master_remove_node +citus_remove_node --------------------------------------------------------------------- diff --git a/src/test/regress/expected/isolation_master_update_node_0.out b/src/test/regress/expected/isolation_master_update_node_0.out index 8dbc71029..2a4db1fa1 100644 --- a/src/test/regress/expected/isolation_master_update_node_0.out +++ b/src/test/regress/expected/isolation_master_update_node_0.out @@ -20,7 +20,7 @@ master_update_node step s2-abort: ABORT; -master_remove_node +citus_remove_node @@ -49,7 +49,7 @@ WARNING: this step had a leftover error message FATAL: terminating connection due to administrator command SSL connection has been closed unexpectedly -master_remove_node +citus_remove_node diff --git a/src/test/regress/expected/isolation_master_update_node_1.out b/src/test/regress/expected/isolation_master_update_node_1.out index a3864a2d5..8d1cd4c8a 100644 --- a/src/test/regress/expected/isolation_master_update_node_1.out +++ b/src/test/regress/expected/isolation_master_update_node_1.out @@ -24,7 +24,7 @@ master_update_node (1 row) step s2-abort: ABORT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -59,7 +59,7 @@ FATAL: terminating connection due to administrator command FATAL: terminating connection due to administrator command SSL connection has been closed unexpectedly -master_remove_node +citus_remove_node --------------------------------------------------------------------- diff --git a/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out b/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out index df9b77179..254dba60e 100644 --- a/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out +++ b/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out @@ -53,7 +53,7 @@ step s1-end: step s2-end: END; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -118,7 +118,7 @@ step s2-end: step s1-end: END; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -160,7 +160,7 @@ step s1-end: step s2-end: END; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/isolation_shouldhaveshards.out b/src/test/regress/expected/isolation_shouldhaveshards.out index 9b5242d94..a500cdaf6 100644 --- a/src/test/regress/expected/isolation_shouldhaveshards.out +++ b/src/test/regress/expected/isolation_shouldhaveshards.out @@ -7,7 +7,7 @@ starting permutation: s1-add-second-node s1-begin s2-begin s2-create-distributed (1 row) step s1-add-second-node: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -57,7 +57,7 @@ nodeport|count 57638| 2 (2 rows) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -71,7 +71,7 @@ starting permutation: s1-add-second-node s1-begin s2-begin s1-noshards s2-create (1 row) step s1-add-second-node: - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); ?column? --------------------------------------------------------------------- @@ -120,7 +120,7 @@ nodeport|count 57638| 4 (1 row) -master_remove_node +citus_remove_node --------------------------------------------------------------------- @@ -162,7 +162,7 @@ master_update_node step s2-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -199,7 +199,7 @@ ERROR: node at "localhost:xxxxx" does not exist step s1-commit: COMMIT; -master_remove_node +citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/local_shard_copy.out b/src/test/regress/expected/local_shard_copy.out index 733833c68..f749bcccf 100644 --- a/src/test/regress/expected/local_shard_copy.out +++ b/src/test/regress/expected/local_shard_copy.out @@ -3,7 +3,7 @@ SET search_path TO local_shard_copy; SET client_min_messages TO DEBUG; SET citus.next_shard_id TO 1570000; SET citus.replicate_reference_tables_on_activate TO off; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid := 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid := 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/local_shard_utility_command_execution.out b/src/test/regress/expected/local_shard_utility_command_execution.out index f120e9e56..42e326b87 100644 --- a/src/test/regress/expected/local_shard_utility_command_execution.out +++ b/src/test/regress/expected/local_shard_utility_command_execution.out @@ -13,7 +13,7 @@ CREATE SCHEMA local_commands_test_schema; SET search_path TO local_commands_test_schema; -- let coordinator have distributed table shards/placements set client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/mixed_relkind_tests.out b/src/test/regress/expected/mixed_relkind_tests.out index c201f37fb..546332db6 100644 --- a/src/test/regress/expected/mixed_relkind_tests.out +++ b/src/test/regress/expected/mixed_relkind_tests.out @@ -6,7 +6,7 @@ CREATE SCHEMA mixed_relkind_tests; SET search_path TO mixed_relkind_tests; -- ensure that coordinator is added to pg_dist_node SET client_min_messages TO ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/multi_cluster_management.out b/src/test/regress/expected/multi_cluster_management.out index 56cd62831..2c187e5d3 100644 --- a/src/test/regress/expected/multi_cluster_management.out +++ b/src/test/regress/expected/multi_cluster_management.out @@ -4,7 +4,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1; SET citus.enable_object_propagation TO off; -- prevent object propagation on add node during setup -- Tests functions related to cluster membership -- add the nodes to the cluster -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -12,7 +12,7 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -29,8 +29,8 @@ SELECT master_get_active_worker_nodes(); (2 rows) -- try to add a node that is already in the cluster -SELECT * FROM master_add_node('localhost', :worker_1_port); - master_add_node +SELECT * FROM citus_add_node('localhost', :worker_1_port); + citus_add_node --------------------------------------------------------------------- 1 (1 row) @@ -44,8 +44,8 @@ SELECT master_get_active_worker_nodes(); (2 rows) -- try to remove a node (with no placements) -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -58,7 +58,7 @@ SELECT master_get_active_worker_nodes(); (1 row) -- try to disable a node with no placements see that node is removed -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -117,7 +117,7 @@ SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHER (8 rows) -- try to remove a node with active placements and see that node removal is failed -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); ERROR: cannot remove the primary node of a node group which has shard placements HINT: To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables SELECT master_get_active_worker_nodes(); @@ -184,10 +184,10 @@ NOTICE: not propagating CREATE ROLE/USER commands to worker nodes HINT: Connect to worker nodes directly to manually create all necessary users and roles. GRANT EXECUTE ON FUNCTION master_activate_node(text,int) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_add_inactive_node(text,int,int,noderole,name) TO node_metadata_user; -GRANT EXECUTE ON FUNCTION master_add_node(text,int,int,noderole,name) TO node_metadata_user; +GRANT EXECUTE ON FUNCTION citus_add_node(text,int,int,noderole,name) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_add_secondary_node(text,int,text,int,name) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_disable_node(text,int) TO node_metadata_user; -GRANT EXECUTE ON FUNCTION master_remove_node(text,int) TO node_metadata_user; +GRANT EXECUTE ON FUNCTION citus_remove_node(text,int) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_update_node(int,text,int,bool,int) TO node_metadata_user; -- Removing public schema from pg_dist_object because it breaks the next tests DELETE FROM citus.pg_dist_object WHERE objid = 'public'::regnamespace::oid; @@ -199,10 +199,10 @@ SELECT 1 FROM master_activate_node('localhost', :worker_2_port + 1); ERROR: permission denied for function master_activate_node SELECT 1 FROM master_disable_node('localhost', :worker_2_port + 1); ERROR: permission denied for function master_disable_node -SELECT 1 FROM master_remove_node('localhost', :worker_2_port + 1); -ERROR: permission denied for function master_remove_node -SELECT 1 FROM master_add_node('localhost', :worker_2_port + 1); -ERROR: permission denied for function master_add_node +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port + 1); +ERROR: permission denied for function citus_remove_node +SELECT 1 FROM citus_add_node('localhost', :worker_2_port + 1); +ERROR: permission denied for function citus_add_node SELECT 1 FROM master_add_secondary_node('localhost', :worker_2_port + 2, 'localhost', :worker_2_port); ERROR: permission denied for function master_add_secondary_node SELECT master_update_node(nodeid, 'localhost', :worker_2_port + 3) FROM pg_dist_node WHERE nodeport = :worker_2_port; @@ -231,13 +231,13 @@ SELECT 1 FROM master_disable_node('localhost', :worker_2_port + 1); 1 (1 row) -SELECT 1 FROM master_remove_node('localhost', :worker_2_port + 1); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port + 1); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port + 1); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port + 1); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -287,7 +287,7 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop (1 row) -- try to remove a node with active placements and see that node removal is failed -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); ERROR: cannot remove the primary node of a node group which has shard placements HINT: To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables -- mark all placements in the candidate node as inactive @@ -307,7 +307,7 @@ SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHER (8 rows) -- try to remove a node with only inactive placements and see that removal still fails -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); ERROR: cannot remove the primary node of a node group which has shard placements HINT: To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables SELECT master_get_active_worker_nodes(); @@ -380,8 +380,8 @@ SELECT logicalrelid, shardid, shardstate, nodename, nodeport FROM pg_dist_shard_ SELECT * INTO removed_placements FROM pg_dist_placement WHERE shardstate = 4; -- try to remove a node with only to be deleted placements and see that removal succeeds -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -392,10 +392,10 @@ SELECT master_get_active_worker_nodes(); (localhost,57637) (1 row) -SELECT master_add_node('localhost', :worker_2_port, groupId := :worker_2_group); +SELECT citus_add_node('localhost', :worker_2_port, groupId := :worker_2_group); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created - master_add_node + citus_add_node --------------------------------------------------------------------- 7 (1 row) @@ -403,7 +403,7 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop -- put removed placements back for testing purposes(in practice we wouldn't have only old placements for a shard) INSERT INTO pg_dist_placement SELECT * FROM removed_placements; -- clean-up -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -422,23 +422,23 @@ DELETE FROM pg_dist_node WHERE nodeport=:worker_2_port; SELECT * FROM cluster_management_test; ERROR: there is a shard placement in node group 3 but there are no nodes in that group -- clean-up -SELECT master_add_node('localhost', :worker_2_port) AS new_node \gset +SELECT citus_add_node('localhost', :worker_2_port) AS new_node \gset WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created SELECT groupid AS new_group FROM pg_dist_node WHERE nodeid = :new_node \gset UPDATE pg_dist_placement SET groupid = :new_group WHERE groupid = :worker_2_group; -- test that you are allowed to remove secondary nodes even if there are placements -SELECT 1 FROM master_add_node('localhost', 9990, groupid => :new_group, noderole => 'secondary'); +SELECT 1 FROM citus_add_node('localhost', 9990, groupid => :new_group, noderole => 'secondary'); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); ERROR: cannot remove the primary node of a node group which has shard placements HINT: To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables -SELECT master_remove_node('localhost', 9990); - master_remove_node +SELECT citus_remove_node('localhost', 9990); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -446,8 +446,8 @@ SELECT master_remove_node('localhost', 9990); -- clean-up DROP TABLE cluster_management_test; -- check that adding/removing nodes are propagated to nodes with metadata -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -458,7 +458,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_1_port); (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -474,8 +474,8 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep (1 row) \c - - - :master_port -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -496,7 +496,7 @@ NOTICE: dropping metadata on the node (localhost,57637) (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -514,9 +514,9 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep SET citus.enable_object_propagation TO off; -- prevent object propagation on add node during setup -- check that removing two nodes in the same transaction works SELECT - master_remove_node('localhost', :worker_1_port), - master_remove_node('localhost', :worker_2_port); - master_remove_node | master_remove_node + citus_remove_node('localhost', :worker_1_port), + citus_remove_node('localhost', :worker_2_port); + citus_remove_node | citus_remove_node --------------------------------------------------------------------- | (1 row) @@ -529,13 +529,13 @@ SELECT count(1) FROM pg_dist_node; -- check that adding two nodes in the same transaction works SELECT - master_add_node('localhost', :worker_1_port), - master_add_node('localhost', :worker_2_port); + citus_add_node('localhost', :worker_1_port), + citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created - master_add_node | master_add_node + citus_add_node | citus_add_node --------------------------------------------------------------------- 12 | 13 (1 row) @@ -549,13 +549,13 @@ SELECT * FROM pg_dist_node ORDER BY nodeid; -- check that mixed add/remove node commands work fine inside transaction BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -563,8 +563,8 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop 1 (1 row) -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -582,7 +582,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_1_port); (1 row) BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -590,13 +590,13 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop 1 (1 row) -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -620,14 +620,14 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep \c - - - :master_port SET citus.enable_object_propagation TO off; -- prevent object propagation on add node during setup -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; - master_remove_node +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; + citus_remove_node --------------------------------------------------------------------- (2 rows) -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -635,7 +635,7 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -645,14 +645,14 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop -- check that a distributed table can be created after adding a node in a transaction SET citus.shard_count TO 4; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created ?column? @@ -713,21 +713,21 @@ NOTICE: dropping metadata on the node (localhost,57638) (1 row) -- check that you can't add a primary to a non-default cluster -SELECT master_add_node('localhost', 9999, nodecluster => 'olap'); +SELECT citus_add_node('localhost', 9999, nodecluster => 'olap'); ERROR: primaries must be added to the default cluster -- check that you can't add more than one primary to a group SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport = :worker_1_port \gset -SELECT master_add_node('localhost', 9999, groupid => :worker_1_group, noderole => 'primary'); +SELECT citus_add_node('localhost', 9999, groupid => :worker_1_group, noderole => 'primary'); ERROR: group 14 already has a primary node -- check that you can add secondaries and unavailable nodes to a group SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset -SELECT 1 FROM master_add_node('localhost', 9998, groupid => :worker_1_group, noderole => 'secondary'); +SELECT 1 FROM citus_add_node('localhost', 9998, groupid => :worker_1_group, noderole => 'secondary'); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT 1 FROM master_add_node('localhost', 9997, groupid => :worker_1_group, noderole => 'unavailable'); +SELECT 1 FROM citus_add_node('localhost', 9997, groupid => :worker_1_group, noderole => 'unavailable'); ?column? --------------------------------------------------------------------- 1 @@ -759,8 +759,8 @@ SELECT master_disable_node('localhost', 9999); (1 row) -SELECT master_remove_node('localhost', 9999); - master_remove_node +SELECT citus_remove_node('localhost', 9999); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -785,21 +785,21 @@ ERROR: new row for relation "pg_dist_node" violates check constraint "primaries DETAIL: Failing row contains (17, 14, localhost, 57637, default, f, t, primary, olap, f, t). -- check that you /can/ add a secondary node to a non-default cluster SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset -SELECT master_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'olap'); - master_add_node +SELECT citus_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'olap'); + citus_add_node --------------------------------------------------------------------- 26 (1 row) -- check that super-long cluster names are truncated -SELECT master_add_node('localhost', 8887, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> +SELECT citus_add_node('localhost', 8887, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.' 'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.' 'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.' 'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.' 'overflow' ); - master_add_node + citus_add_node --------------------------------------------------------------------- 27 (1 row) diff --git a/src/test/regress/expected/multi_drop_extension.out b/src/test/regress/expected/multi_drop_extension.out index 21d20ab47..e050a77f3 100644 --- a/src/test/regress/expected/multi_drop_extension.out +++ b/src/test/regress/expected/multi_drop_extension.out @@ -23,7 +23,7 @@ BEGIN; SET search_path TO public; CREATE EXTENSION citus; SET citus.replicate_reference_tables_on_activate TO OFF; - SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); + SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 @@ -82,13 +82,13 @@ CREATE OR REPLACE FUNCTION pg_catalog.master_create_worker_shards(table_name tex AS 'citus', $$master_create_worker_shards$$ LANGUAGE C STRICT; -- re-add the nodes to the cluster -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 57eaa002a..1285b5129 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -214,7 +214,7 @@ SELECT * FROM multi_extension.print_extension_changes(); | function mark_tables_colocated(regclass,regclass[]) void | function master_activate_node(text,integer) integer | function master_add_inactive_node(text,integer,integer,noderole,name) integer - | function master_add_node(text,integer,integer,noderole,name) integer + | function citus_add_node(text,integer,integer,noderole,name) integer | function master_add_secondary_node(text,integer,text,integer,name) integer | function master_append_table_to_shard(bigint,text,text,integer) real | function master_apply_delete_command(text) integer @@ -241,7 +241,7 @@ SELECT * FROM multi_extension.print_extension_changes(); | function master_modify_multiple_shards(text) integer | function master_move_shard_placement(bigint,text,integer,text,integer,citus.shard_transfer_mode) void | function master_remove_distributed_table_metadata_from_workers(regclass,text,text) void - | function master_remove_node(text,integer) void + | function citus_remove_node(text,integer) void | function master_remove_partition_metadata(regclass,text,text) void | function master_run_on_worker(text[],integer[],text[],boolean) SETOF record | function master_set_node_property(text,integer,text,boolean) void @@ -492,8 +492,8 @@ SELECT * FROM multi_extension.print_extension_changes(); -- Test downgrade to 9.4-1 from 9.5-1 ALTER EXTENSION citus UPDATE TO '9.5-1'; BEGIN; - SELECT master_add_node('localhost', :master_port, groupId=>0); - master_add_node + SELECT citus_add_node('localhost', :master_port, groupId=>0); + citus_add_node --------------------------------------------------------------------- 1 (1 row) @@ -1053,7 +1053,7 @@ HINT: You can manually create a database and its extensions on workers. \c another CREATE EXTENSION citus; SET citus.enable_object_propagation TO off; -- prevent distributed transactions during add node -SELECT FROM master_add_node('localhost', :worker_1_port); +SELECT FROM citus_add_node('localhost', :worker_1_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker DETAIL: distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created -- diff --git a/src/test/regress/expected/multi_follower_dml.out b/src/test/regress/expected/multi_follower_dml.out index 0d1d6fd68..830ac24f4 100644 --- a/src/test/regress/expected/multi_follower_dml.out +++ b/src/test/regress/expected/multi_follower_dml.out @@ -6,7 +6,7 @@ SELECT create_distributed_table('the_table', 'a'); (1 row) -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); ?column? --------------------------------------------------------------------- 1 @@ -273,8 +273,8 @@ ERROR: there is a shard placement in node group 0 but there are no nodes in tha DROP TABLE the_table; DROP TABLE reference_table; DROP TABLE citus_local_table; -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/multi_follower_select_statements.out b/src/test/regress/expected/multi_follower_select_statements.out index 13e09a6ca..bc71d8576 100644 --- a/src/test/regress/expected/multi_follower_select_statements.out +++ b/src/test/regress/expected/multi_follower_select_statements.out @@ -1,12 +1,12 @@ \c - - - :master_port -- do some setup -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -78,7 +78,7 @@ SELECT * FROM the_table; ERROR: node group does not have a secondary node -- add the secondary nodes and try again, the SELECT statement should work this time \c -reuse-previous=off regression - - :master_port -SELECT 1 FROM master_add_node('localhost', :follower_worker_1_port, +SELECT 1 FROM citus_add_node('localhost', :follower_worker_1_port, groupid => (SELECT groupid FROM pg_dist_node WHERE nodeport = :worker_1_port), noderole => 'secondary'); ?column? @@ -86,7 +86,7 @@ SELECT 1 FROM master_add_node('localhost', :follower_worker_1_port, 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :follower_worker_2_port, +SELECT 1 FROM citus_add_node('localhost', :follower_worker_2_port, groupid => (SELECT groupid FROM pg_dist_node WHERE nodeport = :worker_2_port), noderole => 'secondary'); ?column? diff --git a/src/test/regress/expected/multi_metadata_sync.out b/src/test/regress/expected/multi_metadata_sync.out index 97d5f1c9d..6f5e9fdaa 100644 --- a/src/test/regress/expected/multi_metadata_sync.out +++ b/src/test/regress/expected/multi_metadata_sync.out @@ -204,8 +204,8 @@ SELECT count(*) FROM pg_dist_node WHERE hasmetadata=true; -- Ensure it works when run on a secondary node SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport = :worker_1_port \gset -SELECT master_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary'); - master_add_node +SELECT citus_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary'); + citus_add_node --------------------------------------------------------------------- 4 (1 row) @@ -1187,8 +1187,8 @@ CREATE TABLE pg_dist_partition_temp AS SELECT * FROM pg_dist_partition; DELETE FROM pg_dist_placement; DELETE FROM pg_dist_partition; SELECT groupid AS old_worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1216,8 +1216,8 @@ SELECT create_distributed_table('mx_table', 'a'); (1 row) \c - postgres - :master_port -SELECT master_add_node('localhost', :worker_2_port); - master_add_node +SELECT citus_add_node('localhost', :worker_2_port); + citus_add_node --------------------------------------------------------------------- 6 (1 row) @@ -1398,7 +1398,7 @@ SELECT * FROM pg_dist_shard_placement WHERE shardid=:ref_table_shardid; --------------------------------------------------------------------- (0 rows) --- Check that master_add_node propagates the metadata about new placements of a reference table +-- Check that citus_add_node propagates the metadata about new placements of a reference table \c - - - :master_port SELECT groupid AS old_worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset @@ -1406,8 +1406,8 @@ CREATE TABLE tmp_placement AS SELECT * FROM pg_dist_placement WHERE groupid = :old_worker_2_group; DELETE FROM pg_dist_placement WHERE groupid = :old_worker_2_group; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1437,9 +1437,9 @@ WHERE logicalrelid='mx_ref'::regclass; (1 row) \c - - - :master_port -SELECT master_add_node('localhost', :worker_2_port); +SELECT citus_add_node('localhost', :worker_2_port); NOTICE: Replicating reference table "mx_ref" to the node localhost:xxxxx - master_add_node + citus_add_node --------------------------------------------------------------------- 7 (1 row) @@ -1571,7 +1571,7 @@ HINT: If the node is up, wait until metadata gets synced to it and try again. ALTER TABLE dist_table_1 ADD COLUMN b int; ERROR: localhost:xxxxx is a metadata node, but is out of sync HINT: If the node is up, wait until metadata gets synced to it and try again. -SELECT master_add_node('localhost', :master_port, groupid => 0); +SELECT citus_add_node('localhost', :master_port, groupid => 0); ERROR: localhost:xxxxx is a metadata node, but is out of sync HINT: If the node is up, wait until metadata gets synced to it and try again. SELECT master_disable_node('localhost', :worker_1_port); @@ -1582,10 +1582,10 @@ SELECT master_disable_node('localhost', :worker_2_port); ERROR: Disabling localhost:xxxxx failed DETAIL: localhost:xxxxx is a metadata node, but is out of sync HINT: If you are using MX, try stop_metadata_sync_to_node(hostname, port) for nodes that are down before disabling them. -SELECT master_remove_node('localhost', :worker_1_port); +SELECT citus_remove_node('localhost', :worker_1_port); ERROR: localhost:xxxxx is a metadata node, but is out of sync HINT: If the node is up, wait until metadata gets synced to it and try again. -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); ERROR: localhost:xxxxx is a metadata node, but is out of sync HINT: If the node is up, wait until metadata gets synced to it and try again. -- master_update_node should succeed @@ -1611,8 +1611,8 @@ SELECT pg_reload_conf(); (1 row) UPDATE pg_dist_node SET metadatasynced=true WHERE nodeport=:worker_1_port; -SELECT master_add_node('localhost', :worker_2_port); - master_add_node +SELECT citus_add_node('localhost', :worker_2_port); + citus_add_node --------------------------------------------------------------------- 7 (1 row) diff --git a/src/test/regress/expected/multi_mx_add_coordinator.out b/src/test/regress/expected/multi_mx_add_coordinator.out index c3111de74..029599d32 100644 --- a/src/test/regress/expected/multi_mx_add_coordinator.out +++ b/src/test/regress/expected/multi_mx_add_coordinator.out @@ -16,7 +16,7 @@ SELECT run_command_on_workers('CREATE USER reprefuser WITH LOGIN'); SET citus.enable_alter_role_propagation TO ON; -- alter role for other than the extension owner works in enterprise, output differs accordingly ALTER ROLE reprefuser WITH CREATEDB; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 @@ -302,8 +302,8 @@ alter table distributed_table ALTER COLUMN value_1 TYPE bigint; alter table distributed_table ALTER COLUMN value_1 TYPE int; SET client_min_messages TO error; DROP TABLE distributed_table, referece_table, local_fkey_table; -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/multi_mx_function_table_reference.out b/src/test/regress/expected/multi_mx_function_table_reference.out index c0516c772..c118f5cb5 100644 --- a/src/test/regress/expected/multi_mx_function_table_reference.out +++ b/src/test/regress/expected/multi_mx_function_table_reference.out @@ -25,8 +25,8 @@ SELECT start_metadata_sync_to_node('localhost', :worker_2_port); -- SET client_min_messages TO log; -- remove worker 2, so we can add it after we have created some functions that caused -- problems -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -60,7 +60,7 @@ SELECT create_distributed_function('zoop(int)', '$1'); (1 row) -- now add the worker back, this triggers function distribution which should not fail. -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -167,7 +167,7 @@ drop cascades to function my_group_id() -- make sure the worker is added at the end irregardless of anything failing to not make -- subsequent tests fail as well. All artifacts created during this test should have been -- dropped by the drop cascade above. -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/multi_mx_node_metadata.out b/src/test/regress/expected/multi_mx_node_metadata.out index eea9cd5bb..09ae6425c 100644 --- a/src/test/regress/expected/multi_mx_node_metadata.out +++ b/src/test/regress/expected/multi_mx_node_metadata.out @@ -42,7 +42,7 @@ begin end loop; end$$ LANGUAGE plpgsql; -- add a node to the cluster -SELECT master_add_node('localhost', :worker_1_port) As nodeid_1 \gset +SELECT citus_add_node('localhost', :worker_1_port) As nodeid_1 \gset SELECT nodeid, nodename, nodeport, hasmetadata, metadatasynced FROM pg_dist_node; nodeid | nodename | nodeport | hasmetadata | metadatasynced --------------------------------------------------------------------- @@ -349,7 +349,7 @@ SELECT create_reference_table('some_ref_table'); INSERT INTO some_ref_table (a) SELECT i FROM generate_series(0,10)i; BEGIN; - SELECT master_add_node('localhost', :worker_2_port) AS nodeid_2 \gset + SELECT citus_add_node('localhost', :worker_2_port) AS nodeid_2 \gset SELECT 1 FROM start_metadata_sync_to_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- @@ -806,8 +806,8 @@ SELECT run_command_on_workers('CREATE DATABASE db_to_drop'); CREATE EXTENSION citus; \c db_to_drop - - :master_port CREATE EXTENSION citus; -SELECT master_add_node('localhost', :worker_1_port); - master_add_node +SELECT citus_add_node('localhost', :worker_1_port); + citus_add_node --------------------------------------------------------------------- 1 (1 row) @@ -848,7 +848,7 @@ NOTICE: drop cascades to default value for column a of table reference_table DROP TABLE ref_table; DROP TABLE reference_table; TRUNCATE pg_dist_colocation; -SELECT count(*) FROM (SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node) t; +SELECT count(*) FROM (SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node) t; count --------------------------------------------------------------------- 2 diff --git a/src/test/regress/expected/multi_remove_node_reference_table.out b/src/test/regress/expected/multi_remove_node_reference_table.out index 11f781f57..59b3ae8e1 100644 --- a/src/test/regress/expected/multi_remove_node_reference_table.out +++ b/src/test/regress/expected/multi_remove_node_reference_table.out @@ -1,7 +1,7 @@ -- -- MULTI_REMOVE_NODE_REFERENCE_TABLE -- --- Tests that check the metadata after master_remove_node. +-- Tests that check the metadata after citus_remove_node. SET citus.next_shard_id TO 1380000; SET citus.replicate_reference_tables_on_activate TO off; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1380000; @@ -18,7 +18,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_1_port); (1 row) -- remove non-existing node -SELECT master_remove_node('localhost', 55555); +SELECT citus_remove_node('localhost', 55555); ERROR: node at "localhost:xxxxx" does not exist -- remove a node with no reference tables -- verify node exist before removal @@ -37,8 +37,8 @@ SELECT create_distributed_table('recovery_test','x'); (1 row) DROP TABLE recovery_test; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -63,10 +63,10 @@ SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; (1 row) -- re-add the node for next tests -SELECT master_add_node('localhost', :worker_2_port) AS worker_2_nodeid \gset +SELECT citus_add_node('localhost', :worker_2_port) AS worker_2_nodeid \gset SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeid=:worker_2_nodeid \gset -- add a secondary to check we don't attempt to replicate the table to it -SELECT 1 FROM master_add_node('localhost', 9000, groupid=>:worker_2_group, noderole=>'secondary'); +SELECT 1 FROM citus_add_node('localhost', 9000, groupid=>:worker_2_group, noderole=>'secondary'); ?column? --------------------------------------------------------------------- 1 @@ -81,7 +81,7 @@ SELECT create_reference_table('remove_node_reference_table'); (1 row) -- make sure when we add a secondary we don't attempt to add placements to it -SELECT 1 FROM master_add_node('localhost', 9001, groupid=>:worker_2_group, noderole=>'secondary'); +SELECT 1 FROM citus_add_node('localhost', 9001, groupid=>:worker_2_group, noderole=>'secondary'); ?column? --------------------------------------------------------------------- 1 @@ -126,8 +126,8 @@ SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group; (1 row) -- make sure when we remove a secondary we don't remove any placements -SELECT master_remove_node('localhost', 9001); - master_remove_node +SELECT citus_remove_node('localhost', 9001); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -138,7 +138,7 @@ SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group; 1 (1 row) --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -186,13 +186,13 @@ WHERE (1 row) \c - - - :master_port -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -220,7 +220,7 @@ WHERE colocationid IN 1 | -1 | 0 (1 row) -SELECT master_remove_node('localhost', :worker_1_port); +SELECT citus_remove_node('localhost', :worker_1_port); ERROR: cannot remove the last worker node because there are reference tables and it would cause data loss on reference tables HINT: To proceed, either drop the reference tables or use undistribute_table() function to convert them to local tables \c - - - :worker_1_port @@ -243,10 +243,10 @@ WHERE \c - - - :master_port SET citus.replicate_reference_tables_on_activate TO off; -- remove same node twice -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); ERROR: node at "localhost:xxxxx" does not exist -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -259,21 +259,21 @@ SELECT master_disable_node('localhost', :worker_2_port); (1 row) -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) -- re-add the node for the next test -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) -- remove node in a transaction and ROLLBACK --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -320,14 +320,14 @@ WHERE \c - - - :master_port BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) ROLLBACK; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -374,7 +374,7 @@ WHERE \c - - - :master_port -- remove node in a transaction and COMMIT --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -421,14 +421,14 @@ WHERE \c - - - :master_port BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -476,14 +476,14 @@ WHERE \c - - - :master_port SET citus.replicate_reference_tables_on_activate TO off; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) -- test inserting a value then removing a node in a transaction --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -531,14 +531,14 @@ WHERE \c - - - :master_port BEGIN; INSERT INTO remove_node_reference_table VALUES(1); -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -599,14 +599,14 @@ SELECT * FROM remove_node_reference_table; \c - - - :master_port SET citus.replicate_reference_tables_on_activate TO off; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) -- test executing DDL command then removing a node in a transaction --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -654,14 +654,14 @@ WHERE \c - - - :master_port BEGIN; ALTER TABLE remove_node_reference_table ADD column2 int; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -718,14 +718,14 @@ SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='public.remove_ (2 rows) -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) -- test DROP table after removing a node in a transaction --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -754,15 +754,15 @@ WHERE colocationid IN (1 row) BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) DROP TABLE remove_node_reference_table; COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -785,7 +785,7 @@ SELECT * FROM pg_dist_colocation WHERE colocationid = 1380000; (0 rows) -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -808,7 +808,7 @@ SELECT create_reference_table('remove_node_reference_table_schema.table1'); (1 row) --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -862,13 +862,13 @@ ORDER BY (2 rows) \c - - - :master_port -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; count --------------------------------------------------------------------- @@ -916,7 +916,7 @@ WHERE \c - - - :master_port SET citus.replicate_reference_tables_on_activate TO off; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/multi_replicate_reference_table.out b/src/test/regress/expected/multi_replicate_reference_table.out index e239a8c78..a517da6bf 100644 --- a/src/test/regress/expected/multi_replicate_reference_table.out +++ b/src/test/regress/expected/multi_replicate_reference_table.out @@ -15,8 +15,8 @@ SELECT * FROM pg_dist_shard_placement WHERE shardid BETWEEN 1370000 AND 1380000; -- remove a node for testing purposes CREATE TABLE tmp_shard_placement AS SELECT * FROM pg_dist_shard_placement WHERE nodeport = :worker_2_port; DELETE FROM pg_dist_shard_placement WHERE nodeport = :worker_2_port; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -29,7 +29,7 @@ SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; 0 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -54,8 +54,8 @@ WHERE (0 rows) -- test adding new node with a reference table which does not have any healthy placement -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -75,7 +75,7 @@ SELECT create_reference_table('replicate_reference_table_unhealthy'); (1 row) UPDATE pg_dist_shard_placement SET shardstate = 3 WHERE shardid = 1370000; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -108,7 +108,7 @@ SELECT create_reference_table('replicate_reference_table_valid'); (1 row) --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -131,13 +131,13 @@ WHERE colocationid IN 1 | -1 | 0 | 0 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -161,7 +161,7 @@ WHERE colocationid IN (1 row) -- test add same node twice --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -184,13 +184,13 @@ WHERE colocationid IN 1 | -1 | 0 | 0 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -215,8 +215,8 @@ WHERE colocationid IN DROP TABLE replicate_reference_table_valid; -- test replicating a reference table when a new node added in TRANSACTION + ROLLBACK -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -228,7 +228,7 @@ SELECT create_reference_table('replicate_reference_table_rollback'); (1 row) --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -251,14 +251,14 @@ WHERE colocationid IN (1 row) BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) ROLLBACK; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -289,7 +289,7 @@ SELECT create_reference_table('replicate_reference_table_commit'); (1 row) --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -312,14 +312,14 @@ WHERE colocationid IN (1 row) BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) COMMIT; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -343,8 +343,8 @@ WHERE colocationid IN DROP TABLE replicate_reference_table_commit; -- test adding new node + upgrading another hash distributed table to reference table + creating new reference table in TRANSACTION -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -359,7 +359,7 @@ SELECT create_reference_table('replicate_reference_table_reference_one'); SET citus.shard_count TO 1; SET citus.shard_replication_factor TO 1; CREATE TABLE replicate_reference_table_reference_two(column1 int); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -394,7 +394,7 @@ ORDER BY logicalrelid; (1 row) SET client_min_messages TO WARNING; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -407,7 +407,7 @@ SELECT create_reference_table('replicate_reference_table_reference_two'); (1 row) RESET client_min_messages; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -448,8 +448,8 @@ ORDER BY DROP TABLE replicate_reference_table_reference_one; DROP TABLE replicate_reference_table_reference_two; -- test inserting a value then adding a new node in a transaction -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -463,7 +463,7 @@ SELECT create_reference_table('replicate_reference_table_insert'); BEGIN; INSERT INTO replicate_reference_table_insert VALUES(1); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ERROR: cannot open new connections after the first modification command within a transaction ROLLBACK; DROP TABLE replicate_reference_table_insert; @@ -478,7 +478,7 @@ SELECT create_reference_table('replicate_reference_table_copy'); SET citus.enable_local_execution = 'off'; BEGIN; COPY replicate_reference_table_copy FROM STDIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ERROR: cannot open new connections after the first modification command within a transaction ROLLBACK; RESET citus.enable_local_execution; @@ -493,7 +493,7 @@ SELECT create_reference_table('replicate_reference_table_ddl'); BEGIN; ALTER TABLE replicate_reference_table_ddl ADD column2 int; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ERROR: cannot open new connections after the first modification command within a transaction ROLLBACK; DROP TABLE replicate_reference_table_ddl; @@ -505,7 +505,7 @@ SELECT create_reference_table('replicate_reference_table_drop'); (1 row) --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -528,7 +528,7 @@ WHERE colocationid IN (1 row) BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -536,7 +536,7 @@ SELECT 1 FROM master_add_node('localhost', :worker_2_port); DROP TABLE replicate_reference_table_drop; COMMIT; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -554,8 +554,8 @@ SELECT * FROM pg_dist_colocation WHERE colocationid = 1370009; (0 rows) -- test adding a node while there is a reference table at another schema -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -568,7 +568,7 @@ SELECT create_reference_table('replicate_reference_table_schema.table1'); (1 row) --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -590,13 +590,13 @@ WHERE colocationid IN 1 | -1 | 0 | 0 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -621,8 +621,8 @@ WHERE colocationid IN DROP TABLE replicate_reference_table_schema.table1; DROP SCHEMA replicate_reference_table_schema CASCADE; -- test adding a node when there are foreign keys between reference tables -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -638,7 +638,7 @@ SELECT create_reference_table('ref_table_1'), | | (1 row) --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -650,13 +650,13 @@ ORDER BY shardid, nodeport; --------------------------------------------------------------------- (0 rows) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -678,8 +678,8 @@ SELECT run_command_on_workers('select count(*) from pg_constraint where contype= DROP TABLE ref_table_1, ref_table_2, ref_table_3; -- do some tests with inactive node -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -741,7 +741,7 @@ ORDER BY 1,4,5; 1370014 | 1 | 0 | localhost | 57637 (1 row) -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -755,7 +755,7 @@ SELECT create_reference_table('ref_table'); (1 row) INSERT INTO ref_table SELECT * FROM generate_series(1, 10); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -831,7 +831,7 @@ SET client_min_messages TO WARNING; SELECT shardid AS ref_table_shard FROM pg_dist_shard WHERE logicalrelid = 'ref_table'::regclass \gset SELECT count(*) AS ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard \gset -- remove reference table replica from worker 2 -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -851,7 +851,7 @@ SELECT create_distributed_table('range_table', 'a', 'range'); (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -876,16 +876,16 @@ SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shard (1 row) DROP TABLE range_table; -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) -- test setting citus.replicate_reference_tables_on_activate to on --- master_add_node +-- citus_add_node SET citus.replicate_reference_tables_on_activate TO on; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -898,7 +898,7 @@ SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shard (1 row) -- master_activate_node -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -937,13 +937,13 @@ SELECT min(result) = max(result) AS consistent FROM run_command_on_placements('r -- test that metadata is synced when master_copy_shard_placement replicates -- reference table shards SET citus.replicate_reference_tables_on_activate TO off; -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -976,13 +976,13 @@ WHERE nodeport=:worker_1_port; (1 row) -- test that metadata is synced on replicate_reference_tables -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -1040,8 +1040,8 @@ NOTICE: dropping metadata on the node (localhost,57637) -- SET citus.replicate_reference_tables_on_activate TO off; SET citus.shard_replication_factor TO 1; -SELECT master_remove_node('localhost', :worker_2_port); - master_remove_node +SELECT citus_remove_node('localhost', :worker_2_port); + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1054,7 +1054,7 @@ SELECT create_reference_table('ref'); (1 row) CREATE TABLE test (x int, y int references ref(a)); -select 1 FROM master_add_node('localhost', :worker_2_port); +select 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -1077,7 +1077,7 @@ DECLARE BEGIN errors_received := 0; BEGIN - SELECT master_add_node('invalid-node-name', 9999); + SELECT citus_add_node('invalid-node-name', 9999); EXCEPTION WHEN OTHERS THEN IF SQLERRM LIKE 'connection to the remote node%%' THEN errors_received := errors_received + 1; diff --git a/src/test/regress/expected/multi_row_router_insert.out b/src/test/regress/expected/multi_row_router_insert.out index 07b958532..1e83e5874 100644 --- a/src/test/regress/expected/multi_row_router_insert.out +++ b/src/test/regress/expected/multi_row_router_insert.out @@ -6,7 +6,7 @@ SET citus.log_local_commands TO ON; CREATE SCHEMA multi_row_router_insert; SET search_path TO multi_row_router_insert; SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/multi_sequence_default.out b/src/test/regress/expected/multi_sequence_default.out index 9ed0b0baf..031bf1f15 100644 --- a/src/test/regress/expected/multi_sequence_default.out +++ b/src/test/regress/expected/multi_sequence_default.out @@ -789,8 +789,8 @@ SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); (1 row) -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/multi_table_ddl.out b/src/test/regress/expected/multi_table_ddl.out index f1d23a06d..3dd69205e 100644 --- a/src/test/regress/expected/multi_table_ddl.out +++ b/src/test/regress/expected/multi_table_ddl.out @@ -78,13 +78,13 @@ SELECT * FROM pg_dist_shard_placement; DROP EXTENSION citus; CREATE EXTENSION citus; -- re-add the nodes to the cluster -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); ?column? --------------------------------------------------------------------- 1 (1 row) -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/multi_transaction_recovery.out b/src/test/regress/expected/multi_transaction_recovery.out index 6b862cddc..44c53a268 100644 --- a/src/test/regress/expected/multi_transaction_recovery.out +++ b/src/test/regress/expected/multi_transaction_recovery.out @@ -4,7 +4,7 @@ SET citus.next_shard_id TO 1220000; -- verify we recover transactions which do DML on coordinator placements -- properly. SET client_min_messages TO ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); ?column? --------------------------------------------------------------------- 1 @@ -503,7 +503,7 @@ DROP TABLE test_recovery; DROP TABLE test_recovery_single; DROP TABLE test_2pcskip; DROP TABLE test_reference; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/multi_transactional_drop_shards.out b/src/test/regress/expected/multi_transactional_drop_shards.out index a163823be..6cd5c8471 100644 --- a/src/test/regress/expected/multi_transactional_drop_shards.out +++ b/src/test/regress/expected/multi_transactional_drop_shards.out @@ -656,7 +656,7 @@ ORDER BY \c - - - :master_port SET client_min_messages TO WARNING; -- try using the coordinator as a worker and then dropping the table -SELECT 1 FROM master_add_node('localhost', :master_port); +SELECT 1 FROM citus_add_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 @@ -671,8 +671,8 @@ SELECT create_distributed_table('citus_local', 'id'); INSERT INTO citus_local (k) VALUES (2); DROP TABLE citus_local; -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/multi_unsupported_worker_operations.out b/src/test/regress/expected/multi_unsupported_worker_operations.out index aa26d115d..8559998f2 100644 --- a/src/test/regress/expected/multi_unsupported_worker_operations.out +++ b/src/test/regress/expected/multi_unsupported_worker_operations.out @@ -192,7 +192,7 @@ SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432; 0 (1 row) --- master_remove_node +-- citus_remove_node \c - - - :master_port DROP INDEX mx_test_uniq_index; SELECT 1 FROM master_add_inactive_node('localhost', 5432); @@ -202,7 +202,7 @@ SELECT 1 FROM master_add_inactive_node('localhost', 5432); (1 row) \c - - - :worker_1_port -SELECT master_remove_node('localhost', 5432); +SELECT citus_remove_node('localhost', 5432); ERROR: operation is not allowed on this node HINT: Connect to the coordinator and run it again. SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432; @@ -212,8 +212,8 @@ SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432; (1 row) \c - - - :master_port -SELECT master_remove_node('localhost', 5432); - master_remove_node +SELECT citus_remove_node('localhost', 5432); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/mx_coordinator_shouldhaveshards.out b/src/test/regress/expected/mx_coordinator_shouldhaveshards.out index ddacdbd80..f10938c59 100644 --- a/src/test/regress/expected/mx_coordinator_shouldhaveshards.out +++ b/src/test/regress/expected/mx_coordinator_shouldhaveshards.out @@ -2,7 +2,7 @@ CREATE SCHEMA mx_coordinator_shouldhaveshards; SET search_path TO mx_coordinator_shouldhaveshards; SET citus.shard_replication_factor to 1; SET client_min_messages TO WARNING; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); ?column? --------------------------------------------------------------------- 1 @@ -170,8 +170,8 @@ SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhavesha SET client_min_messages TO ERROR; DROP SCHEMA mx_coordinator_shouldhaveshards CASCADE; -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/mx_regular_user.out b/src/test/regress/expected/mx_regular_user.out index e3648694b..631ab380e 100644 --- a/src/test/regress/expected/mx_regular_user.out +++ b/src/test/regress/expected/mx_regular_user.out @@ -1,7 +1,7 @@ CREATE SCHEMA "Mx Regular User"; SET search_path TO "Mx Regular User"; -- add coordinator in idempotent way -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/propagate_extension_commands.out b/src/test/regress/expected/propagate_extension_commands.out index 969a52b97..f74defa3a 100644 --- a/src/test/regress/expected/propagate_extension_commands.out +++ b/src/test/regress/expected/propagate_extension_commands.out @@ -146,7 +146,7 @@ DROP EXTENSION seg CASCADE; -- but as we have only 2 ports in postgresql tests, let's remove one of the nodes first -- before remove, first remove the existing relations (due to the other tests) DROP SCHEMA "extension'test" CASCADE; -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -240,7 +240,7 @@ SELECT run_command_on_workers($$SELECT extversion FROM pg_extension WHERE extnam (1 row) -- and add the other node -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -390,7 +390,7 @@ CREATE SCHEMA "extension'test"; -- use a schema name with escape character SET search_path TO "extension'test"; -- remove the node, we'll add back again -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -421,7 +421,7 @@ BEGIN; COMMIT; -- add the node back -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/propagate_extension_commands_1.out b/src/test/regress/expected/propagate_extension_commands_1.out index 36f7254c9..43e900601 100644 --- a/src/test/regress/expected/propagate_extension_commands_1.out +++ b/src/test/regress/expected/propagate_extension_commands_1.out @@ -146,7 +146,7 @@ DROP EXTENSION seg CASCADE; -- but as we have only 2 ports in postgresql tests, let's remove one of the nodes first -- before remove, first remove the existing relations (due to the other tests) DROP SCHEMA "extension'test" CASCADE; -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -239,7 +239,7 @@ SELECT run_command_on_workers($$SELECT extversion FROM pg_extension WHERE extnam (1 row) -- and add the other node -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -389,7 +389,7 @@ CREATE SCHEMA "extension'test"; -- use a schema name with escape character SET search_path TO "extension'test"; -- remove the node, we'll add back again -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -420,7 +420,7 @@ BEGIN; COMMIT; -- add the node back -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/ref_citus_local_fkeys.out b/src/test/regress/expected/ref_citus_local_fkeys.out index a94208a13..ef859dc77 100644 --- a/src/test/regress/expected/ref_citus_local_fkeys.out +++ b/src/test/regress/expected/ref_citus_local_fkeys.out @@ -7,7 +7,7 @@ CREATE SCHEMA ref_citus_local_fkeys; SET search_path TO ref_citus_local_fkeys; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 @@ -130,7 +130,7 @@ NOTICE: executing the command locally: DROP TABLE IF EXISTS ref_citus_local_fke -- first remove worker_2 to test the behavior when replicating a -- reference table that has a foreign key to a citus local table -- to a new node -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -197,7 +197,7 @@ ERROR: insert or update on table "reference_table_1506007" violates foreign key -- enable the worker_2 to show that we don't try to set up the foreign keys -- between reference tables and citus local tables in worker_2 placements of -- the reference tables -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); NOTICE: Replicating reference table "reference_table" to the node localhost:xxxxx ?column? --------------------------------------------------------------------- diff --git a/src/test/regress/expected/remove_coordinator.out b/src/test/regress/expected/remove_coordinator.out index e59a1f89e..4c529a304 100644 --- a/src/test/regress/expected/remove_coordinator.out +++ b/src/test/regress/expected/remove_coordinator.out @@ -1,6 +1,6 @@ -- removing coordinator from pg_dist_node should update pg_dist_colocation -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/replicate_reference_tables_to_coordinator.out b/src/test/regress/expected/replicate_reference_tables_to_coordinator.out index 53a22f3c6..e054cde64 100644 --- a/src/test/regress/expected/replicate_reference_tables_to_coordinator.out +++ b/src/test/regress/expected/replicate_reference_tables_to_coordinator.out @@ -496,14 +496,14 @@ ALTER TABLE squares DROP COLUMN b; NOTICE: executing the command locally: SELECT worker_apply_shard_ddl_command (8000000, 'replicate_ref_to_coordinator', 'ALTER TABLE squares DROP COLUMN b;') -- verify that we replicate the reference tables that are distributed before -- adding the coordinator as a worker. -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) -- add the coordinator as a worker node and verify that the reference tables are replicated -SELECT master_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset +SELECT citus_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset NOTICE: Replicating reference table "squares" to the node localhost:xxxxx NOTICE: Replicating reference table "numbers" to the node localhost:xxxxx -- clean-up diff --git a/src/test/regress/expected/shard_rebalancer.out b/src/test/regress/expected/shard_rebalancer.out index deb133c76..cec6bf589 100644 --- a/src/test/regress/expected/shard_rebalancer.out +++ b/src/test/regress/expected/shard_rebalancer.out @@ -19,7 +19,7 @@ SELECT create_distributed_table('dist_table_test', 'a'); CREATE TABLE postgres_table_test(a int primary key); -- make sure that all rebalance operations works fine when -- reference tables are replicated to the coordinator -SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0); NOTICE: Replicating reference table "ref_table_test" to the node localhost:xxxxx ?column? --------------------------------------------------------------------- @@ -2074,7 +2074,7 @@ SELECT * from master_set_node_property('localhost', :worker_2_port, 'shouldhaves DROP TABLE tab; -- we don't need the coordinator on pg_dist_node anymore -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 @@ -2103,7 +2103,7 @@ SELECT create_reference_table('ref_table'); (1 row) -SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0); ?column? --------------------------------------------------------------------- 1 @@ -2133,7 +2133,7 @@ SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE lo 3 (1 row) -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 @@ -2147,7 +2147,7 @@ SELECT master_create_distributed_table('rebalance_test_table', 'int_column', 'ap (1 row) CALL create_unbalanced_shards('rebalance_test_table'); -SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0); ?column? --------------------------------------------------------------------- 1 @@ -2173,7 +2173,7 @@ SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE lo (1 row) DROP TABLE dist_table_test_3, rebalance_test_table, ref_table; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 @@ -2188,7 +2188,7 @@ CREATE TABLE r1 (a int PRIMARY KEY, b int); CREATE TABLE r2 (a int, b int); -- we remove worker 2 before creating the tables, this will allow us to have an active -- node without the reference tables -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -2215,7 +2215,7 @@ SELECT create_reference_table('r2'); -- add data so to actually copy data when forcing logical replication for reference tables INSERT INTO r1 VALUES (1,2), (3,4); INSERT INTO r2 VALUES (1,2), (3,4); -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -2239,7 +2239,7 @@ SELECT count(*) FROM pg_dist_partition; -- verify a system having only reference tables will copy the reference tables when -- executing the rebalancer -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -2252,7 +2252,7 @@ SELECT create_reference_table('r1'); (1 row) -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -2292,7 +2292,7 @@ DROP TABLE r1; -- lastly we need to verify that reference tables are copied before the replication factor -- of other tables is increased. Without the copy of reference tables the replication might -- fail. -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 @@ -2312,7 +2312,7 @@ SELECT create_reference_table('r1'); (1 row) -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/single_node.out b/src/test/regress/expected/single_node.out index 6bf5af799..f070adaac 100644 --- a/src/test/regress/expected/single_node.out +++ b/src/test/regress/expected/single_node.out @@ -19,7 +19,7 @@ SELECT 1 FROM master_disable_node('localhost', :master_port); ERROR: Disabling localhost:xxxxx failed DETAIL: cannot change "isactive" field of the coordinator node RESET client_min_messages; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 @@ -47,8 +47,8 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met DROP TABLE ref; -- remove the coordinator to try again with create_reference_table -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; - master_remove_node +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -68,8 +68,8 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met DROP TABLE loc; -- remove the coordinator to try again with create_distributed_table -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; - master_remove_node +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -103,8 +103,8 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met DROP TABLE test; -- remove the coordinator to try again -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; - master_remove_node +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; + citus_remove_node --------------------------------------------------------------------- (1 row) @@ -136,12 +136,12 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met (1 row) -- cannot add workers with specific IP as long as I have a placeholder coordinator record -SELECT 1 FROM master_add_node('127.0.0.1', :worker_1_port); +SELECT 1 FROM citus_add_node('127.0.0.1', :worker_1_port); ERROR: cannot add a worker node when the coordinator hostname is set to localhost DETAIL: Worker nodes need to be able to connect to the coordinator to transfer data. HINT: Use SELECT citus_set_coordinator_host('') to configure the coordinator hostname -- adding localhost workers is ok -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); NOTICE: shards are still on the coordinator after adding the new node HINT: Use SELECT rebalance_table_shards(); to balance shards data between workers and coordinator or SELECT citus_drain_node('localhost',57636); to permanently move shards away from the coordinator. ?column? @@ -149,7 +149,7 @@ HINT: Use SELECT rebalance_table_shards(); to balance shards data between worke 1 (1 row) -SELECT 1 FROM master_remove_node('localhost', :worker_1_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_1_port); ?column? --------------------------------------------------------------------- 1 @@ -163,7 +163,7 @@ SELECT 1 FROM citus_set_coordinator_host('127.0.0.1'); (1 row) -- adding workers with specific IP is ok now -SELECT 1 FROM master_add_node('127.0.0.1', :worker_1_port); +SELECT 1 FROM citus_add_node('127.0.0.1', :worker_1_port); NOTICE: shards are still on the coordinator after adding the new node HINT: Use SELECT rebalance_table_shards(); to balance shards data between workers and coordinator or SELECT citus_drain_node('127.0.0.1',57636); to permanently move shards away from the coordinator. ?column? @@ -171,7 +171,7 @@ HINT: Use SELECT rebalance_table_shards(); to balance shards data between worke 1 (1 row) -SELECT 1 FROM master_remove_node('127.0.0.1', :worker_1_port); +SELECT 1 FROM citus_remove_node('127.0.0.1', :worker_1_port); ?column? --------------------------------------------------------------------- 1 @@ -2102,13 +2102,13 @@ SELECT pg_reload_conf(); -- suppress notices SET client_min_messages TO error; -- cannot remove coordinator since a reference table exists on coordinator and no other worker nodes are added -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ERROR: cannot remove the last worker node because there are reference tables and it would cause data loss on reference tables HINT: To proceed, either drop the reference tables or use undistribute_table() function to convert them to local tables -- Cleanup DROP SCHEMA single_node CASCADE; -- Remove the coordinator again -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/single_node_truncate.out b/src/test/regress/expected/single_node_truncate.out index bf1c99d69..95b5c03e4 100644 --- a/src/test/regress/expected/single_node_truncate.out +++ b/src/test/regress/expected/single_node_truncate.out @@ -136,7 +136,7 @@ DROP TABLE ref, dist, citus_local; DROP VIEW table_sizes; DROP SCHEMA single_node_truncate CASCADE; -- Remove the coordinator -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/tableam.out b/src/test/regress/expected/tableam.out index 7a11d7354..0fa00bb5a 100644 --- a/src/test/regress/expected/tableam.out +++ b/src/test/regress/expected/tableam.out @@ -132,7 +132,7 @@ SELECT * FROM master_get_table_ddl_events('test_ref'); -- replicate to coordinator SET client_min_messages TO WARNING; \set VERBOSIY terse -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); ?column? --------------------------------------------------------------------- 1 @@ -144,8 +144,8 @@ WARNING: fake_scan_getnextslot DETAIL: from localhost:xxxxx ERROR: fake_tuple_delete not implemented CONTEXT: while executing command on localhost:xxxxx -SELECT master_remove_node('localhost', :master_port); - master_remove_node +SELECT citus_remove_node('localhost', :master_port); + citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/undistribute_table_cascade.out b/src/test/regress/expected/undistribute_table_cascade.out index db98bf2f0..b93fdb7c3 100644 --- a/src/test/regress/expected/undistribute_table_cascade.out +++ b/src/test/regress/expected/undistribute_table_cascade.out @@ -5,7 +5,7 @@ CREATE SCHEMA undistribute_table_cascade; SET search_path TO undistribute_table_cascade; SET client_min_messages to ERROR; -- remove coordinator if it is added to pg_dist_node -SELECT COUNT(master_remove_node(nodename, nodeport)) < 2 +SELECT COUNT(citus_remove_node(nodename, nodeport)) < 2 FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:master_port; ?column? --------------------------------------------------------------------- @@ -37,7 +37,7 @@ BEGIN; ROLLBACK; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/undistribute_table_cascade_mx.out b/src/test/regress/expected/undistribute_table_cascade_mx.out index 90318700f..d27e4e8df 100644 --- a/src/test/regress/expected/undistribute_table_cascade_mx.out +++ b/src/test/regress/expected/undistribute_table_cascade_mx.out @@ -6,7 +6,7 @@ CREATE SCHEMA undistribute_table_cascade_mx; SET search_path TO undistribute_table_cascade_mx; SET client_min_messages to ERROR; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); ?column? --------------------------------------------------------------------- 1 diff --git a/src/test/regress/expected/upgrade_list_citus_objects.out b/src/test/regress/expected/upgrade_list_citus_objects.out index 6ee6a3084..22832e35b 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects.out +++ b/src/test/regress/expected/upgrade_list_citus_objects.out @@ -139,7 +139,7 @@ ORDER BY 1; function lock_shard_resources(integer,bigint[]) function master_activate_node(text,integer) function master_add_inactive_node(text,integer,integer,noderole,name) - function master_add_node(text,integer,integer,noderole,name) + function citus_add_node(text,integer,integer,noderole,name) function master_add_secondary_node(text,integer,text,integer,name) function master_append_table_to_shard(bigint,text,text,integer) function master_apply_delete_command(text) @@ -154,7 +154,7 @@ ORDER BY 1; function master_get_table_metadata(text) function master_move_shard_placement(bigint,text,integer,text,integer,citus.shard_transfer_mode) function master_remove_distributed_table_metadata_from_workers(regclass,text,text) - function master_remove_node(text,integer) + function citus_remove_node(text,integer) function master_remove_partition_metadata(regclass,text,text) function master_run_on_worker(text[],integer[],text[],boolean) function master_set_node_property(text,integer,text,boolean) diff --git a/src/test/regress/expected/upgrade_list_citus_objects_0.out b/src/test/regress/expected/upgrade_list_citus_objects_0.out index 045b538f2..0e37e5082 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects_0.out +++ b/src/test/regress/expected/upgrade_list_citus_objects_0.out @@ -128,7 +128,7 @@ ORDER BY 1; function lock_shard_resources(integer,bigint[]) function master_activate_node(text,integer) function master_add_inactive_node(text,integer,integer,noderole,name) - function master_add_node(text,integer,integer,noderole,name) + function citus_add_node(text,integer,integer,noderole,name) function master_add_secondary_node(text,integer,text,integer,name) function master_append_table_to_shard(bigint,text,text,integer) function master_apply_delete_command(text) @@ -143,7 +143,7 @@ ORDER BY 1; function master_get_table_metadata(text) function master_move_shard_placement(bigint,text,integer,text,integer,citus.shard_transfer_mode) function master_remove_distributed_table_metadata_from_workers(regclass,text,text) - function master_remove_node(text,integer) + function citus_remove_node(text,integer) function master_remove_partition_metadata(regclass,text,text) function master_run_on_worker(text[],integer[],text[],boolean) function master_set_node_property(text,integer,text,boolean) diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule index 9b6f3994a..edeb9eb94 100644 --- a/src/test/regress/multi_1_schedule +++ b/src/test/regress/multi_1_schedule @@ -266,7 +266,7 @@ test: multi_foreign_key_relation_graph # ---------- # multi_replicate_reference_table tests replicating reference tables to new nodes after we add new nodes -# multi_remove_node_reference_table tests metadata changes after master_remove_node +# multi_remove_node_reference_table tests metadata changes after citus_remove_node # ---------- test: multi_replicate_reference_table test: multi_remove_node_reference_table diff --git a/src/test/regress/multi_schedule_hyperscale b/src/test/regress/multi_schedule_hyperscale index 1a7089fd4..afbf2c975 100644 --- a/src/test/regress/multi_schedule_hyperscale +++ b/src/test/regress/multi_schedule_hyperscale @@ -214,7 +214,7 @@ test: multi_foreign_key # ---------- # tests for upgrade_reference_table UDF # tests replicating reference tables to new nodes after we add new nodes -# tests metadata changes after master_remove_node +# tests metadata changes after citus_remove_node # ---------- # -------- diff --git a/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec b/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec index fd4eac77f..12f6b060c 100644 --- a/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec +++ b/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec @@ -3,7 +3,7 @@ setup { SET citus.shard_replication_factor to 1; - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); CREATE TABLE test_reference_table (test_id integer); CREATE TABLE test_reference_table_2 (test_id integer); @@ -19,7 +19,7 @@ teardown DROP TABLE IF EXISTS test_reference_table; DROP TABLE IF EXISTS test_reference_table_2; DROP TABLE IF EXISTS test_table; - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; } session "s1" @@ -41,7 +41,7 @@ step "s1-do-not-replicate-on-activate" step "s1-add-second-worker" { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); } step "s1-drop-reference-table" diff --git a/src/test/regress/spec/isolation_add_remove_node.spec b/src/test/regress/spec/isolation_add_remove_node.spec index e8bbe62ed..3f748b3d9 100644 --- a/src/test/regress/spec/isolation_add_remove_node.spec +++ b/src/test/regress/spec/isolation_add_remove_node.spec @@ -5,7 +5,7 @@ setup teardown { - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; } session "s1" @@ -17,12 +17,12 @@ step "s1-begin" step "s1-add-node-1" { - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); } step "s1-add-node-2" { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); } step "s1-add-inactive-1" @@ -42,7 +42,7 @@ step "s1-disable-node-1" step "s1-remove-node-1" { - SELECT * FROM master_remove_node('localhost', 57637); + SELECT * FROM citus_remove_node('localhost', 57637); } step "s1-abort" @@ -64,12 +64,12 @@ session "s2" step "s2-add-node-1" { - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); } step "s2-add-node-2" { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); } step "s2-activate-node-1" @@ -84,12 +84,12 @@ step "s2-disable-node-1" step "s2-remove-node-1" { - SELECT * FROM master_remove_node('localhost', 57637); + SELECT * FROM citus_remove_node('localhost', 57637); } step "s2-remove-node-2" { - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); } // session 1 adds a node, session 2 removes it, should be ok diff --git a/src/test/regress/spec/isolation_cluster_management.spec b/src/test/regress/spec/isolation_cluster_management.spec index 4715a7509..a38df6586 100644 --- a/src/test/regress/spec/isolation_cluster_management.spec +++ b/src/test/regress/spec/isolation_cluster_management.spec @@ -1,8 +1,8 @@ session "s1" step "s1a" { - SELECT 1 FROM master_add_node('localhost', 57637); - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57638); } permutation "s1a" diff --git a/src/test/regress/spec/isolation_create_citus_local_table.spec b/src/test/regress/spec/isolation_create_citus_local_table.spec index 4e02e0e57..6a7d0565a 100644 --- a/src/test/regress/spec/isolation_create_citus_local_table.spec +++ b/src/test/regress/spec/isolation_create_citus_local_table.spec @@ -1,6 +1,6 @@ setup { - SELECT 1 FROM master_add_node('localhost', 57636, 0); + SELECT 1 FROM citus_add_node('localhost', 57636, 0); CREATE TABLE citus_local_table_1(a int); CREATE TABLE citus_local_table_2(a int unique); @@ -13,7 +13,7 @@ teardown DROP TABLE IF EXISTS citus_local_table_1, citus_local_table_2 CASCADE; DROP SCHEMA IF EXISTS another_schema CASCADE; -- remove coordinator only if it is added to pg_dist_node - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE nodeport=57636; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE nodeport=57636; } session "s1" @@ -24,8 +24,8 @@ step "s1-create-citus-local-table-3" { SELECT citus_add_local_table_to_metadata( step "s1-drop-table" { DROP TABLE citus_local_table_1; } step "s1-delete" { DELETE FROM citus_local_table_1 WHERE a=2; } step "s1-select" { SELECT * FROM citus_local_table_1; } -step "s1-remove-coordinator" { SELECT master_remove_node('localhost', 57636); } -step "s1-add-coordinator" { SELECT 1 FROM master_add_node('localhost', 57636, 0); } +step "s1-remove-coordinator" { SELECT citus_remove_node('localhost', 57636); } +step "s1-add-coordinator" { SELECT 1 FROM citus_add_node('localhost', 57636, 0); } step "s1-commit" { COMMIT; } step "s1-rollback" { ROLLBACK; } @@ -39,7 +39,7 @@ step "s2-select" { SELECT * FROM citus_local_table_1; } step "s2-update" { UPDATE citus_local_table_1 SET a=1 WHERE a=2; } step "s2-truncate" { TRUNCATE citus_local_table_1; } step "s2-fkey-to-another" { ALTER TABLE citus_local_table_1 ADD CONSTRAINT fkey_c_to_c FOREIGN KEY(a) REFERENCES citus_local_table_2(a); } -step "s2-remove-coordinator" { SELECT master_remove_node('localhost', 57636); } +step "s2-remove-coordinator" { SELECT citus_remove_node('localhost', 57636); } step "s2-commit" { COMMIT; } @@ -57,7 +57,7 @@ permutation "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-update" "s permutation "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-truncate" "s1-commit" "s2-commit" // Foreign key creation should succeed as it will be blocked until first session creates citus local table permutation "s2-create-citus-local-table-2" "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-fkey-to-another" "s1-commit" "s2-commit" -// master_remove_node should first block and then fail +// citus_remove_node should first block and then fail permutation "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-remove-coordinator" "s1-commit" "s2-commit" @@ -68,7 +68,7 @@ permutation "s1-begin" "s2-begin" "s1-drop-table" "s2-create-citus-local-table-1 // Any modifying queries, DML commands and SELECT will block permutation "s1-begin" "s2-begin" "s1-delete" "s2-create-citus-local-table-1" "s1-commit" "s2-commit" permutation "s1-begin" "s2-begin" "s1-select" "s2-create-citus-local-table-1" "s1-commit" "s2-commit" -// citus_add_local_table_to_metadata should block on master_remove_node and then fail +// citus_add_local_table_to_metadata should block on citus_remove_node and then fail permutation "s1-begin" "s2-begin" "s1-remove-coordinator" "s2-create-citus-local-table-1" "s1-commit" "s2-commit" -// citus_add_local_table_to_metadata should block on master_add_node and then succeed +// citus_add_local_table_to_metadata should block on citus_add_node and then succeed permutation "s1-remove-coordinator" "s1-begin" "s2-begin" "s1-add-coordinator" "s2-create-citus-local-table-1" "s1-commit" "s2-commit" diff --git a/src/test/regress/spec/isolation_create_restore_point.spec b/src/test/regress/spec/isolation_create_restore_point.spec index fbf18879f..313294a01 100644 --- a/src/test/regress/spec/isolation_create_restore_point.spec +++ b/src/test/regress/spec/isolation_create_restore_point.spec @@ -117,7 +117,7 @@ step "s1-add-node" step "s1-remove-node" { - SELECT master_remove_node('localhost', 9999); + SELECT citus_remove_node('localhost', 9999); } step "s1-commit" @@ -163,10 +163,10 @@ permutation "s1-begin" "s1-recover" "s2-create-restore" "s1-commit" // verify that citus_create_restore_point is blocked by concurrent DROP TABLE permutation "s1-begin" "s1-drop" "s2-create-restore" "s1-commit" -// verify that citus_create_restore_point is blocked by concurrent master_add_node +// verify that citus_create_restore_point is blocked by concurrent citus_add_node permutation "s1-begin" "s1-add-node" "s2-create-restore" "s1-commit" -// verify that citus_create_restore_point is blocked by concurrent master_remove_node +// verify that citus_create_restore_point is blocked by concurrent citus_remove_node permutation "s1-begin" "s1-remove-node" "s2-create-restore" "s1-commit" // verify that citus_create_restore_point is blocked by concurrent citus_create_restore_point diff --git a/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec b/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec index 2f91ae1a7..15e43a911 100644 --- a/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec +++ b/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec @@ -1,6 +1,6 @@ setup { - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); SELECT * FROM master_get_active_worker_nodes() ORDER BY node_name, node_port; } @@ -8,7 +8,7 @@ teardown { DROP TABLE IF EXISTS dist_table; - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; } session "s1" @@ -20,12 +20,12 @@ step "s1-begin" step "s1-add-node-2" { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); } step "s1-remove-node-2" { - SELECT * FROM master_remove_node('localhost', 57638); + SELECT * FROM citus_remove_node('localhost', 57638); } step "s1-abort" diff --git a/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec b/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec index 3f69db1d7..7c1080f32 100644 --- a/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec +++ b/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec @@ -7,15 +7,15 @@ setup LANGUAGE C STRICT VOLATILE AS 'citus', $$wait_until_metadata_sync$$; - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT 1 FROM citus_add_node('localhost', 57637); } // ensure that both nodes exists for the remaining of the isolation tests teardown { - SELECT 1 FROM master_add_node('localhost', 57637); - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57638); -- schema drops are not cascaded SELECT run_command_on_workers($$DROP SCHEMA IF EXISTS myschema CASCADE;$$); @@ -30,7 +30,7 @@ teardown DROP TYPE IF EXISTS tt1 CASCADE; DROP FUNCTION IF EXISTS add(INT,INT) CASCADE; - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; } session "s1" @@ -42,7 +42,7 @@ step "s1-begin" step "s1-add-worker" { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); } step "s1-commit" @@ -54,7 +54,7 @@ step "s1-commit" // on that node as well. After counting objects is done we remove the node again. step "s1-print-distributed-objects" { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); -- print an overview of all distributed objects SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1; @@ -71,7 +71,7 @@ step "s1-print-distributed-objects" SELECT count(*) FROM pg_proc WHERE proname='add'; SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$); - SELECT master_remove_node('localhost', 57638); + SELECT citus_remove_node('localhost', 57638); } session "s2" diff --git a/src/test/regress/spec/isolation_extension_commands.spec b/src/test/regress/spec/isolation_extension_commands.spec index 19d07844b..057104079 100644 --- a/src/test/regress/spec/isolation_extension_commands.spec +++ b/src/test/regress/spec/isolation_extension_commands.spec @@ -1,6 +1,6 @@ setup { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); create schema if not exists schema1; create schema if not exists schema2; @@ -9,7 +9,7 @@ setup teardown { - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; } session "s1" @@ -21,12 +21,12 @@ step "s1-begin" step "s1-add-node-1" { - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); } step "s1-remove-node-1" { - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); } step "s1-commit" @@ -57,7 +57,7 @@ step "s2-begin" step "s2-add-node-1" { - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); } step "s2-create-extension-version-11" @@ -102,7 +102,7 @@ step "s2-commit" step "s2-remove-node-1" { - SELECT 1 FROM master_remove_node('localhost', 57637); + SELECT 1 FROM citus_remove_node('localhost', 57637); } // master_//_node vs extension command diff --git a/src/test/regress/spec/isolation_master_update_node.spec b/src/test/regress/spec/isolation_master_update_node.spec index 5234db32b..23401b9c0 100644 --- a/src/test/regress/spec/isolation_master_update_node.spec +++ b/src/test/regress/spec/isolation_master_update_node.spec @@ -1,7 +1,7 @@ setup { - SELECT 1 FROM master_add_node('localhost', 57637); - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57638); CREATE TABLE t1(a int); SELECT create_distributed_table('t1','a'); @@ -12,7 +12,7 @@ teardown DROP TABLE t1; -- remove the nodes again - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; } session "s1" diff --git a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec index b2dd5dad3..8b6a75376 100644 --- a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec +++ b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec @@ -3,7 +3,7 @@ setup SELECT citus_internal.replace_isolation_tester_func(); SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SELECT master_add_node('localhost', 57636); + SELECT citus_add_node('localhost', 57636); CREATE TABLE ref_table(a int primary key); SELECT create_reference_table('ref_table'); @@ -17,7 +17,7 @@ teardown { SELECT citus_internal.restore_isolation_tester_func(); DROP TABLE ref_table, dist_table; - SELECT master_remove_node('localhost', 57636); + SELECT citus_remove_node('localhost', 57636); } session "s1" diff --git a/src/test/regress/spec/isolation_shard_rebalancer.spec b/src/test/regress/spec/isolation_shard_rebalancer.spec index 1aca39ca6..255b71fe0 100644 --- a/src/test/regress/spec/isolation_shard_rebalancer.spec +++ b/src/test/regress/spec/isolation_shard_rebalancer.spec @@ -1,7 +1,7 @@ setup { - SELECT 1 FROM master_add_node('localhost', 57637); - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57638); CREATE TABLE colocated1 (test_id integer NOT NULL, data text); SELECT create_distributed_table('colocated1', 'test_id', 'hash', 'none'); CREATE TABLE colocated2 (test_id integer NOT NULL, data text); diff --git a/src/test/regress/spec/isolation_shard_rebalancer_progress.spec b/src/test/regress/spec/isolation_shard_rebalancer_progress.spec index d2248292d..3db1c45ab 100644 --- a/src/test/regress/spec/isolation_shard_rebalancer_progress.spec +++ b/src/test/regress/spec/isolation_shard_rebalancer_progress.spec @@ -5,7 +5,7 @@ setup select setval('pg_dist_shardid_seq', GREATEST(1500000, nextval('pg_dist_shardid_seq'))); SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); SELECT master_set_node_property('localhost', 57638, 'shouldhaveshards', false); CREATE TABLE colocated1 (test_id integer NOT NULL, data text); SELECT create_distributed_table('colocated1', 'test_id', 'hash', 'none'); diff --git a/src/test/regress/spec/isolation_shouldhaveshards.spec b/src/test/regress/spec/isolation_shouldhaveshards.spec index 4df530540..c1c75d09f 100644 --- a/src/test/regress/spec/isolation_shouldhaveshards.spec +++ b/src/test/regress/spec/isolation_shouldhaveshards.spec @@ -2,20 +2,20 @@ // add single one of the nodes for the purpose of the test setup { - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT 1 FROM citus_add_node('localhost', 57637); } teardown { DROP TABLE IF EXISTS t1 CASCADE; - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; } session "s1" step "s1-add-second-node" { - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57638); } step "s1-begin" diff --git a/src/test/regress/spec/isolation_update_node.spec b/src/test/regress/spec/isolation_update_node.spec index 09aabacce..2913a3f1a 100644 --- a/src/test/regress/spec/isolation_update_node.spec +++ b/src/test/regress/spec/isolation_update_node.spec @@ -1,14 +1,14 @@ setup { - SELECT 1 FROM master_add_node('localhost', 57637); - SELECT 1 FROM master_add_node('localhost', 57638); + SELECT 1 FROM citus_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57638); SELECT nodeid, nodename, nodeport from pg_dist_node; } teardown { - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; SELECT nodeid, nodename, nodeport from pg_dist_node; } diff --git a/src/test/regress/spec/isolation_update_node_lock_writes.spec b/src/test/regress/spec/isolation_update_node_lock_writes.spec index 6915b6a46..44eb650c5 100644 --- a/src/test/regress/spec/isolation_update_node_lock_writes.spec +++ b/src/test/regress/spec/isolation_update_node_lock_writes.spec @@ -1,6 +1,6 @@ setup { - SELECT 1 FROM master_add_node('localhost', 57637); + SELECT 1 FROM citus_add_node('localhost', 57637); SET citus.shard_replication_factor TO 1; CREATE TABLE update_node(id integer primary key, f1 text); @@ -12,7 +12,7 @@ teardown RESET citus.shard_replication_factor; DROP TABLE update_node CASCADE; - SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; + SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; SELECT nodeid, nodename, nodeport from pg_dist_node; } diff --git a/src/test/regress/sql/add_coordinator.sql b/src/test/regress/sql/add_coordinator.sql index eb5e37778..1dfcc9b90 100644 --- a/src/test/regress/sql/add_coordinator.sql +++ b/src/test/regress/sql/add_coordinator.sql @@ -2,13 +2,13 @@ -- ADD_COORDINATOR -- -SELECT master_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset +SELECT citus_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset -- adding the same node again should return the existing nodeid -SELECT master_add_node('localhost', :master_port, groupid => 0) = :master_nodeid; +SELECT citus_add_node('localhost', :master_port, groupid => 0) = :master_nodeid; -- adding another node with groupid=0 should error out -SELECT master_add_node('localhost', 12345, groupid => 0) = :master_nodeid; +SELECT citus_add_node('localhost', 12345, groupid => 0) = :master_nodeid; -- start_metadata_sync_to_node() for coordinator should raise a notice SELECT start_metadata_sync_to_node('localhost', :master_port); diff --git a/src/test/regress/sql/alter_database_owner.sql b/src/test/regress/sql/alter_database_owner.sql index ae8418468..0eee6202c 100644 --- a/src/test/regress/sql/alter_database_owner.sql +++ b/src/test/regress/sql/alter_database_owner.sql @@ -19,7 +19,7 @@ SELECT run_command_on_workers($$ $$); -- remove a node to verify addition later -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- verify we can change the owner of a database ALTER DATABASE regression OWNER TO database_owner_1; @@ -44,7 +44,7 @@ $$); SET citus.enable_alter_database_owner TO off; -- add back second node to verify the owner of the database was set accordingly -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- list the owners of the current database on all nodes, should reflect on newly added node SELECT run_command_on_workers($$ @@ -57,10 +57,10 @@ $$); -- turn on propagation to verify it does propagate to new nodes when enabled SET citus.enable_alter_database_owner TO on; -SELECT master_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on +SELECT citus_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on -- add back second node to verify the owner of the database was set accordingly -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- list the owners of the current database on all nodes, should reflect on newly added node SELECT run_command_on_workers($$ diff --git a/src/test/regress/sql/alter_role_propagation.sql b/src/test/regress/sql/alter_role_propagation.sql index e42cde447..1c220ddbe 100644 --- a/src/test/regress/sql/alter_role_propagation.sql +++ b/src/test/regress/sql/alter_role_propagation.sql @@ -9,11 +9,11 @@ SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit, rolcr ALTER ROLE CURRENT_USER WITH CONNECTION LIMIT 66 VALID UNTIL '2032-05-05' PASSWORD 'password456'; SELECT row(rolname, rolsuper, rolinherit, rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = 'alter_role_1'; SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit, rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = current_user$$); -SELECT master_remove_node('localhost', :worker_1_port); +SELECT citus_remove_node('localhost', :worker_1_port); ALTER ROLE CURRENT_USER WITH CONNECTION LIMIT 0 VALID UNTIL '2052-05-05' PASSWORD 'password789'; SELECT row(rolname, rolsuper, rolinherit, rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = 'alter_role_1'; SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit, rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = current_user$$); -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); SELECT row(rolname, rolsuper, rolinherit, rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = 'alter_role_1'; SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit, rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = current_user$$); @@ -24,7 +24,7 @@ SELECT run_command_on_workers('SHOW enable_indexonlyscan'); SELECT run_command_on_workers('SHOW enable_hashagg'); -- remove 1 node to verify settings are copied when the node gets added back -SELECT master_remove_node('localhost', :worker_1_port); +SELECT citus_remove_node('localhost', :worker_1_port); -- change a setting for all users ALTER ROLE ALL SET enable_hashjoin TO FALSE; @@ -45,7 +45,7 @@ ALTER ROLE ALL SET public.myguc TO "Hello, World"; ALTER ROLE CURRENT_USER SET lc_messages TO 'C'; -- add worker and check all settings are copied -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); SELECT run_command_on_workers('SHOW enable_hashjoin'); SELECT run_command_on_workers('SHOW enable_indexonlyscan'); SELECT run_command_on_workers('SHOW enable_hashagg'); @@ -83,9 +83,9 @@ DROP DATABASE "REGRESSION"; -- make sure alter role set is not propagated when the feature is deliberately turned off SET citus.enable_alter_role_set_propagation TO off; -- remove 1 node to verify settings are NOT copied when the node gets added back -SELECT master_remove_node('localhost', :worker_1_port); +SELECT citus_remove_node('localhost', :worker_1_port); ALTER ROLE ALL SET enable_hashjoin TO FALSE; -SELECT 1 FROM master_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); SELECT run_command_on_workers('SHOW enable_hashjoin'); ALTER ROLE ALL RESET enable_hashjoin; SELECT run_command_on_workers('SHOW enable_hashjoin'); diff --git a/src/test/regress/sql/alter_table_set_access_method.sql b/src/test/regress/sql/alter_table_set_access_method.sql index 4bb75d5c2..bce674c68 100644 --- a/src/test/regress/sql/alter_table_set_access_method.sql +++ b/src/test/regress/sql/alter_table_set_access_method.sql @@ -160,7 +160,7 @@ ORDER BY conname; -- test different table types SET client_min_messages to WARNING; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId := 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId := 0); SET client_min_messages to DEFAULT; CREATE TABLE table_type_dist (a INT); SELECT create_distributed_table('table_type_dist', 'a'); @@ -266,4 +266,4 @@ RESET client_min_messages; SET client_min_messages TO WARNING; DROP SCHEMA alter_table_set_access_method CASCADE; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); diff --git a/src/test/regress/sql/auto_undist_citus_local.sql b/src/test/regress/sql/auto_undist_citus_local.sql index 935145a8e..9c1fcda21 100644 --- a/src/test/regress/sql/auto_undist_citus_local.sql +++ b/src/test/regress/sql/auto_undist_citus_local.sql @@ -6,7 +6,7 @@ SET search_path TO drop_fkey_cascade; SET client_min_messages TO WARNING; SET citus.next_shard_id TO 1810000; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); -- show that DROP CONSTRAINT cascades to undistributing citus_local_table CREATE TABLE citus_local_table(l1 int); diff --git a/src/test/regress/sql/citus_local_dist_joins.sql b/src/test/regress/sql/citus_local_dist_joins.sql index 4f8fc65e7..2f01c21b5 100644 --- a/src/test/regress/sql/citus_local_dist_joins.sql +++ b/src/test/regress/sql/citus_local_dist_joins.sql @@ -2,7 +2,7 @@ CREATE SCHEMA citus_local_dist_joins; SET search_path TO citus_local_dist_joins; SET client_min_messages to ERROR; -SELECT master_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset +SELECT citus_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset CREATE TABLE citus_local(key int, value text); @@ -253,6 +253,6 @@ USING (key); SET client_min_messages to ERROR; DROP TABLE citus_local; -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); \set VERBOSITY terse DROP SCHEMA citus_local_dist_joins CASCADE; diff --git a/src/test/regress/sql/citus_local_table_triggers.sql b/src/test/regress/sql/citus_local_table_triggers.sql index cd262d677..996dd0d50 100644 --- a/src/test/regress/sql/citus_local_table_triggers.sql +++ b/src/test/regress/sql/citus_local_table_triggers.sql @@ -10,7 +10,7 @@ SET search_path TO citus_local_table_triggers; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; CREATE TABLE dummy_reference_table(a int unique, b int); diff --git a/src/test/regress/sql/citus_local_tables.sql b/src/test/regress/sql/citus_local_tables.sql index a4b235463..3e411631a 100644 --- a/src/test/regress/sql/citus_local_tables.sql +++ b/src/test/regress/sql/citus_local_tables.sql @@ -14,7 +14,7 @@ SET search_path TO citus_local_tables_test_schema; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; CREATE TABLE citus_local_table_1 (a int); @@ -23,12 +23,12 @@ CREATE TABLE citus_local_table_1 (a int); SELECT citus_add_local_table_to_metadata('citus_local_table_1'); -- try to remove coordinator and observe failure as there exist a citus local table -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); DROP TABLE citus_local_table_1; -- this should work now as the citus local table is dropped -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); CREATE TABLE citus_local_table_1 (a int primary key); @@ -37,7 +37,7 @@ SELECT citus_add_local_table_to_metadata('citus_local_table_1'); -- let coordinator have citus local tables again for next tests set client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; BEGIN; diff --git a/src/test/regress/sql/citus_local_tables_mx.sql b/src/test/regress/sql/citus_local_tables_mx.sql index 391e9f842..d3663caa7 100644 --- a/src/test/regress/sql/citus_local_tables_mx.sql +++ b/src/test/regress/sql/citus_local_tables_mx.sql @@ -10,7 +10,7 @@ SET search_path TO citus_local_tables_mx; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; -------------- diff --git a/src/test/regress/sql/citus_local_tables_queries.sql b/src/test/regress/sql/citus_local_tables_queries.sql index a4f8b6e00..378e31683 100644 --- a/src/test/regress/sql/citus_local_tables_queries.sql +++ b/src/test/regress/sql/citus_local_tables_queries.sql @@ -10,7 +10,7 @@ SET search_path TO citus_local_table_queries; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; CREATE TABLE dummy_reference_table(a int unique, b int); diff --git a/src/test/regress/sql/citus_local_tables_queries_mx.sql b/src/test/regress/sql/citus_local_tables_queries_mx.sql index f4a53bffc..9b367df6a 100644 --- a/src/test/regress/sql/citus_local_tables_queries_mx.sql +++ b/src/test/regress/sql/citus_local_tables_queries_mx.sql @@ -10,7 +10,7 @@ SET search_path TO citus_local_table_queries_mx; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; -- start metadata sync to worker 1 diff --git a/src/test/regress/sql/columnar_citus_integration.sql b/src/test/regress/sql/columnar_citus_integration.sql index 6818eec9e..6a03d83d0 100644 --- a/src/test/regress/sql/columnar_citus_integration.sql +++ b/src/test/regress/sql/columnar_citus_integration.sql @@ -305,7 +305,7 @@ DROP TABLE table_option_reference, table_option_reference_2; SET citus.shard_replication_factor TO 1; -- test options on a citus local table -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); CREATE TABLE table_option_citus_local (a int, b text) USING columnar; SELECT citus_add_local_table_to_metadata('table_option_citus_local'); @@ -401,7 +401,7 @@ SELECT * FROM pg_dist_partition WHERE logicalrelid = 'table_option_citus_local': SELECT compression FROM columnar.options WHERE regclass = 'table_option_citus_local'::regclass; DROP TABLE table_option_citus_local, table_option_citus_local_2; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); -- verify reference table with no columns can be created -- https://github.com/citusdata/citus/issues/4608 diff --git a/src/test/regress/sql/coordinator_shouldhaveshards.sql b/src/test/regress/sql/coordinator_shouldhaveshards.sql index 85604a366..0e9b793bf 100644 --- a/src/test/regress/sql/coordinator_shouldhaveshards.sql +++ b/src/test/regress/sql/coordinator_shouldhaveshards.sql @@ -6,7 +6,7 @@ SET citus.next_shard_id TO 1503000; -- idempotently add node to allow this test to run without add_coordinator SET client_min_messages TO WARNING; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); RESET client_min_messages; SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true); diff --git a/src/test/regress/sql/create_citus_local_table_cascade.sql b/src/test/regress/sql/create_citus_local_table_cascade.sql index d8854f195..043fb3ac8 100644 --- a/src/test/regress/sql/create_citus_local_table_cascade.sql +++ b/src/test/regress/sql/create_citus_local_table_cascade.sql @@ -9,7 +9,7 @@ SET search_path TO citus_add_local_table_to_metadata_cascade; SET client_min_messages to ERROR; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); CREATE TABLE local_table_1 (col_1 INT UNIQUE); CREATE TABLE local_table_2 (col_1 INT UNIQUE); diff --git a/src/test/regress/sql/create_ref_dist_from_citus_local.sql b/src/test/regress/sql/create_ref_dist_from_citus_local.sql index 6d01aa47c..8882655fa 100644 --- a/src/test/regress/sql/create_ref_dist_from_citus_local.sql +++ b/src/test/regress/sql/create_ref_dist_from_citus_local.sql @@ -9,7 +9,7 @@ SET search_path TO create_ref_dist_from_citus_local; SET client_min_messages to ERROR; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); CREATE TABLE citus_local_table_1 (col_1 INT UNIQUE); CREATE TABLE citus_local_table_2 (col_1 INT UNIQUE); diff --git a/src/test/regress/sql/escape_extension_name.sql b/src/test/regress/sql/escape_extension_name.sql index b495a98f0..29308c054 100644 --- a/src/test/regress/sql/escape_extension_name.sql +++ b/src/test/regress/sql/escape_extension_name.sql @@ -27,7 +27,7 @@ RESET client_min_messages; SELECT run_command_on_workers($$SELECT count(*) FROM pg_extension WHERE extname = 'uuid-ossp'$$); -- show that extension recreation on new nodes works also fine with extension names that require escaping -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); -- this output will help us to understand why we have alternative outputs for this test -- print true if uuid-ossp is available false otherwise @@ -41,7 +41,7 @@ WHERE name = 'uuid-ossp' :uuid_present_command; -- and add the other node -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); -- show that the extension exists on both nodes SELECT run_command_on_workers($$SELECT count(*) FROM pg_extension WHERE extname = 'uuid-ossp'$$); diff --git a/src/test/regress/sql/failure_add_disable_node.sql b/src/test/regress/sql/failure_add_disable_node.sql index eff908ae2..70d20d28a 100644 --- a/src/test/regress/sql/failure_add_disable_node.sql +++ b/src/test/regress/sql/failure_add_disable_node.sql @@ -1,5 +1,5 @@ -- --- failure_add_disable_node tests master_add_node, master_remove_node +-- failure_add_disable_node tests citus_add_node, citus_remove_node -- master_activate_node for failures. -- master_disable_node and master_add_inactive_node can not be -- tested as they don't create network activity @@ -63,12 +63,12 @@ FROM pg_dist_placement p JOIN pg_dist_shard s USING (shardid) WHERE s.logicalrelid = 'user_table'::regclass ORDER BY placementid; --- master_remove_node fails when there are shards on that worker -SELECT master_remove_node('localhost', :worker_2_proxy_port); +-- citus_remove_node fails when there are shards on that worker +SELECT citus_remove_node('localhost', :worker_2_proxy_port); -- drop event table and re-run remove DROP TABLE event_table; -SELECT master_remove_node('localhost', :worker_2_proxy_port); +SELECT citus_remove_node('localhost', :worker_2_proxy_port); -- verify node is removed SELECT * FROM master_get_active_worker_nodes() @@ -84,7 +84,7 @@ ORDER BY placementid; -- be injected failure through network SELECT master_add_inactive_node('localhost', :worker_2_proxy_port); -SELECT master_remove_node('localhost', :worker_2_proxy_port); +SELECT citus_remove_node('localhost', :worker_2_proxy_port); SELECT shardid, shardstate FROM pg_dist_placement p JOIN pg_dist_shard s USING (shardid) @@ -93,7 +93,7 @@ ORDER BY placementid; -- reset cluster to original state SELECT citus.mitmproxy('conn.allow()'); -SELECT master_add_node('localhost', :worker_2_proxy_port); +SELECT citus_add_node('localhost', :worker_2_proxy_port); -- verify node is added SELECT * FROM master_get_active_worker_nodes() @@ -105,7 +105,7 @@ WHERE s.logicalrelid = 'user_table'::regclass ORDER BY placementid; SELECT citus.mitmproxy('conn.allow()'); -SELECT master_add_node('localhost', :worker_1_port); +SELECT citus_add_node('localhost', :worker_1_port); -- verify node is added SELECT * FROM master_get_active_worker_nodes() diff --git a/src/test/regress/sql/failure_setup.sql b/src/test/regress/sql/failure_setup.sql index 4c209f14d..625375330 100644 --- a/src/test/regress/sql/failure_setup.sql +++ b/src/test/regress/sql/failure_setup.sql @@ -1,5 +1,5 @@ SELECT citus.mitmproxy('conn.allow()'); -- add the workers -SELECT master_add_node('localhost', :worker_1_port); -SELECT master_add_node('localhost', :worker_2_proxy_port); -- an mitmproxy which forwards to the second worker +SELECT citus_add_node('localhost', :worker_1_port); +SELECT citus_add_node('localhost', :worker_2_proxy_port); -- an mitmproxy which forwards to the second worker diff --git a/src/test/regress/sql/fkeys_between_local_ref.sql b/src/test/regress/sql/fkeys_between_local_ref.sql index 640a7f66a..7ff8d5c29 100644 --- a/src/test/regress/sql/fkeys_between_local_ref.sql +++ b/src/test/regress/sql/fkeys_between_local_ref.sql @@ -18,7 +18,7 @@ WHERE tablename=logicalrelid::regclass::text AND -- remove coordinator if it is added to pg_dist_node and test -- behavior when coordinator is not added to metadata -SELECT COUNT(master_remove_node(nodename, nodeport)) < 2 +SELECT COUNT(citus_remove_node(nodename, nodeport)) < 2 FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:master_port; create table ref (a int primary key); @@ -47,7 +47,7 @@ drop table if exists ref, ref2, other cascade; -- add coordinator to pg_dist_node for rest of the tests -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); CREATE TABLE local_table_1 (col_1 INT UNIQUE); CREATE TABLE local_table_2 (col_1 INT UNIQUE); diff --git a/src/test/regress/sql/follower_single_node.sql b/src/test/regress/sql/follower_single_node.sql index 757d03902..2ecee9019 100644 --- a/src/test/regress/sql/follower_single_node.sql +++ b/src/test/regress/sql/follower_single_node.sql @@ -9,7 +9,7 @@ SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; SET citus.next_shard_id TO 93630500; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true); CREATE TABLE test(x int, y int); @@ -107,7 +107,7 @@ SELECT * FROM test WHERE x = 1; \c -reuse-previous=off regression - - :master_port SET search_path TO single_node; -SELECT 1 FROM master_add_node('localhost', :follower_master_port, groupid => 0, noderole => 'secondary'); +SELECT 1 FROM citus_add_node('localhost', :follower_master_port, groupid => 0, noderole => 'secondary'); SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true); \c "port=9070 dbname=regression options='-c\ citus.use_secondary_nodes=always'" @@ -175,6 +175,6 @@ SET search_path TO single_node; SET client_min_messages TO WARNING; DROP SCHEMA single_node CASCADE; -- Remove the coordinator again -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); -- Remove the secondary coordinator again -SELECT 1 FROM master_remove_node('localhost', :follower_master_port); +SELECT 1 FROM citus_remove_node('localhost', :follower_master_port); diff --git a/src/test/regress/sql/grant_on_schema_propagation.sql b/src/test/regress/sql/grant_on_schema_propagation.sql index 85a92c2b6..5fa797d19 100644 --- a/src/test/regress/sql/grant_on_schema_propagation.sql +++ b/src/test/regress/sql/grant_on_schema_propagation.sql @@ -96,7 +96,7 @@ SELECT run_command_on_coordinator_and_workers('DROP SCHEMA non_dist_schema'); -- test if the grantors are propagated correctly -- first remove one of the worker nodes SET citus.shard_replication_factor TO 1; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- create a new schema CREATE SCHEMA grantor_schema; @@ -124,7 +124,7 @@ SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'grantor_schema' ORDER \c - - - :master_port -- add the previously removed node -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- check if the grantors are propagated correctly SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'grantor_schema' ORDER BY nspname; @@ -180,7 +180,7 @@ SELECT run_command_on_coordinator_and_workers('DROP SCHEMA dist_schema CASCADE') -- test grants on public schema -- first remove one of the worker nodes SET citus.shard_replication_factor TO 1; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- distribute the public schema (it has to be distributed by now but just in case) CREATE TABLE public_schema_table (id INT); @@ -199,7 +199,7 @@ SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'public' ORDER BY nspna \c - - - :master_port -- add the previously removed node -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- check if the grants are propagated correctly SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'public' ORDER BY nspname; diff --git a/src/test/regress/sql/local_shard_copy.sql b/src/test/regress/sql/local_shard_copy.sql index 688ba8b4b..97e64826a 100644 --- a/src/test/regress/sql/local_shard_copy.sql +++ b/src/test/regress/sql/local_shard_copy.sql @@ -5,7 +5,7 @@ SET client_min_messages TO DEBUG; SET citus.next_shard_id TO 1570000; SET citus.replicate_reference_tables_on_activate TO off; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid := 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid := 0); SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; diff --git a/src/test/regress/sql/local_shard_utility_command_execution.sql b/src/test/regress/sql/local_shard_utility_command_execution.sql index d754c5888..56c4cd7f1 100644 --- a/src/test/regress/sql/local_shard_utility_command_execution.sql +++ b/src/test/regress/sql/local_shard_utility_command_execution.sql @@ -17,7 +17,7 @@ SET search_path TO local_commands_test_schema; -- let coordinator have distributed table shards/placements set client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; SELECT master_set_node_property('localhost', :master_port, 'shouldhaveshards', true); diff --git a/src/test/regress/sql/mixed_relkind_tests.sql b/src/test/regress/sql/mixed_relkind_tests.sql index e4c7e6624..8efd0cbf4 100644 --- a/src/test/regress/sql/mixed_relkind_tests.sql +++ b/src/test/regress/sql/mixed_relkind_tests.sql @@ -8,7 +8,7 @@ SET search_path TO mixed_relkind_tests; -- ensure that coordinator is added to pg_dist_node SET client_min_messages TO ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; -- make results consistent diff --git a/src/test/regress/sql/multi_cluster_management.sql b/src/test/regress/sql/multi_cluster_management.sql index adb07c1ad..a9f91e49d 100644 --- a/src/test/regress/sql/multi_cluster_management.sql +++ b/src/test/regress/sql/multi_cluster_management.sql @@ -6,26 +6,26 @@ SET citus.enable_object_propagation TO off; -- prevent object propagation on add -- Tests functions related to cluster membership -- add the nodes to the cluster -SELECT 1 FROM master_add_node('localhost', :worker_1_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- get the active nodes SELECT master_get_active_worker_nodes(); -- try to add a node that is already in the cluster -SELECT * FROM master_add_node('localhost', :worker_1_port); +SELECT * FROM citus_add_node('localhost', :worker_1_port); -- get the active nodes SELECT master_get_active_worker_nodes(); -- try to remove a node (with no placements) -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- verify that the node has been deleted SELECT master_get_active_worker_nodes(); -- try to disable a node with no placements see that node is removed -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); SELECT master_disable_node('localhost', :worker_2_port); SELECT master_get_active_worker_nodes(); @@ -46,7 +46,7 @@ SELECT create_distributed_table('cluster_management_test', 'col_1', 'hash'); SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHERE nodeport=:worker_2_port; -- try to remove a node with active placements and see that node removal is failed -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); SELECT master_get_active_worker_nodes(); -- insert a row so that master_disable_node() exercises closing connections @@ -74,10 +74,10 @@ CREATE USER non_super_user; CREATE USER node_metadata_user; GRANT EXECUTE ON FUNCTION master_activate_node(text,int) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_add_inactive_node(text,int,int,noderole,name) TO node_metadata_user; -GRANT EXECUTE ON FUNCTION master_add_node(text,int,int,noderole,name) TO node_metadata_user; +GRANT EXECUTE ON FUNCTION citus_add_node(text,int,int,noderole,name) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_add_secondary_node(text,int,text,int,name) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_disable_node(text,int) TO node_metadata_user; -GRANT EXECUTE ON FUNCTION master_remove_node(text,int) TO node_metadata_user; +GRANT EXECUTE ON FUNCTION citus_remove_node(text,int) TO node_metadata_user; GRANT EXECUTE ON FUNCTION master_update_node(int,text,int,bool,int) TO node_metadata_user; -- Removing public schema from pg_dist_object because it breaks the next tests @@ -88,8 +88,8 @@ SET ROLE non_super_user; SELECT 1 FROM master_add_inactive_node('localhost', :worker_2_port + 1); SELECT 1 FROM master_activate_node('localhost', :worker_2_port + 1); SELECT 1 FROM master_disable_node('localhost', :worker_2_port + 1); -SELECT 1 FROM master_remove_node('localhost', :worker_2_port + 1); -SELECT 1 FROM master_add_node('localhost', :worker_2_port + 1); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port + 1); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port + 1); SELECT 1 FROM master_add_secondary_node('localhost', :worker_2_port + 2, 'localhost', :worker_2_port); SELECT master_update_node(nodeid, 'localhost', :worker_2_port + 3) FROM pg_dist_node WHERE nodeport = :worker_2_port; @@ -100,8 +100,8 @@ BEGIN; SELECT 1 FROM master_add_inactive_node('localhost', :worker_2_port + 1); SELECT 1 FROM master_activate_node('localhost', :worker_2_port + 1); SELECT 1 FROM master_disable_node('localhost', :worker_2_port + 1); -SELECT 1 FROM master_remove_node('localhost', :worker_2_port + 1); -SELECT 1 FROM master_add_node('localhost', :worker_2_port + 1); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port + 1); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port + 1); SELECT 1 FROM master_add_secondary_node('localhost', :worker_2_port + 2, 'localhost', :worker_2_port); SELECT master_update_node(nodeid, 'localhost', :worker_2_port + 3) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT nodename, nodeport, noderole FROM pg_dist_node ORDER BY nodeport; @@ -117,7 +117,7 @@ SELECT master_get_active_worker_nodes(); SELECT * FROM master_activate_node('localhost', :worker_2_port); -- try to remove a node with active placements and see that node removal is failed -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- mark all placements in the candidate node as inactive SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport=:worker_2_port \gset @@ -125,7 +125,7 @@ UPDATE pg_dist_placement SET shardstate=3 WHERE groupid=:worker_2_group; SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHERE nodeport=:worker_2_port; -- try to remove a node with only inactive placements and see that removal still fails -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); SELECT master_get_active_worker_nodes(); -- mark all placements in the candidate node as to be deleted @@ -140,15 +140,15 @@ SELECT logicalrelid, shardid, shardstate, nodename, nodeport FROM pg_dist_shard_ SELECT * INTO removed_placements FROM pg_dist_placement WHERE shardstate = 4; -- try to remove a node with only to be deleted placements and see that removal succeeds -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); SELECT master_get_active_worker_nodes(); -SELECT master_add_node('localhost', :worker_2_port, groupId := :worker_2_group); +SELECT citus_add_node('localhost', :worker_2_port, groupId := :worker_2_group); -- put removed placements back for testing purposes(in practice we wouldn't have only old placements for a shard) INSERT INTO pg_dist_placement SELECT * FROM removed_placements; -- clean-up -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); UPDATE pg_dist_placement SET shardstate=1 WHERE groupid=:worker_2_group; SET client_min_messages TO ERROR; DROP TABLE cluster_management_test_colocated; @@ -163,26 +163,26 @@ DELETE FROM pg_dist_node WHERE nodeport=:worker_2_port; SELECT * FROM cluster_management_test; -- clean-up -SELECT master_add_node('localhost', :worker_2_port) AS new_node \gset +SELECT citus_add_node('localhost', :worker_2_port) AS new_node \gset SELECT groupid AS new_group FROM pg_dist_node WHERE nodeid = :new_node \gset UPDATE pg_dist_placement SET groupid = :new_group WHERE groupid = :worker_2_group; -- test that you are allowed to remove secondary nodes even if there are placements -SELECT 1 FROM master_add_node('localhost', 9990, groupid => :new_group, noderole => 'secondary'); -SELECT master_remove_node('localhost', :worker_2_port); -SELECT master_remove_node('localhost', 9990); +SELECT 1 FROM citus_add_node('localhost', 9990, groupid => :new_group, noderole => 'secondary'); +SELECT citus_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', 9990); -- clean-up DROP TABLE cluster_management_test; -- check that adding/removing nodes are propagated to nodes with metadata -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); SELECT start_metadata_sync_to_node('localhost', :worker_1_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); \c - - - :worker_1_port SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:worker_2_port; \c - - - :master_port -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); \c - - - :worker_1_port SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:worker_2_port; \c - - - :master_port @@ -190,7 +190,7 @@ SET citus.enable_object_propagation TO off; -- prevent object propagation on add -- check that added nodes are not propagated to nodes without metadata SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); \c - - - :worker_1_port SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:worker_2_port; \c - - - :master_port @@ -198,30 +198,30 @@ SET citus.enable_object_propagation TO off; -- prevent object propagation on add -- check that removing two nodes in the same transaction works SELECT - master_remove_node('localhost', :worker_1_port), - master_remove_node('localhost', :worker_2_port); + citus_remove_node('localhost', :worker_1_port), + citus_remove_node('localhost', :worker_2_port); SELECT count(1) FROM pg_dist_node; -- check that adding two nodes in the same transaction works SELECT - master_add_node('localhost', :worker_1_port), - master_add_node('localhost', :worker_2_port); + citus_add_node('localhost', :worker_1_port), + citus_add_node('localhost', :worker_2_port); SELECT * FROM pg_dist_node ORDER BY nodeid; -- check that mixed add/remove node commands work fine inside transaction BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); COMMIT; SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:worker_2_port; SELECT start_metadata_sync_to_node('localhost', :worker_1_port); BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); -SELECT master_remove_node('localhost', :worker_2_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); COMMIT; SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:worker_2_port; @@ -231,16 +231,16 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep \c - - - :master_port SET citus.enable_object_propagation TO off; -- prevent object propagation on add node during setup -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; -SELECT 1 FROM master_add_node('localhost', :worker_1_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node; +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- check that a distributed table can be created after adding a node in a transaction SET citus.shard_count TO 4; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); CREATE TABLE temp(col1 text, col2 int); SELECT create_distributed_table('temp', 'col1'); INSERT INTO temp VALUES ('row1', 1); @@ -271,16 +271,16 @@ SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); SELECT stop_metadata_sync_to_node('localhost', :worker_2_port); -- check that you can't add a primary to a non-default cluster -SELECT master_add_node('localhost', 9999, nodecluster => 'olap'); +SELECT citus_add_node('localhost', 9999, nodecluster => 'olap'); -- check that you can't add more than one primary to a group SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport = :worker_1_port \gset -SELECT master_add_node('localhost', 9999, groupid => :worker_1_group, noderole => 'primary'); +SELECT citus_add_node('localhost', 9999, groupid => :worker_1_group, noderole => 'primary'); -- check that you can add secondaries and unavailable nodes to a group SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset -SELECT 1 FROM master_add_node('localhost', 9998, groupid => :worker_1_group, noderole => 'secondary'); -SELECT 1 FROM master_add_node('localhost', 9997, groupid => :worker_1_group, noderole => 'unavailable'); +SELECT 1 FROM citus_add_node('localhost', 9998, groupid => :worker_1_group, noderole => 'secondary'); +SELECT 1 FROM citus_add_node('localhost', 9997, groupid => :worker_1_group, noderole => 'unavailable'); -- add_inactive_node also works with secondaries SELECT 1 FROM master_add_inactive_node('localhost', 9996, groupid => :worker_2_group, noderole => 'secondary'); @@ -288,7 +288,7 @@ SELECT 1 FROM master_add_inactive_node('localhost', 9996, groupid => :worker_2_g SELECT master_add_inactive_node('localhost', 9999, groupid => :worker_2_group, nodecluster => 'olap', noderole => 'secondary'); SELECT master_activate_node('localhost', 9999); SELECT master_disable_node('localhost', 9999); -SELECT master_remove_node('localhost', 9999); +SELECT citus_remove_node('localhost', 9999); -- check that you can't manually add two primaries to a group INSERT INTO pg_dist_node (nodename, nodeport, groupid, noderole) @@ -304,10 +304,10 @@ UPDATE pg_dist_node SET nodecluster = 'olap' -- check that you /can/ add a secondary node to a non-default cluster SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset -SELECT master_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'olap'); +SELECT citus_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'olap'); -- check that super-long cluster names are truncated -SELECT master_add_node('localhost', 8887, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> +SELECT citus_add_node('localhost', 8887, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.' 'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.' 'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.' diff --git a/src/test/regress/sql/multi_drop_extension.sql b/src/test/regress/sql/multi_drop_extension.sql index 7df4a19c0..3e26cdbfd 100644 --- a/src/test/regress/sql/multi_drop_extension.sql +++ b/src/test/regress/sql/multi_drop_extension.sql @@ -26,7 +26,7 @@ BEGIN; -- not wait for replicating reference tables from other test files SET citus.replicate_reference_tables_on_activate TO OFF; - SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); + SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); create table l1 (a int unique); SELECT create_reference_table('l1'); @@ -76,8 +76,8 @@ CREATE OR REPLACE FUNCTION pg_catalog.master_create_worker_shards(table_name tex AS 'citus', $$master_create_worker_shards$$ LANGUAGE C STRICT; -- re-add the nodes to the cluster -SELECT 1 FROM master_add_node('localhost', :worker_1_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- verify that a table can be created after the extension has been dropped and recreated CREATE TABLE testtableddl(somecol int, distributecol text NOT NULL); diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 8c54452bb..20e915fb4 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -212,7 +212,7 @@ SELECT * FROM multi_extension.print_extension_changes(); ALTER EXTENSION citus UPDATE TO '9.5-1'; BEGIN; - SELECT master_add_node('localhost', :master_port, groupId=>0); + SELECT citus_add_node('localhost', :master_port, groupId=>0); CREATE TABLE citus_local_table (a int); SELECT create_citus_local_table('citus_local_table'); @@ -522,7 +522,7 @@ CREATE DATABASE another; \c another CREATE EXTENSION citus; SET citus.enable_object_propagation TO off; -- prevent distributed transactions during add node -SELECT FROM master_add_node('localhost', :worker_1_port); +SELECT FROM citus_add_node('localhost', :worker_1_port); \c - - - :worker_1_port CREATE EXTENSION citus; diff --git a/src/test/regress/sql/multi_follower_dml.sql b/src/test/regress/sql/multi_follower_dml.sql index d8cb17bb6..e8a935991 100644 --- a/src/test/regress/sql/multi_follower_dml.sql +++ b/src/test/regress/sql/multi_follower_dml.sql @@ -3,7 +3,7 @@ CREATE TABLE the_table (a int, b int, z bigserial); SELECT create_distributed_table('the_table', 'a'); -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); CREATE TABLE reference_table (a int, b int, z bigserial); SELECT create_reference_table('reference_table'); @@ -155,4 +155,4 @@ SELECT * FROM citus_local_table ORDER BY a; DROP TABLE the_table; DROP TABLE reference_table; DROP TABLE citus_local_table; -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); diff --git a/src/test/regress/sql/multi_follower_select_statements.sql b/src/test/regress/sql/multi_follower_select_statements.sql index f0e7bd404..06f814148 100644 --- a/src/test/regress/sql/multi_follower_select_statements.sql +++ b/src/test/regress/sql/multi_follower_select_statements.sql @@ -2,8 +2,8 @@ -- do some setup -SELECT 1 FROM master_add_node('localhost', :worker_1_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); CREATE TABLE the_table (a int, b int); SELECT create_distributed_table('the_table', 'a'); @@ -56,10 +56,10 @@ SELECT * FROM the_table; \c -reuse-previous=off regression - - :master_port -SELECT 1 FROM master_add_node('localhost', :follower_worker_1_port, +SELECT 1 FROM citus_add_node('localhost', :follower_worker_1_port, groupid => (SELECT groupid FROM pg_dist_node WHERE nodeport = :worker_1_port), noderole => 'secondary'); -SELECT 1 FROM master_add_node('localhost', :follower_worker_2_port, +SELECT 1 FROM citus_add_node('localhost', :follower_worker_2_port, groupid => (SELECT groupid FROM pg_dist_node WHERE nodeport = :worker_2_port), noderole => 'secondary'); diff --git a/src/test/regress/sql/multi_metadata_sync.sql b/src/test/regress/sql/multi_metadata_sync.sql index ab5247dd4..898b4cc70 100644 --- a/src/test/regress/sql/multi_metadata_sync.sql +++ b/src/test/regress/sql/multi_metadata_sync.sql @@ -91,7 +91,7 @@ SELECT count(*) FROM pg_dist_node WHERE hasmetadata=true; -- Ensure it works when run on a secondary node SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport = :worker_1_port \gset -SELECT master_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary'); +SELECT citus_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary'); SELECT start_metadata_sync_to_node('localhost', 8888); SELECT hasmetadata FROM pg_dist_node WHERE nodeport = 8888; SELECT stop_metadata_sync_to_node('localhost', 8888); @@ -529,7 +529,7 @@ CREATE TABLE pg_dist_partition_temp AS SELECT * FROM pg_dist_partition; DELETE FROM pg_dist_placement; DELETE FROM pg_dist_partition; SELECT groupid AS old_worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- the master user needs superuser permissions to change the replication model CREATE USER mx_user WITH SUPERUSER; @@ -545,7 +545,7 @@ SET citus.shard_replication_factor TO 1; SELECT create_distributed_table('mx_table', 'a'); \c - postgres - :master_port -SELECT master_add_node('localhost', :worker_2_port); +SELECT citus_add_node('localhost', :worker_2_port); SELECT start_metadata_sync_to_node('localhost', :worker_2_port); \c - mx_user - :worker_1_port @@ -642,7 +642,7 @@ SELECT "Column", "Type", "Definition" FROM index_attrs WHERE SELECT * FROM pg_dist_shard WHERE shardid=:ref_table_shardid; SELECT * FROM pg_dist_shard_placement WHERE shardid=:ref_table_shardid; --- Check that master_add_node propagates the metadata about new placements of a reference table +-- Check that citus_add_node propagates the metadata about new placements of a reference table \c - - - :master_port SELECT groupid AS old_worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset @@ -650,7 +650,7 @@ CREATE TABLE tmp_placement AS SELECT * FROM pg_dist_placement WHERE groupid = :old_worker_2_group; DELETE FROM pg_dist_placement WHERE groupid = :old_worker_2_group; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE TABLE mx_ref (col_1 int, col_2 text); SELECT create_reference_table('mx_ref'); @@ -664,7 +664,7 @@ FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE logicalrelid='mx_ref'::regclass; \c - - - :master_port -SELECT master_add_node('localhost', :worker_2_port); +SELECT citus_add_node('localhost', :worker_2_port); SELECT shardid, nodename, nodeport FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement @@ -738,11 +738,11 @@ SELECT create_reference_table('dist_table_2'); ALTER TABLE dist_table_1 ADD COLUMN b int; -SELECT master_add_node('localhost', :master_port, groupid => 0); +SELECT citus_add_node('localhost', :master_port, groupid => 0); SELECT master_disable_node('localhost', :worker_1_port); SELECT master_disable_node('localhost', :worker_2_port); -SELECT master_remove_node('localhost', :worker_1_port); -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_1_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- master_update_node should succeed SELECT nodeid AS worker_2_nodeid FROM pg_dist_node WHERE nodeport=:worker_2_port \gset @@ -755,7 +755,7 @@ SELECT pg_reload_conf(); UPDATE pg_dist_node SET metadatasynced=true WHERE nodeport=:worker_1_port; -SELECT master_add_node('localhost', :worker_2_port); +SELECT citus_add_node('localhost', :worker_2_port); SELECT start_metadata_sync_to_node('localhost', :worker_2_port); CREATE SEQUENCE mx_test_sequence_0; diff --git a/src/test/regress/sql/multi_mx_add_coordinator.sql b/src/test/regress/sql/multi_mx_add_coordinator.sql index eb22a3143..541adacab 100644 --- a/src/test/regress/sql/multi_mx_add_coordinator.sql +++ b/src/test/regress/sql/multi_mx_add_coordinator.sql @@ -12,7 +12,7 @@ SET citus.enable_alter_role_propagation TO ON; -- alter role for other than the extension owner works in enterprise, output differs accordingly ALTER ROLE reprefuser WITH CREATEDB; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); -- test that coordinator pg_dist_node entry is synced to the workers SELECT wait_until_metadata_sync(30000); @@ -157,7 +157,7 @@ alter table distributed_table ALTER COLUMN value_1 TYPE int; SET client_min_messages TO error; DROP TABLE distributed_table, referece_table, local_fkey_table; -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); -- test that coordinator pg_dist_node entry was removed from the workers SELECT wait_until_metadata_sync(30000); diff --git a/src/test/regress/sql/multi_mx_function_table_reference.sql b/src/test/regress/sql/multi_mx_function_table_reference.sql index 7b51eab04..040469ca0 100644 --- a/src/test/regress/sql/multi_mx_function_table_reference.sql +++ b/src/test/regress/sql/multi_mx_function_table_reference.sql @@ -18,7 +18,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_2_port); -- remove worker 2, so we can add it after we have created some functions that caused -- problems -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- reproduction case as described in #3378 CREATE TABLE zoop_table (x int, y decimal(4, 4)); @@ -42,7 +42,7 @@ $$; SELECT create_distributed_function('zoop(int)', '$1'); -- now add the worker back, this triggers function distribution which should not fail. -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); SELECT public.wait_until_metadata_sync(30000); -- verify typmod of zoop_table.b was propagated @@ -90,4 +90,4 @@ DROP SCHEMA function_table_reference CASCADE; -- make sure the worker is added at the end irregardless of anything failing to not make -- subsequent tests fail as well. All artifacts created during this test should have been -- dropped by the drop cascade above. -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); diff --git a/src/test/regress/sql/multi_mx_node_metadata.sql b/src/test/regress/sql/multi_mx_node_metadata.sql index c5625a59e..9e0bce227 100644 --- a/src/test/regress/sql/multi_mx_node_metadata.sql +++ b/src/test/regress/sql/multi_mx_node_metadata.sql @@ -51,7 +51,7 @@ begin end$$ LANGUAGE plpgsql; -- add a node to the cluster -SELECT master_add_node('localhost', :worker_1_port) As nodeid_1 \gset +SELECT citus_add_node('localhost', :worker_1_port) As nodeid_1 \gset SELECT nodeid, nodename, nodeport, hasmetadata, metadatasynced FROM pg_dist_node; -- create couple of tables @@ -170,7 +170,7 @@ SELECT create_reference_table('some_ref_table'); INSERT INTO some_ref_table (a) SELECT i FROM generate_series(0,10)i; BEGIN; - SELECT master_add_node('localhost', :worker_2_port) AS nodeid_2 \gset + SELECT citus_add_node('localhost', :worker_2_port) AS nodeid_2 \gset SELECT 1 FROM start_metadata_sync_to_node('localhost', :worker_2_port); -- and modifications can be read from any worker in the same transaction @@ -355,7 +355,7 @@ CREATE EXTENSION citus; \c db_to_drop - - :master_port CREATE EXTENSION citus; -SELECT master_add_node('localhost', :worker_1_port); +SELECT citus_add_node('localhost', :worker_1_port); UPDATE pg_dist_node SET hasmetadata = true; SELECT master_update_node(nodeid, 'localhost', 12345) FROM pg_dist_node; @@ -380,7 +380,7 @@ DROP SEQUENCE sequence CASCADE; DROP TABLE ref_table; DROP TABLE reference_table; TRUNCATE pg_dist_colocation; -SELECT count(*) FROM (SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node) t; +SELECT count(*) FROM (SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node) t; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART :last_group_id; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART :last_node_id; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART :last_colocation_id; diff --git a/src/test/regress/sql/multi_remove_node_reference_table.sql b/src/test/regress/sql/multi_remove_node_reference_table.sql index a79aa30ed..c60e9c4b0 100644 --- a/src/test/regress/sql/multi_remove_node_reference_table.sql +++ b/src/test/regress/sql/multi_remove_node_reference_table.sql @@ -1,7 +1,7 @@ -- -- MULTI_REMOVE_NODE_REFERENCE_TABLE -- --- Tests that check the metadata after master_remove_node. +-- Tests that check the metadata after citus_remove_node. SET citus.next_shard_id TO 1380000; @@ -18,7 +18,7 @@ DELETE FROM pg_dist_shard_placement WHERE nodeport = :worker_2_port; SELECT start_metadata_sync_to_node('localhost', :worker_1_port); -- remove non-existing node -SELECT master_remove_node('localhost', 55555); +SELECT citus_remove_node('localhost', 55555); -- remove a node with no reference tables @@ -30,7 +30,7 @@ SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; CREATE TABLE recovery_test (x int, y int); SELECT create_distributed_table('recovery_test','x'); DROP TABLE recovery_test; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); SELECT recover_prepared_transactions(); SELECT count(*) FROM pg_dist_transaction; @@ -38,17 +38,17 @@ SELECT count(*) FROM pg_dist_transaction; SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; -- re-add the node for next tests -SELECT master_add_node('localhost', :worker_2_port) AS worker_2_nodeid \gset +SELECT citus_add_node('localhost', :worker_2_port) AS worker_2_nodeid \gset SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeid=:worker_2_nodeid \gset -- add a secondary to check we don't attempt to replicate the table to it -SELECT 1 FROM master_add_node('localhost', 9000, groupid=>:worker_2_group, noderole=>'secondary'); +SELECT 1 FROM citus_add_node('localhost', 9000, groupid=>:worker_2_group, noderole=>'secondary'); -- remove a node with reference table CREATE TABLE remove_node_reference_table(column1 int); SELECT create_reference_table('remove_node_reference_table'); -- make sure when we add a secondary we don't attempt to add placements to it -SELECT 1 FROM master_add_node('localhost', 9001, groupid=>:worker_2_group, noderole=>'secondary'); +SELECT 1 FROM citus_add_node('localhost', 9001, groupid=>:worker_2_group, noderole=>'secondary'); SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group; -- make sure when we disable a secondary we don't remove any placements SELECT master_disable_node('localhost', 9001); @@ -58,10 +58,10 @@ SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group; SELECT 1 FROM master_activate_node('localhost', 9001); SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group; -- make sure when we remove a secondary we don't remove any placements -SELECT master_remove_node('localhost', 9001); +SELECT citus_remove_node('localhost', 9001); SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group; --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -91,9 +91,9 @@ WHERE \c - - - :master_port -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -110,7 +110,7 @@ WHERE colocationid IN FROM pg_dist_partition WHERE logicalrelid = 'remove_node_reference_table'::regclass); -SELECT master_remove_node('localhost', :worker_1_port); +SELECT citus_remove_node('localhost', :worker_1_port); \c - - - :worker_1_port @@ -127,21 +127,21 @@ WHERE SET citus.replicate_reference_tables_on_activate TO off; -- remove same node twice -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- try to disable the node before removing it (this used to crash) SELECT master_disable_node('localhost', :worker_2_port); -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- re-add the node for the next test -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- remove node in a transaction and ROLLBACK --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -172,10 +172,10 @@ WHERE \c - - - :master_port BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); ROLLBACK; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -207,7 +207,7 @@ WHERE -- remove node in a transaction and COMMIT --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -238,10 +238,10 @@ WHERE \c - - - :master_port BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -273,11 +273,11 @@ WHERE SET citus.replicate_reference_tables_on_activate TO off; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- test inserting a value then removing a node in a transaction --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -309,10 +309,10 @@ WHERE BEGIN; INSERT INTO remove_node_reference_table VALUES(1); -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -349,12 +349,12 @@ SELECT * FROM remove_node_reference_table; SET citus.replicate_reference_tables_on_activate TO off; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- test executing DDL command then removing a node in a transaction --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -386,10 +386,10 @@ WHERE BEGIN; ALTER TABLE remove_node_reference_table ADD column2 int; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -426,12 +426,12 @@ SET citus.next_shard_id TO 1380001; SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='public.remove_node_reference_table'::regclass; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- test DROP table after removing a node in a transaction --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -449,11 +449,11 @@ WHERE colocationid IN WHERE logicalrelid = 'remove_node_reference_table'::regclass); BEGIN; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); DROP TABLE remove_node_reference_table; COMMIT; --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -466,7 +466,7 @@ WHERE SELECT * FROM pg_dist_colocation WHERE colocationid = 1380000; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- re-create remove_node_reference_table CREATE TABLE remove_node_reference_table(column1 int); @@ -477,7 +477,7 @@ CREATE SCHEMA remove_node_reference_table_schema; CREATE TABLE remove_node_reference_table_schema.table1(column1 int); SELECT create_reference_table('remove_node_reference_table_schema.table1'); --- status before master_remove_node +-- status before citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -510,9 +510,9 @@ ORDER BY shardid; \c - - - :master_port -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); --- status after master_remove_node +-- status after citus_remove_node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; SELECT @@ -544,7 +544,7 @@ WHERE SET citus.replicate_reference_tables_on_activate TO off; -- re-add the node for next tests -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- test with master_disable_node diff --git a/src/test/regress/sql/multi_replicate_reference_table.sql b/src/test/regress/sql/multi_replicate_reference_table.sql index 497f38619..220e61afc 100644 --- a/src/test/regress/sql/multi_replicate_reference_table.sql +++ b/src/test/regress/sql/multi_replicate_reference_table.sql @@ -20,7 +20,7 @@ SELECT * FROM pg_dist_shard_placement WHERE shardid BETWEEN 1370000 AND 1380000; -- remove a node for testing purposes CREATE TABLE tmp_shard_placement AS SELECT * FROM pg_dist_shard_placement WHERE nodeport = :worker_2_port; DELETE FROM pg_dist_shard_placement WHERE nodeport = :worker_2_port; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- test adding new node with no reference tables @@ -28,7 +28,7 @@ SELECT master_remove_node('localhost', :worker_2_port); -- verify there is no node with nodeport = :worker_2_port before adding the node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- verify node is added SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; @@ -43,7 +43,7 @@ WHERE -- test adding new node with a reference table which does not have any healthy placement -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); -- verify there is no node with nodeport = :worker_2_port before adding the node SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; @@ -52,7 +52,7 @@ CREATE TABLE replicate_reference_table_unhealthy(column1 int); SELECT create_reference_table('replicate_reference_table_unhealthy'); UPDATE pg_dist_shard_placement SET shardstate = 3 WHERE shardid = 1370000; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- verify node is not added SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port; @@ -72,7 +72,7 @@ DROP TABLE replicate_reference_table_unhealthy; CREATE TABLE replicate_reference_table_valid(column1 int); SELECT create_reference_table('replicate_reference_table_valid'); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -87,9 +87,9 @@ WHERE colocationid IN FROM pg_dist_partition WHERE logicalrelid = 'replicate_reference_table_valid'::regclass); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -107,7 +107,7 @@ WHERE colocationid IN -- test add same node twice --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -122,9 +122,9 @@ WHERE colocationid IN FROM pg_dist_partition WHERE logicalrelid = 'replicate_reference_table_valid'::regclass); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -143,12 +143,12 @@ DROP TABLE replicate_reference_table_valid; -- test replicating a reference table when a new node added in TRANSACTION + ROLLBACK -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE TABLE replicate_reference_table_rollback(column1 int); SELECT create_reference_table('replicate_reference_table_rollback'); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -164,10 +164,10 @@ WHERE colocationid IN WHERE logicalrelid = 'replicate_reference_table_rollback'::regclass); BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ROLLBACK; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -189,7 +189,7 @@ DROP TABLE replicate_reference_table_rollback; CREATE TABLE replicate_reference_table_commit(column1 int); SELECT create_reference_table('replicate_reference_table_commit'); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -205,10 +205,10 @@ WHERE colocationid IN WHERE logicalrelid = 'replicate_reference_table_commit'::regclass); BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); COMMIT; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -227,7 +227,7 @@ DROP TABLE replicate_reference_table_commit; -- test adding new node + upgrading another hash distributed table to reference table + creating new reference table in TRANSACTION -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE TABLE replicate_reference_table_reference_one(column1 int); SELECT create_reference_table('replicate_reference_table_reference_one'); @@ -237,7 +237,7 @@ SET citus.shard_replication_factor TO 1; CREATE TABLE replicate_reference_table_reference_two(column1 int); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -262,11 +262,11 @@ WHERE ORDER BY logicalrelid; SET client_min_messages TO WARNING; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); SELECT create_reference_table('replicate_reference_table_reference_two'); RESET client_min_messages; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -295,14 +295,14 @@ DROP TABLE replicate_reference_table_reference_two; -- test inserting a value then adding a new node in a transaction -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE TABLE replicate_reference_table_insert(column1 int); SELECT create_reference_table('replicate_reference_table_insert'); BEGIN; INSERT INTO replicate_reference_table_insert VALUES(1); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ROLLBACK; DROP TABLE replicate_reference_table_insert; @@ -321,7 +321,7 @@ COPY replicate_reference_table_copy FROM STDIN; 4 5 \. -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ROLLBACK; RESET citus.enable_local_execution; @@ -335,7 +335,7 @@ SELECT create_reference_table('replicate_reference_table_ddl'); BEGIN; ALTER TABLE replicate_reference_table_ddl ADD column2 int; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); ROLLBACK; DROP TABLE replicate_reference_table_ddl; @@ -345,7 +345,7 @@ DROP TABLE replicate_reference_table_ddl; CREATE TABLE replicate_reference_table_drop(column1 int); SELECT create_reference_table('replicate_reference_table_drop'); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -361,11 +361,11 @@ WHERE colocationid IN WHERE logicalrelid = 'replicate_reference_table_drop'::regclass); BEGIN; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); DROP TABLE replicate_reference_table_drop; COMMIT; --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -377,13 +377,13 @@ ORDER BY shardid, nodeport; SELECT * FROM pg_dist_colocation WHERE colocationid = 1370009; -- test adding a node while there is a reference table at another schema -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE SCHEMA replicate_reference_table_schema; CREATE TABLE replicate_reference_table_schema.table1(column1 int); SELECT create_reference_table('replicate_reference_table_schema.table1'); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -398,9 +398,9 @@ WHERE colocationid IN FROM pg_dist_partition WHERE logicalrelid = 'replicate_reference_table_schema.table1'::regclass); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -420,7 +420,7 @@ DROP SCHEMA replicate_reference_table_schema CASCADE; -- test adding a node when there are foreign keys between reference tables -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE TABLE ref_table_1(id int primary key, v int); CREATE TABLE ref_table_2(id int primary key, v int references ref_table_1(id)); @@ -430,7 +430,7 @@ SELECT create_reference_table('ref_table_1'), create_reference_table('ref_table_2'), create_reference_table('ref_table_3'); --- status before master_add_node +-- status before citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -439,9 +439,9 @@ WHERE nodeport = :worker_2_port ORDER BY shardid, nodeport; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); --- status after master_add_node +-- status after citus_add_node SELECT shardid, shardstate, shardlength, nodename, nodeport FROM @@ -456,7 +456,7 @@ SELECT run_command_on_workers('select count(*) from pg_constraint where contype= DROP TABLE ref_table_1, ref_table_2, ref_table_3; -- do some tests with inactive node -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE TABLE initially_not_replicated_reference_table (key int); SELECT create_reference_table('initially_not_replicated_reference_table'); @@ -495,13 +495,13 @@ WHERE AND nodeport != :master_port ORDER BY 1,4,5; -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); CREATE TABLE ref_table(a int); SELECT create_reference_table('ref_table'); INSERT INTO ref_table SELECT * FROM generate_series(1, 10); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- verify we cannot replicate reference tables in a transaction modifying pg_dist_node BEGIN; @@ -548,7 +548,7 @@ SELECT shardid AS ref_table_shard FROM pg_dist_shard WHERE logicalrelid = 'ref_t SELECT count(*) AS ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard \gset -- remove reference table replica from worker 2 -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard; @@ -556,24 +556,24 @@ SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shard CREATE TABLE range_table(a int); SELECT create_distributed_table('range_table', 'a', 'range'); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard; SELECT 1 FROM master_create_empty_shard('range_table'); SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard; DROP TABLE range_table; -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); -- test setting citus.replicate_reference_tables_on_activate to on --- master_add_node +-- citus_add_node SET citus.replicate_reference_tables_on_activate TO on; -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard; -- master_activate_node -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); SELECT 1 FROM master_add_inactive_node('localhost', :worker_2_port); SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard; @@ -587,8 +587,8 @@ SELECT min(result) = max(result) AS consistent FROM run_command_on_placements('r -- test that metadata is synced when master_copy_shard_placement replicates -- reference table shards SET citus.replicate_reference_tables_on_activate TO off; -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); SET citus.shard_replication_factor TO 1; SELECT start_metadata_sync_to_node('localhost', :worker_1_port); @@ -605,8 +605,8 @@ FROM run_command_on_workers('SELECT count(*) FROM pg_dist_placement a, pg_dist_s WHERE nodeport=:worker_1_port; -- test that metadata is synced on replicate_reference_tables -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); SELECT replicate_reference_tables(); @@ -646,12 +646,12 @@ SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); SET citus.replicate_reference_tables_on_activate TO off; SET citus.shard_replication_factor TO 1; -SELECT master_remove_node('localhost', :worker_2_port); +SELECT citus_remove_node('localhost', :worker_2_port); CREATE TABLE ref (a int primary key, b int); SELECT create_reference_table('ref'); CREATE TABLE test (x int, y int references ref(a)); -select 1 FROM master_add_node('localhost', :worker_2_port); +select 1 FROM citus_add_node('localhost', :worker_2_port); BEGIN; DROP TABLE test; CREATE TABLE test (x int, y int references ref(a)); @@ -669,7 +669,7 @@ DECLARE BEGIN errors_received := 0; BEGIN - SELECT master_add_node('invalid-node-name', 9999); + SELECT citus_add_node('invalid-node-name', 9999); EXCEPTION WHEN OTHERS THEN IF SQLERRM LIKE 'connection to the remote node%%' THEN errors_received := errors_received + 1; diff --git a/src/test/regress/sql/multi_row_router_insert.sql b/src/test/regress/sql/multi_row_router_insert.sql index 436f51ea2..dfaeb818c 100644 --- a/src/test/regress/sql/multi_row_router_insert.sql +++ b/src/test/regress/sql/multi_row_router_insert.sql @@ -9,7 +9,7 @@ CREATE SCHEMA multi_row_router_insert; SET search_path TO multi_row_router_insert; SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; -- when using local execution, multi-row & router inserts works fine diff --git a/src/test/regress/sql/multi_sequence_default.sql b/src/test/regress/sql/multi_sequence_default.sql index 405ffac37..6123495f6 100644 --- a/src/test/regress/sql/multi_sequence_default.sql +++ b/src/test/regress/sql/multi_sequence_default.sql @@ -380,5 +380,5 @@ SET client_min_messages TO error; -- suppress cascading objects dropping DROP SCHEMA sequence_default CASCADE; SELECT run_command_on_workers('DROP SCHEMA IF EXISTS sequence_default CASCADE'); SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); SET search_path TO public; diff --git a/src/test/regress/sql/multi_table_ddl.sql b/src/test/regress/sql/multi_table_ddl.sql index 1b903217b..623d5c9b5 100644 --- a/src/test/regress/sql/multi_table_ddl.sql +++ b/src/test/regress/sql/multi_table_ddl.sql @@ -58,8 +58,8 @@ DROP EXTENSION citus; CREATE EXTENSION citus; -- re-add the nodes to the cluster -SELECT 1 FROM master_add_node('localhost', :worker_1_port); -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- create a table with a SERIAL column CREATE TABLE testserialtable(id serial, group_id integer); diff --git a/src/test/regress/sql/multi_transaction_recovery.sql b/src/test/regress/sql/multi_transaction_recovery.sql index 054b85931..214b8fecd 100644 --- a/src/test/regress/sql/multi_transaction_recovery.sql +++ b/src/test/regress/sql/multi_transaction_recovery.sql @@ -5,7 +5,7 @@ SET citus.next_shard_id TO 1220000; -- verify we recover transactions which do DML on coordinator placements -- properly. SET client_min_messages TO ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); RESET client_min_messages; -- enforce 1 connection per placement since @@ -261,4 +261,4 @@ DROP TABLE test_recovery_single; DROP TABLE test_2pcskip; DROP TABLE test_reference; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); diff --git a/src/test/regress/sql/multi_transactional_drop_shards.sql b/src/test/regress/sql/multi_transactional_drop_shards.sql index 5bc651d76..415d9bbf7 100644 --- a/src/test/regress/sql/multi_transactional_drop_shards.sql +++ b/src/test/regress/sql/multi_transactional_drop_shards.sql @@ -366,12 +366,12 @@ ORDER BY SET client_min_messages TO WARNING; -- try using the coordinator as a worker and then dropping the table -SELECT 1 FROM master_add_node('localhost', :master_port); +SELECT 1 FROM citus_add_node('localhost', :master_port); CREATE TABLE citus_local (id serial, k int); SELECT create_distributed_table('citus_local', 'id'); INSERT INTO citus_local (k) VALUES (2); DROP TABLE citus_local; -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); -- clean the workspace DROP TABLE transactional_drop_shards, transactional_drop_reference; diff --git a/src/test/regress/sql/multi_unsupported_worker_operations.sql b/src/test/regress/sql/multi_unsupported_worker_operations.sql index 94aaa96f2..fe5d2553a 100644 --- a/src/test/regress/sql/multi_unsupported_worker_operations.sql +++ b/src/test/regress/sql/multi_unsupported_worker_operations.sql @@ -127,17 +127,17 @@ SELECT count(*) FROM mx_table; SELECT 1 FROM master_add_inactive_node('localhost', 5432); SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432; --- master_remove_node +-- citus_remove_node \c - - - :master_port DROP INDEX mx_test_uniq_index; SELECT 1 FROM master_add_inactive_node('localhost', 5432); \c - - - :worker_1_port -SELECT master_remove_node('localhost', 5432); +SELECT citus_remove_node('localhost', 5432); SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432; \c - - - :master_port -SELECT master_remove_node('localhost', 5432); +SELECT citus_remove_node('localhost', 5432); \c - - - :worker_1_port diff --git a/src/test/regress/sql/mx_coordinator_shouldhaveshards.sql b/src/test/regress/sql/mx_coordinator_shouldhaveshards.sql index 44d1ed48c..8d91b8dcd 100644 --- a/src/test/regress/sql/mx_coordinator_shouldhaveshards.sql +++ b/src/test/regress/sql/mx_coordinator_shouldhaveshards.sql @@ -3,7 +3,7 @@ SET search_path TO mx_coordinator_shouldhaveshards; SET citus.shard_replication_factor to 1; SET client_min_messages TO WARNING; -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); RESET client_min_messages; SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true); @@ -90,4 +90,4 @@ SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhavesha SET client_min_messages TO ERROR; DROP SCHEMA mx_coordinator_shouldhaveshards CASCADE; -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); diff --git a/src/test/regress/sql/mx_regular_user.sql b/src/test/regress/sql/mx_regular_user.sql index c0e7c47a3..816ada128 100644 --- a/src/test/regress/sql/mx_regular_user.sql +++ b/src/test/regress/sql/mx_regular_user.sql @@ -2,7 +2,7 @@ CREATE SCHEMA "Mx Regular User"; SET search_path TO "Mx Regular User"; -- add coordinator in idempotent way -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); -- sync the metadata to both nodes SELECT start_metadata_sync_to_node('localhost', :worker_1_port); SELECT start_metadata_sync_to_node('localhost', :worker_2_port); diff --git a/src/test/regress/sql/propagate_extension_commands.sql b/src/test/regress/sql/propagate_extension_commands.sql index ad7ba749b..2c33a3f1e 100644 --- a/src/test/regress/sql/propagate_extension_commands.sql +++ b/src/test/regress/sql/propagate_extension_commands.sql @@ -91,7 +91,7 @@ DROP EXTENSION seg CASCADE; -- before remove, first remove the existing relations (due to the other tests) DROP SCHEMA "extension'test" CASCADE; -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); -- then create the extension CREATE EXTENSION seg; @@ -140,7 +140,7 @@ SELECT run_command_on_workers($$SELECT count(extnamespace) FROM pg_extension WHE SELECT run_command_on_workers($$SELECT extversion FROM pg_extension WHERE extname = 'dict_int'$$); -- and add the other node -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); -- show that the extension is created on both existing and new node SELECT run_command_on_workers($$SELECT count(extnamespace) FROM pg_extension WHERE extname = 'seg'$$); @@ -222,7 +222,7 @@ CREATE SCHEMA "extension'test"; SET search_path TO "extension'test"; -- remove the node, we'll add back again -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); -- now, create a type that depends on another type, which -- finally depends on an extension @@ -243,7 +243,7 @@ BEGIN; COMMIT; -- add the node back -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); -- make sure that both extensions are created on both nodes SELECT count(*) FROM citus.pg_dist_object WHERE objid IN (SELECT oid FROM pg_extension WHERE extname IN ('seg', 'isn')); diff --git a/src/test/regress/sql/ref_citus_local_fkeys.sql b/src/test/regress/sql/ref_citus_local_fkeys.sql index 143f3ce2f..fac7fb30a 100644 --- a/src/test/regress/sql/ref_citus_local_fkeys.sql +++ b/src/test/regress/sql/ref_citus_local_fkeys.sql @@ -10,7 +10,7 @@ SET search_path TO ref_citus_local_fkeys; -- ensure that coordinator is added to pg_dist_node SET client_min_messages to ERROR; -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); RESET client_min_messages; -- create test tables @@ -85,7 +85,7 @@ DROP TABLE citus_local_table, reference_table; -- first remove worker_2 to test the behavior when replicating a -- reference table that has a foreign key to a citus local table -- to a new node -SELECT 1 FROM master_remove_node('localhost', :worker_2_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_2_port); -- create test tables CREATE TABLE citus_local_table(l1 int primary key); @@ -128,7 +128,7 @@ INSERT INTO reference_table VALUES (4); -- enable the worker_2 to show that we don't try to set up the foreign keys -- between reference tables and citus local tables in worker_2 placements of -- the reference tables -SELECT 1 FROM master_add_node('localhost', :worker_2_port); +SELECT 1 FROM citus_add_node('localhost', :worker_2_port); -- show that we support drop constraint BEGIN; diff --git a/src/test/regress/sql/remove_coordinator.sql b/src/test/regress/sql/remove_coordinator.sql index 2db26d4d7..bbba16c76 100644 --- a/src/test/regress/sql/remove_coordinator.sql +++ b/src/test/regress/sql/remove_coordinator.sql @@ -1,2 +1,2 @@ -- removing coordinator from pg_dist_node should update pg_dist_colocation -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); diff --git a/src/test/regress/sql/replicate_reference_tables_to_coordinator.sql b/src/test/regress/sql/replicate_reference_tables_to_coordinator.sql index 0587ebfaa..1ecb6cb13 100644 --- a/src/test/regress/sql/replicate_reference_tables_to_coordinator.sql +++ b/src/test/regress/sql/replicate_reference_tables_to_coordinator.sql @@ -247,10 +247,10 @@ ALTER TABLE squares DROP COLUMN b; -- verify that we replicate the reference tables that are distributed before -- adding the coordinator as a worker. -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); -- add the coordinator as a worker node and verify that the reference tables are replicated -SELECT master_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset +SELECT citus_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset -- clean-up SET client_min_messages TO ERROR; diff --git a/src/test/regress/sql/shard_rebalancer.sql b/src/test/regress/sql/shard_rebalancer.sql index 66a36327e..ffca22368 100644 --- a/src/test/regress/sql/shard_rebalancer.sql +++ b/src/test/regress/sql/shard_rebalancer.sql @@ -11,7 +11,7 @@ CREATE TABLE postgres_table_test(a int primary key); -- make sure that all rebalance operations works fine when -- reference tables are replicated to the coordinator -SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0); -- should just be noops even if we add the coordinator to the pg_dist_node SELECT rebalance_table_shards('dist_table_test'); @@ -1211,7 +1211,7 @@ DROP TABLE tab; -- we don't need the coordinator on pg_dist_node anymore -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); -- @@ -1232,7 +1232,7 @@ SELECT create_distributed_table('dist_table_test_3', 'a'); CREATE TABLE ref_table(a int); SELECT create_reference_table('ref_table'); -SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0); SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE logicalrelid = 'ref_table'::regclass; @@ -1247,14 +1247,14 @@ SELECT replicate_table_shards('dist_table_test_3', max_shard_copies := 4, shar SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE logicalrelid = 'ref_table'::regclass; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); CREATE TABLE rebalance_test_table(int_column int); SELECT master_create_distributed_table('rebalance_test_table', 'int_column', 'append'); CALL create_unbalanced_shards('rebalance_test_table'); -SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0); SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE logicalrelid = 'ref_table'::regclass; @@ -1265,7 +1265,7 @@ SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE lo DROP TABLE dist_table_test_3, rebalance_test_table, ref_table; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); -- reference table 2 will not have a replica identity, causing the rebalancer to not work -- when ran in the default mode. Instead we need to change the shard transfer mode to make @@ -1279,7 +1279,7 @@ CREATE TABLE r2 (a int, b int); -- we remove worker 2 before creating the tables, this will allow us to have an active -- node without the reference tables -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); SELECT create_distributed_table('t1','a'); SELECT create_reference_table('r1'); @@ -1289,7 +1289,7 @@ SELECT create_reference_table('r2'); INSERT INTO r1 VALUES (1,2), (3,4); INSERT INTO r2 VALUES (1,2), (3,4); -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); SELECT rebalance_table_shards(); CALL citus_cleanup_orphaned_shards(); @@ -1303,12 +1303,12 @@ SELECT count(*) FROM pg_dist_partition; -- verify a system having only reference tables will copy the reference tables when -- executing the rebalancer -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); CREATE TABLE r1 (a int PRIMARY KEY, b int); SELECT create_reference_table('r1'); -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); -- count the number of placements for the reference table to verify it is not available on -- all nodes @@ -1335,14 +1335,14 @@ DROP TABLE r1; -- of other tables is increased. Without the copy of reference tables the replication might -- fail. -SELECT 1 from master_remove_node('localhost', :worker_2_port); +SELECT 1 from citus_remove_node('localhost', :worker_2_port); CREATE TABLE t1 (a int PRIMARY KEY, b int); CREATE TABLE r1 (a int PRIMARY KEY, b int); SELECT create_distributed_table('t1', 'a'); SELECT create_reference_table('r1'); -SELECT 1 from master_add_node('localhost', :worker_2_port); +SELECT 1 from citus_add_node('localhost', :worker_2_port); -- count the number of placements for the reference table to verify it is not available on -- all nodes diff --git a/src/test/regress/sql/single_node.sql b/src/test/regress/sql/single_node.sql index 228039d34..708d45576 100644 --- a/src/test/regress/sql/single_node.sql +++ b/src/test/regress/sql/single_node.sql @@ -16,7 +16,7 @@ SELECT 1 FROM master_disable_node('localhost', :master_port); RESET client_min_messages; -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); SELECT count(*) FROM pg_dist_node; @@ -30,7 +30,7 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met DROP TABLE ref; -- remove the coordinator to try again with create_reference_table -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; CREATE TABLE loc(x int, y int); SELECT citus_add_local_table_to_metadata('loc'); @@ -40,7 +40,7 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met DROP TABLE loc; -- remove the coordinator to try again with create_distributed_table -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; -- verify the coordinator gets auto added with the localhost guc ALTER SYSTEM SET citus.local_hostname TO '127.0.0.1'; --although not a hostname, should work for connecting locally @@ -53,7 +53,7 @@ SELECT create_distributed_table('test','x'); SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, metadatasynced FROM pg_dist_node; DROP TABLE test; -- remove the coordinator to try again -SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; +SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0; ALTER SYSTEM RESET citus.local_hostname; SELECT pg_reload_conf(); @@ -65,18 +65,18 @@ SELECT create_distributed_table('test','x'); SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, metadatasynced FROM pg_dist_node; -- cannot add workers with specific IP as long as I have a placeholder coordinator record -SELECT 1 FROM master_add_node('127.0.0.1', :worker_1_port); +SELECT 1 FROM citus_add_node('127.0.0.1', :worker_1_port); -- adding localhost workers is ok -SELECT 1 FROM master_add_node('localhost', :worker_1_port); -SELECT 1 FROM master_remove_node('localhost', :worker_1_port); +SELECT 1 FROM citus_add_node('localhost', :worker_1_port); +SELECT 1 FROM citus_remove_node('localhost', :worker_1_port); -- set the coordinator host to something different than localhost SELECT 1 FROM citus_set_coordinator_host('127.0.0.1'); -- adding workers with specific IP is ok now -SELECT 1 FROM master_add_node('127.0.0.1', :worker_1_port); -SELECT 1 FROM master_remove_node('127.0.0.1', :worker_1_port); +SELECT 1 FROM citus_add_node('127.0.0.1', :worker_1_port); +SELECT 1 FROM citus_remove_node('127.0.0.1', :worker_1_port); -- set the coordinator host back to localhost for the remainder of tests SELECT 1 FROM citus_set_coordinator_host('localhost'); @@ -1017,12 +1017,12 @@ SELECT pg_reload_conf(); SET client_min_messages TO error; -- cannot remove coordinator since a reference table exists on coordinator and no other worker nodes are added -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); -- Cleanup DROP SCHEMA single_node CASCADE; -- Remove the coordinator again -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); -- restart nodeid sequence so that multi_cluster_management still has the same -- nodeids ALTER SEQUENCE pg_dist_node_nodeid_seq RESTART 1; diff --git a/src/test/regress/sql/single_node_truncate.sql b/src/test/regress/sql/single_node_truncate.sql index 5b555ff91..422f282c7 100644 --- a/src/test/regress/sql/single_node_truncate.sql +++ b/src/test/regress/sql/single_node_truncate.sql @@ -57,7 +57,7 @@ DROP VIEW table_sizes; DROP SCHEMA single_node_truncate CASCADE; -- Remove the coordinator -SELECT 1 FROM master_remove_node('localhost', :master_port); +SELECT 1 FROM citus_remove_node('localhost', :master_port); -- restart nodeid sequence so that multi_cluster_management still has the same -- nodeids ALTER SEQUENCE pg_dist_node_nodeid_seq RESTART 1; diff --git a/src/test/regress/sql/tableam.sql b/src/test/regress/sql/tableam.sql index ab2b640a6..e9d42f8ad 100644 --- a/src/test/regress/sql/tableam.sql +++ b/src/test/regress/sql/tableam.sql @@ -65,10 +65,10 @@ SELECT * FROM master_get_table_ddl_events('test_ref'); -- replicate to coordinator SET client_min_messages TO WARNING; \set VERBOSIY terse -SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0); RESET client_min_messages; delete from test_ref; -SELECT master_remove_node('localhost', :master_port); +SELECT citus_remove_node('localhost', :master_port); -- -- Range partitioned table using a non-default table access method diff --git a/src/test/regress/sql/undistribute_table_cascade.sql b/src/test/regress/sql/undistribute_table_cascade.sql index 478df6188..4072514ad 100644 --- a/src/test/regress/sql/undistribute_table_cascade.sql +++ b/src/test/regress/sql/undistribute_table_cascade.sql @@ -9,7 +9,7 @@ SET search_path TO undistribute_table_cascade; SET client_min_messages to ERROR; -- remove coordinator if it is added to pg_dist_node -SELECT COUNT(master_remove_node(nodename, nodeport)) < 2 +SELECT COUNT(citus_remove_node(nodename, nodeport)) < 2 FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:master_port; BEGIN; @@ -25,7 +25,7 @@ BEGIN; ROLLBACK; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); CREATE TABLE reference_table_1 (col_1 INT UNIQUE, col_2 INT UNIQUE, UNIQUE (col_2, col_1)); CREATE TABLE reference_table_2 (col_1 INT UNIQUE, col_2 INT UNIQUE); diff --git a/src/test/regress/sql/undistribute_table_cascade_mx.sql b/src/test/regress/sql/undistribute_table_cascade_mx.sql index 1141fe139..2d3f91c4a 100644 --- a/src/test/regress/sql/undistribute_table_cascade_mx.sql +++ b/src/test/regress/sql/undistribute_table_cascade_mx.sql @@ -10,7 +10,7 @@ SET search_path TO undistribute_table_cascade_mx; SET client_min_messages to ERROR; -- ensure that coordinator is added to pg_dist_node -SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0); +SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0); -- ensure that we sync metadata to worker 1 & 2 SELECT 1 FROM start_metadata_sync_to_node('localhost', :worker_1_port); diff --git a/src/test/regress/upgrade/upgrade_common.py b/src/test/regress/upgrade/upgrade_common.py index cd013559c..4ce50f659 100644 --- a/src/test/regress/upgrade/upgrade_common.py +++ b/src/test/regress/upgrade/upgrade_common.py @@ -80,7 +80,7 @@ def run_pg_regress(pg_path, pg_srcdir, port, schedule): def add_workers(pg_path): for port in WORKER_PORTS: - command = "SELECT * from master_add_node('localhost', {port});".format( + command = "SELECT * from citus_add_node('localhost', {port});".format( port=port) utils.psql(pg_path, NODE_PORTS[COORDINATOR_NAME], command)