From 5b1d1dd41304bb3ba503f7cd5e66eecdef1ade49 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Fri, 6 Mar 2020 12:24:00 +0100 Subject: [PATCH] Remove unnecessary use of max_parallel_workers_per_gather --- .../expected/multi_distributed_transaction_id.out | 1 + src/test/regress/expected/multi_explain.out | 14 ++------------ src/test/regress/expected/multi_partitioning.out | 14 -------------- .../sql/multi_distributed_transaction_id.sql | 1 + src/test/regress/sql/multi_explain.sql | 7 ------- src/test/regress/sql/multi_partitioning.sql | 2 -- 6 files changed, 4 insertions(+), 35 deletions(-) diff --git a/src/test/regress/expected/multi_distributed_transaction_id.out b/src/test/regress/expected/multi_distributed_transaction_id.out index e622ff619..fbadd5cfb 100644 --- a/src/test/regress/expected/multi_distributed_transaction_id.out +++ b/src/test/regress/expected/multi_distributed_transaction_id.out @@ -142,6 +142,7 @@ INSERT INTO parallel_id_test VALUES (1234567), (1234567), (1234568), (1234568); ANALYSE parallel_id_test; SET LOCAL max_parallel_workers_per_gather TO 2; SET LOCAL parallel_tuple_cost TO 0; +SET LOCAL parallel_setup_cost TO 0; EXPLAIN (COSTS OFF) SELECT a FROM parallel_id_test WHERE a = parallel_worker_transaction_id_test(); QUERY PLAN diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out index be4497129..7ca2f509f 100644 --- a/src/test/regress/expected/multi_explain.out +++ b/src/test/regress/expected/multi_explain.out @@ -1106,21 +1106,11 @@ EXPLAIN (COSTS FALSE, FORMAT YAML) Dependent Jobs: - Map Task Count: 2 Merge Task Count: 1 --- test parallel aggregates -SET parallel_setup_cost=0; -SET parallel_tuple_cost=0; -SET min_parallel_relation_size=0; -ERROR: unrecognized configuration parameter "min_parallel_relation_size" -SET min_parallel_table_scan_size=0; -SET max_parallel_workers_per_gather=4; -- ensure local plans display correctly CREATE TABLE lineitem_clone (LIKE lineitem); EXPLAIN (COSTS FALSE) SELECT avg(l_linenumber) FROM lineitem_clone; -Finalize Aggregate - -> Gather - Workers Planned: 3 - -> Partial Aggregate - -> Parallel Seq Scan on lineitem_clone +Aggregate + -> Seq Scan on lineitem_clone -- ensure distributed plans don't break EXPLAIN (COSTS FALSE) SELECT avg(l_linenumber) FROM lineitem; Aggregate diff --git a/src/test/regress/expected/multi_partitioning.out b/src/test/regress/expected/multi_partitioning.out index 705bf57b3..ff130bc36 100644 --- a/src/test/regress/expected/multi_partitioning.out +++ b/src/test/regress/expected/multi_partitioning.out @@ -1605,13 +1605,6 @@ SELECT * FROM partitioning_hash_test JOIN partitioning_hash_join_test USING (id, (16 rows) -- set partition-wise join on and parallel to off -SELECT success FROM run_command_on_workers('alter system set max_parallel_workers_per_gather = 0'); - success ---------------------------------------------------------------------- - t - t -(2 rows) - SELECT success FROM run_command_on_workers('alter system set enable_partitionwise_join to on'); success --------------------------------------------------------------------- @@ -1716,13 +1709,6 @@ SELECT success FROM run_command_on_workers('alter system reset enable_indexonlys t (2 rows) -SELECT success FROM run_command_on_workers('alter system reset max_parallel_workers_per_gather'); - success ---------------------------------------------------------------------- - t - t -(2 rows) - SELECT success FROM run_command_on_workers('select pg_reload_conf()'); success --------------------------------------------------------------------- diff --git a/src/test/regress/sql/multi_distributed_transaction_id.sql b/src/test/regress/sql/multi_distributed_transaction_id.sql index a8f44cace..2b0ad3b9d 100644 --- a/src/test/regress/sql/multi_distributed_transaction_id.sql +++ b/src/test/regress/sql/multi_distributed_transaction_id.sql @@ -98,6 +98,7 @@ ANALYSE parallel_id_test; SET LOCAL max_parallel_workers_per_gather TO 2; SET LOCAL parallel_tuple_cost TO 0; +SET LOCAL parallel_setup_cost TO 0; EXPLAIN (COSTS OFF) SELECT a FROM parallel_id_test WHERE a = parallel_worker_transaction_id_test(); diff --git a/src/test/regress/sql/multi_explain.sql b/src/test/regress/sql/multi_explain.sql index d67d69d87..573e42dbc 100644 --- a/src/test/regress/sql/multi_explain.sql +++ b/src/test/regress/sql/multi_explain.sql @@ -485,13 +485,6 @@ EXPLAIN (COSTS FALSE, FORMAT YAML) AND o_custkey = c_custkey AND l_suppkey = s_suppkey; --- test parallel aggregates -SET parallel_setup_cost=0; -SET parallel_tuple_cost=0; -SET min_parallel_relation_size=0; -SET min_parallel_table_scan_size=0; -SET max_parallel_workers_per_gather=4; - -- ensure local plans display correctly CREATE TABLE lineitem_clone (LIKE lineitem); EXPLAIN (COSTS FALSE) SELECT avg(l_linenumber) FROM lineitem_clone; diff --git a/src/test/regress/sql/multi_partitioning.sql b/src/test/regress/sql/multi_partitioning.sql index 168189f09..e0297e54f 100644 --- a/src/test/regress/sql/multi_partitioning.sql +++ b/src/test/regress/sql/multi_partitioning.sql @@ -987,7 +987,6 @@ EXPLAIN (COSTS OFF) SELECT * FROM partitioning_hash_test JOIN partitioning_hash_join_test USING (id, subid); -- set partition-wise join on and parallel to off -SELECT success FROM run_command_on_workers('alter system set max_parallel_workers_per_gather = 0'); SELECT success FROM run_command_on_workers('alter system set enable_partitionwise_join to on'); SELECT success FROM run_command_on_workers('select pg_reload_conf()'); @@ -1009,7 +1008,6 @@ SELECT success FROM run_command_on_workers('alter system reset enable_mergejoin' SELECT success FROM run_command_on_workers('alter system reset enable_nestloop'); SELECT success FROM run_command_on_workers('alter system reset enable_indexscan'); SELECT success FROM run_command_on_workers('alter system reset enable_indexonlyscan'); -SELECT success FROM run_command_on_workers('alter system reset max_parallel_workers_per_gather'); SELECT success FROM run_command_on_workers('select pg_reload_conf()'); RESET enable_partitionwise_join;