diff --git a/src/test/regress/expected/multi_mx_create_table.out b/src/test/regress/expected/multi_mx_create_table.out index 45a488c6d..67e474ab9 100644 --- a/src/test/regress/expected/multi_mx_create_table.out +++ b/src/test/regress/expected/multi_mx_create_table.out @@ -459,28 +459,28 @@ FROM pg_dist_partition NATURAL JOIN shard_counts ORDER BY colocationid, logicalrelid; logicalrelid | colocationid | shard_count | partmethod | repmodel --------------------------------------------------------+--------------+-------------+------------+---------- - citus_mx_test_schema_join_1.nation_hash | 3 | 4 | h | s - citus_mx_test_schema_join_1.nation_hash_2 | 3 | 4 | h | s - citus_mx_test_schema_join_2.nation_hash | 3 | 4 | h | s - citus_mx_test_schema.nation_hash_collation_search_path | 3 | 4 | h | s - citus_mx_test_schema.nation_hash_composite_types | 3 | 4 | h | s - mx_ddl_table | 3 | 4 | h | s - app_analytics_events_mx | 3 | 4 | h | s - company_employees_mx | 3 | 4 | h | s - customer_mx | 4 | 1 | n | t - nation_mx | 4 | 1 | n | t - part_mx | 4 | 1 | n | t - supplier_mx | 4 | 1 | n | t nation_hash | 1390000 | 16 | h | s citus_mx_test_schema.nation_hash | 1390000 | 16 | h | s - lineitem_mx | 1390001 | 16 | h | s - orders_mx | 1390001 | 16 | h | s - limit_orders_mx | 1390002 | 2 | h | s - articles_hash_mx | 1390002 | 2 | h | s - multiple_hash_mx | 1390003 | 2 | h | s - researchers_mx | 1390004 | 2 | h | s - labs_mx | 1390005 | 1 | h | s - objects_mx | 1390005 | 1 | h | s - articles_single_shard_hash_mx | 1390005 | 1 | h | s + citus_mx_test_schema_join_1.nation_hash | 1390001 | 4 | h | s + citus_mx_test_schema_join_1.nation_hash_2 | 1390001 | 4 | h | s + citus_mx_test_schema_join_2.nation_hash | 1390001 | 4 | h | s + citus_mx_test_schema.nation_hash_collation_search_path | 1390001 | 4 | h | s + citus_mx_test_schema.nation_hash_composite_types | 1390001 | 4 | h | s + mx_ddl_table | 1390001 | 4 | h | s + app_analytics_events_mx | 1390001 | 4 | h | s + company_employees_mx | 1390001 | 4 | h | s + lineitem_mx | 1390002 | 16 | h | s + orders_mx | 1390002 | 16 | h | s + customer_mx | 1390003 | 1 | n | t + nation_mx | 1390003 | 1 | n | t + part_mx | 1390003 | 1 | n | t + supplier_mx | 1390003 | 1 | n | t + limit_orders_mx | 1390004 | 2 | h | s + articles_hash_mx | 1390004 | 2 | h | s + multiple_hash_mx | 1390005 | 2 | h | s + researchers_mx | 1390006 | 2 | h | s + labs_mx | 1390007 | 1 | h | s + objects_mx | 1390007 | 1 | h | s + articles_single_shard_hash_mx | 1390007 | 1 | h | s (23 rows) diff --git a/src/test/regress/expected/multi_mx_hide_shard_names.out b/src/test/regress/expected/multi_mx_hide_shard_names.out index 94c2c7369..9a803565f 100644 --- a/src/test/regress/expected/multi_mx_hide_shard_names.out +++ b/src/test/regress/expected/multi_mx_hide_shard_names.out @@ -1,18 +1,18 @@ -- -- Hide shard names on MX worker nodes -- -SET citus.next_shard_id TO 1130000; +ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1130000; -- make sure that the signature of the citus_table_is_visible -- and pg_table_is_visible are the same since the logic -- relies on that -SELECT - proname, proisstrict, proretset, provolatile, - proparallel, pronargs, pronargdefaults ,prorettype, - proargtypes, proacl -FROM - pg_proc -WHERE - proname LIKE '%table_is_visible%' +SELECT + proname, proisstrict, proretset, provolatile, + proparallel, pronargs, pronargdefaults ,prorettype, + proargtypes, proacl +FROM + pg_proc +WHERE + proname LIKE '%table_is_visible%' ORDER BY 1; proname | proisstrict | proretset | provolatile | proparallel | pronargs | pronargdefaults | prorettype | proargtypes | proacl ------------------------+-------------+-----------+-------------+-------------+----------+-----------------+------------+-------------+-------- @@ -56,9 +56,10 @@ SELECT * FROM citus_shard_indexes_on_worker; --------+------+------+-------+------- (0 rows) --- now show that we see the shards, but not the +-- now show that we see the shards, but not the -- indexes as there are no indexes \c - - - :worker_1_port +SET citus.next_shard_id TO 1330000; SET search_path TO 'mx_hide_shard_names'; SELECT * FROM citus_shards_on_worker ORDER BY 2; Schema | Name | Type | Owner @@ -75,14 +76,14 @@ SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; -- also show that nested calls to pg_table_is_visible works fine -- if both of the calls to the pg_table_is_visible haven't been -- replaced, we would get 0 rows in the output -SELECT - pg_table_is_visible((SELECT - "t1"."Name"::regclass - FROM - citus_shards_on_worker as t1 - WHERE - NOT pg_table_is_visible("t1"."Name"::regclass) - LIMIT +SELECT + pg_table_is_visible((SELECT + "t1"."Name"::regclass + FROM + citus_shards_on_worker as t1 + WHERE + NOT pg_table_is_visible("t1"."Name"::regclass) + LIMIT 1)); pg_table_is_visible --------------------- @@ -93,7 +94,7 @@ SELECT \c - - - :master_port SET search_path TO 'mx_hide_shard_names'; CREATE INDEX test_index ON mx_hide_shard_names.test_table(id); --- now show that we see the shards, and the +-- now show that we see the shards, and the -- indexes as well \c - - - :worker_1_port SET search_path TO 'mx_hide_shard_names'; @@ -111,7 +112,7 @@ SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; mx_hide_shard_names | test_index_1130002 | index | postgres | test_table_1130002 (2 rows) --- we should be able to select from the shards directly if we +-- we should be able to select from the shards directly if we -- know the name of the tables SELECT count(*) FROM test_table_1130000; count @@ -152,16 +153,16 @@ SELECT create_distributed_table('test_table_102008', 'id'); SET search_path TO 'mx_hide_shard_names'; -- existing shard ids appended to a local table name -- note that we cannot create a distributed or local table --- with the same name since a table with the same +-- with the same name since a table with the same -- name already exists :) CREATE TABLE test_table_2_1130000(id int, time date); SELECT * FROM citus_shards_on_worker ORDER BY 2; - Schema | Name | Type | Owner ----------------------+--------------------------+-------+---------- - mx_hide_shard_names | test_table_102008_102012 | table | postgres - mx_hide_shard_names | test_table_102008_102014 | table | postgres - mx_hide_shard_names | test_table_1130000 | table | postgres - mx_hide_shard_names | test_table_1130002 | table | postgres + Schema | Name | Type | Owner +---------------------+---------------------------+-------+---------- + mx_hide_shard_names | test_table_102008_1130004 | table | postgres + mx_hide_shard_names | test_table_102008_1130006 | table | postgres + mx_hide_shard_names | test_table_1130000 | table | postgres + mx_hide_shard_names | test_table_1130002 | table | postgres (4 rows) \d @@ -191,12 +192,12 @@ CREATE INDEX test_index ON mx_hide_shard_names_2.test_table(id); \c - - - :worker_1_port SET search_path TO 'mx_hide_shard_names'; SELECT * FROM citus_shards_on_worker ORDER BY 2; - Schema | Name | Type | Owner ----------------------+--------------------------+-------+---------- - mx_hide_shard_names | test_table_102008_102012 | table | postgres - mx_hide_shard_names | test_table_102008_102014 | table | postgres - mx_hide_shard_names | test_table_1130000 | table | postgres - mx_hide_shard_names | test_table_1130002 | table | postgres + Schema | Name | Type | Owner +---------------------+---------------------------+-------+---------- + mx_hide_shard_names | test_table_102008_1130004 | table | postgres + mx_hide_shard_names | test_table_102008_1130006 | table | postgres + mx_hide_shard_names | test_table_1130000 | table | postgres + mx_hide_shard_names | test_table_1130002 | table | postgres (4 rows) SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; @@ -208,17 +209,17 @@ SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; SET search_path TO 'mx_hide_shard_names_2'; SELECT * FROM citus_shards_on_worker ORDER BY 2; - Schema | Name | Type | Owner ------------------------+-------------------+-------+---------- - mx_hide_shard_names_2 | test_table_102016 | table | postgres - mx_hide_shard_names_2 | test_table_102018 | table | postgres + Schema | Name | Type | Owner +-----------------------+--------------------+-------+---------- + mx_hide_shard_names_2 | test_table_1130008 | table | postgres + mx_hide_shard_names_2 | test_table_1130010 | table | postgres (2 rows) SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; - Schema | Name | Type | Owner | Table ------------------------+-------------------+-------+----------+------------------- - mx_hide_shard_names_2 | test_index_102016 | index | postgres | test_table_102016 - mx_hide_shard_names_2 | test_index_102018 | index | postgres | test_table_102018 + Schema | Name | Type | Owner | Table +-----------------------+--------------------+-------+----------+-------------------- + mx_hide_shard_names_2 | test_index_1130008 | index | postgres | test_table_1130008 + mx_hide_shard_names_2 | test_index_1130010 | index | postgres | test_table_1130010 (2 rows) SET search_path TO 'mx_hide_shard_names_2, mx_hide_shard_names'; @@ -254,8 +255,8 @@ SET search_path TO 'mx_hide_shard_names_3'; SELECT * FROM citus_shards_on_worker ORDER BY 2; Schema | Name | Type | Owner -----------------------+-----------------------------------------------------------------+-------+---------- - mx_hide_shard_names_3 | too_long_12345678901234567890123456789012345678_e0119164_102020 | table | postgres - mx_hide_shard_names_3 | too_long_12345678901234567890123456789012345678_e0119164_102022 | table | postgres + mx_hide_shard_names_3 | too_long_1234567890123456789012345678901234567_e0119164_1130012 | table | postgres + mx_hide_shard_names_3 | too_long_1234567890123456789012345678901234567_e0119164_1130014 | table | postgres (2 rows) \d @@ -284,17 +285,17 @@ SELECT create_distributed_table('"CiTuS.TeeN"."TeeNTabLE.1!?!"', 'TeNANt_Id'); \c - - - :worker_1_port SET search_path TO "CiTuS.TeeN"; SELECT * FROM citus_shards_on_worker ORDER BY 2; - Schema | Name | Type | Owner -------------+-----------------------+-------+---------- - CiTuS.TeeN | TeeNTabLE.1!?!_102024 | table | postgres - CiTuS.TeeN | TeeNTabLE.1!?!_102026 | table | postgres + Schema | Name | Type | Owner +------------+------------------------+-------+---------- + CiTuS.TeeN | TeeNTabLE.1!?!_1130016 | table | postgres + CiTuS.TeeN | TeeNTabLE.1!?!_1130018 | table | postgres (2 rows) SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; - Schema | Name | Type | Owner | Table -------------+----------------------+-------+----------+----------------------- - CiTuS.TeeN | MyTenantIndex_102024 | index | postgres | TeeNTabLE.1!?!_102024 - CiTuS.TeeN | MyTenantIndex_102026 | index | postgres | TeeNTabLE.1!?!_102026 + Schema | Name | Type | Owner | Table +------------+-----------------------+-------+----------+------------------------ + CiTuS.TeeN | MyTenantIndex_1130016 | index | postgres | TeeNTabLE.1!?!_1130016 + CiTuS.TeeN | MyTenantIndex_1130018 | index | postgres | TeeNTabLE.1!?!_1130018 (2 rows) \d diff --git a/src/test/regress/multi_mx_schedule b/src/test/regress/multi_mx_schedule index eca2b9f26..71d4ab125 100644 --- a/src/test/regress/multi_mx_schedule +++ b/src/test/regress/multi_mx_schedule @@ -19,10 +19,10 @@ test: multi_cluster_management test: multi_test_helpers # the following test has to be run sequentially +test: multi_mx_create_table test: multi_mx_hide_shard_names test: multi_mx_modifications_to_reference_tables test: multi_mx_partitioning -test: multi_mx_create_table test: multi_mx_copy_data multi_mx_router_planner test: multi_mx_schema_support multi_mx_tpch_query1 multi_mx_tpch_query10 test: multi_mx_tpch_query12 multi_mx_tpch_query14 multi_mx_tpch_query19 @@ -31,7 +31,7 @@ test: multi_mx_tpch_query7_nested multi_mx_ddl test: recursive_dml_queries_mx multi_mx_truncate_from_worker test: multi_mx_repartition_udt_prepare mx_foreign_key_to_reference_table test: multi_mx_repartition_join_w1 multi_mx_repartition_join_w2 multi_mx_repartition_udt_w1 multi_mx_repartition_udt_w2 -test: multi_mx_metadata +test: multi_mx_metadata test: multi_mx_call test: multi_mx_function_call_delegation test: multi_mx_modifications local_shard_execution diff --git a/src/test/regress/mx_base_schedule b/src/test/regress/mx_base_schedule index 03c0a6ca0..6452ea5dc 100644 --- a/src/test/regress/mx_base_schedule +++ b/src/test/regress/mx_base_schedule @@ -5,4 +5,4 @@ test: multi_cluster_management test: multi_test_helpers # the following test has to be run sequentially -test: base_enable_mx +test: multi_mx_create_table diff --git a/src/test/regress/sql/multi_mx_hide_shard_names.sql b/src/test/regress/sql/multi_mx_hide_shard_names.sql index 87a3b15d3..76e8a0345 100644 --- a/src/test/regress/sql/multi_mx_hide_shard_names.sql +++ b/src/test/regress/sql/multi_mx_hide_shard_names.sql @@ -2,20 +2,20 @@ -- Hide shard names on MX worker nodes -- -SET citus.next_shard_id TO 1130000; +ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1130000; -- make sure that the signature of the citus_table_is_visible -- and pg_table_is_visible are the same since the logic -- relies on that -SELECT - proname, proisstrict, proretset, provolatile, - proparallel, pronargs, pronargdefaults ,prorettype, - proargtypes, proacl -FROM - pg_proc -WHERE - proname LIKE '%table_is_visible%' +SELECT + proname, proisstrict, proretset, provolatile, + proparallel, pronargs, pronargdefaults ,prorettype, + proargtypes, proacl +FROM + pg_proc +WHERE + proname LIKE '%table_is_visible%' ORDER BY 1; CREATE SCHEMA mx_hide_shard_names; @@ -36,9 +36,10 @@ SELECT create_distributed_table('test_table', 'id'); SELECT * FROM citus_shards_on_worker; SELECT * FROM citus_shard_indexes_on_worker; --- now show that we see the shards, but not the +-- now show that we see the shards, but not the -- indexes as there are no indexes \c - - - :worker_1_port +SET citus.next_shard_id TO 1330000; SET search_path TO 'mx_hide_shard_names'; SELECT * FROM citus_shards_on_worker ORDER BY 2; SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; @@ -46,14 +47,14 @@ SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; -- also show that nested calls to pg_table_is_visible works fine -- if both of the calls to the pg_table_is_visible haven't been -- replaced, we would get 0 rows in the output -SELECT - pg_table_is_visible((SELECT - "t1"."Name"::regclass - FROM - citus_shards_on_worker as t1 - WHERE - NOT pg_table_is_visible("t1"."Name"::regclass) - LIMIT +SELECT + pg_table_is_visible((SELECT + "t1"."Name"::regclass + FROM + citus_shards_on_worker as t1 + WHERE + NOT pg_table_is_visible("t1"."Name"::regclass) + LIMIT 1)); -- now create an index @@ -61,14 +62,14 @@ SELECT SET search_path TO 'mx_hide_shard_names'; CREATE INDEX test_index ON mx_hide_shard_names.test_table(id); --- now show that we see the shards, and the +-- now show that we see the shards, and the -- indexes as well \c - - - :worker_1_port SET search_path TO 'mx_hide_shard_names'; SELECT * FROM citus_shards_on_worker ORDER BY 2; SELECT * FROM citus_shard_indexes_on_worker ORDER BY 2; --- we should be able to select from the shards directly if we +-- we should be able to select from the shards directly if we -- know the name of the tables SELECT count(*) FROM test_table_1130000; @@ -95,7 +96,7 @@ SET search_path TO 'mx_hide_shard_names'; -- existing shard ids appended to a local table name -- note that we cannot create a distributed or local table --- with the same name since a table with the same +-- with the same name since a table with the same -- name already exists :) CREATE TABLE test_table_2_1130000(id int, time date);