From 032b34ea526a03a6839583d3c1aa1feaa82028f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mehmet=20furkan=20=C5=9Fahin?= Date: Wed, 22 Nov 2017 14:35:49 +0300 Subject: [PATCH] some more parallelization --- .../expected/multi_modifying_xacts.out | 9 +++-- src/test/regress/multi_schedule | 33 +++++-------------- .../regress/sql/multi_modifying_xacts.sql | 11 ++++--- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/test/regress/expected/multi_modifying_xacts.out b/src/test/regress/expected/multi_modifying_xacts.out index 5db91962f..386aaec57 100644 --- a/src/test/regress/expected/multi_modifying_xacts.out +++ b/src/test/regress/expected/multi_modifying_xacts.out @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; -ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 1200000; +SET citus.next_shard_id TO 1200000; +SET citus.next_placement_id TO 1200000; -- =================================================================== -- test end-to-end modification functionality -- =================================================================== @@ -697,6 +697,7 @@ AND (s.logicalrelid = 'objects'::regclass OR \c - - - :worker_2_port DROP TRIGGER reject_bad ON objects_1200003; \c - - - :master_port +SET citus.next_shard_id TO 1200004; BEGIN; INSERT INTO objects VALUES (1, 'apple'); INSERT INTO labs VALUES (8, 'Aperture Science'); @@ -905,6 +906,7 @@ DROP TRIGGER reject_bad_reference ON reference_modifying_xacts_1200006; -- now create a hash distributed table and run tests -- including both the reference table and the hash -- distributed table +SET citus.next_shard_id TO 1200007; SET citus.shard_count = 4; SET citus.shard_replication_factor = 1; CREATE TABLE hash_modifying_xacts (key int, value int); @@ -1142,6 +1144,7 @@ CREATE USER test_user; NOTICE: not propagating CREATE ROLE/USER commands to worker nodes -- now connect back to the master with the new user \c - test_user - :master_port +SET citus.next_shard_id TO 1200015; CREATE TABLE reference_failure_test (key int, value int); SELECT create_reference_table('reference_failure_test'); create_reference_table @@ -1312,6 +1315,8 @@ WARNING: connection error: localhost:57638 ERROR: could not modify any active placements -- connect back to the master with the proper user to continue the tests \c - :default_user - :master_port +SET citus.next_shard_id TO 1200020; +SET citus.next_placement_id TO 1200033; -- unbreak both nodes by renaming the user back to the original name SELECT * FROM run_command_on_workers('ALTER USER test_user_new RENAME TO test_user'); nodename | nodeport | success | result diff --git a/src/test/regress/multi_schedule b/src/test/regress/multi_schedule index 857113812..03201aca4 100644 --- a/src/test/regress/multi_schedule +++ b/src/test/regress/multi_schedule @@ -47,7 +47,8 @@ test: multi_basic_queries multi_complex_expressions multi_subquery multi_subquer test: multi_subquery_complex_reference_clause multi_subquery_window_functions multi_view multi_sql_function multi_prepare_sql test: multi_subquery_in_where_reference_clause test: multi_subquery_union multi_subquery_in_where_clause multi_subquery_misc -test: multi_agg_distinct multi_agg_approximate_distinct multi_limit_clause_approximate multi_reference_table multi_outer_join_reference multi_single_relation_subquery multi_prepare_plsql +test: multi_agg_distinct multi_agg_approximate_distinct multi_limit_clause_approximate multi_outer_join_reference multi_single_relation_subquery multi_prepare_plsql +test: multi_reference_table test: multi_average_expression multi_working_columns multi_having_pushdown test: multi_array_agg multi_limit_clause test: multi_agg_type_conversion multi_count_type_conversion @@ -80,9 +81,7 @@ test: multi_join_order_tpch_large # new shards before these tests, as they expect specific shard identifiers in # the output. # ---------- -test: multi_large_table_join_planning -test: multi_large_table_pruning -test: multi_large_table_task_assignment +test: multi_large_table_join_planning multi_large_table_pruning multi_large_table_task_assignment # ---------- # Tests to check our large record loading and shard deletion behavior @@ -129,33 +128,19 @@ test: multi_outer_join # is independed from the rest of the group, it is added to increase parallelism. # --- test: multi_create_fdw -test: multi_complex_count_distinct multi_select_distinct +test: multi_complex_count_distinct multi_select_distinct multi_modifications test: multi_distribution_metadata -test: multi_generate_ddl_commands -test: multi_create_shards -test: multi_prune_shard_list -test: multi_repair_shards -test: multi_modifications -test: multi_upsert -test: multi_simple_queries -test: multi_create_insert_proxy -test: multi_data_types -test: multi_utilities -test: multi_repartition_udt -test: multi_repartitioned_subquery_udf -test: multi_modifying_xacts +test: multi_generate_ddl_commands multi_create_shards multi_prune_shard_list multi_repair_shards +test: multi_upsert multi_simple_queries multi_create_insert_proxy multi_data_types +test: multi_utilities multi_modifying_xacts +test: multi_repartition_udt multi_repartitioned_subquery_udf multi_subtransactions test: multi_transaction_recovery -test: multi_subtransactions # --------- # multi_copy creates hash and range-partitioned tables and performs COPY -# --------- -test: multi_copy - -# --------- # multi_router_planner creates hash partitioned tables. # --------- -test: multi_router_planner +test: multi_copy multi_router_planner # ---------- # multi_large_shardid loads more lineitem data using high shard identifiers diff --git a/src/test/regress/sql/multi_modifying_xacts.sql b/src/test/regress/sql/multi_modifying_xacts.sql index 6705ded9c..7b575136c 100644 --- a/src/test/regress/sql/multi_modifying_xacts.sql +++ b/src/test/regress/sql/multi_modifying_xacts.sql @@ -1,6 +1,6 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; -ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 1200000; +SET citus.next_shard_id TO 1200000; +SET citus.next_placement_id TO 1200000; -- =================================================================== -- test end-to-end modification functionality @@ -542,7 +542,7 @@ AND (s.logicalrelid = 'objects'::regclass OR DROP TRIGGER reject_bad ON objects_1200003; \c - - - :master_port - +SET citus.next_shard_id TO 1200004; BEGIN; INSERT INTO objects VALUES (1, 'apple'); INSERT INTO labs VALUES (8, 'Aperture Science'); @@ -699,6 +699,7 @@ DROP TRIGGER reject_bad_reference ON reference_modifying_xacts_1200006; -- now create a hash distributed table and run tests -- including both the reference table and the hash -- distributed table +SET citus.next_shard_id TO 1200007; SET citus.shard_count = 4; SET citus.shard_replication_factor = 1; CREATE TABLE hash_modifying_xacts (key int, value int); @@ -872,6 +873,7 @@ CREATE USER test_user; -- now connect back to the master with the new user \c - test_user - :master_port +SET citus.next_shard_id TO 1200015; CREATE TABLE reference_failure_test (key int, value int); SELECT create_reference_table('reference_failure_test'); @@ -975,7 +977,8 @@ INSERT INTO numbers_hash_failure_test VALUES (2,2); -- connect back to the master with the proper user to continue the tests \c - :default_user - :master_port - +SET citus.next_shard_id TO 1200020; +SET citus.next_placement_id TO 1200033; -- unbreak both nodes by renaming the user back to the original name SELECT * FROM run_command_on_workers('ALTER USER test_user_new RENAME TO test_user');