Skip to content

Commit eeb60e4

Browse files
macdicemacdice
committed
Drop SERIALIZABLE workaround from parallel query tests.
SERIALIZABLE no longer inhibits parallelism, so we can drop some outdated workarounds and comments from regression tests. The change came in release 12, commit bb16aba, but it's not really worth back-patching. Also fix a typo. Reviewed-by: Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com> Discussion: https://postgr.es/m/CA%2BhUKGJUaHeK%3DHLATxF1JOKDjKJVrBKA-zmbPAebOM0Se2FQRg%40mail.gmail.com
1 parent d75288f commit eeb60e4

10 files changed

+14
-30
lines changed

‎src/test/regress/expected/aggregates.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,7 +2411,7 @@ ROLLBACK;
24112411
-- Secondly test the case of a parallel aggregate combiner function
24122412
-- returning NULL. For that use normal transition function, but a
24132413
-- combiner function returning NULL.
2414-
BEGIN ISOLATION LEVEL REPEATABLE READ;
2414+
BEGIN;
24152415
CREATE FUNCTION balkifnull(int8, int8)
24162416
RETURNS int8
24172417
PARALLEL SAFE
@@ -2453,7 +2453,7 @@ SELECT balk(hundred) FROM tenk1;
24532453

24542454
ROLLBACK;
24552455
-- test coverage for aggregate combine/serial/deserial functions
2456-
BEGIN ISOLATION LEVEL REPEATABLE READ;
2456+
BEGIN;
24572457
SET parallel_setup_cost = 0;
24582458
SET parallel_tuple_cost = 0;
24592459
SET min_parallel_table_scan_size = 0;

‎src/test/regress/expected/explain.out

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,7 @@ rollback;
293293
-- actually get (maybe none at all), we can't examine the "Workers" output
294294
-- in any detail. We can check that it parses correctly as JSON, and then
295295
-- remove it from the displayed results.
296-
-- Serializable isolation would disable parallel query, so explicitly use an
297-
-- arbitrary other level.
298-
begin isolation level repeatable read;
296+
begin;
299297
-- encourage use of parallel plans
300298
set parallel_setup_cost=0;
301299
set parallel_tuple_cost=0;

‎src/test/regress/expected/insert_parallel.out

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ insert into test_data select * from generate_series(1,10);
5252
--
5353
-- END: setup some tables and data needed by the tests.
5454
--
55-
-- Serializable isolation would disable parallel query, so explicitly use an
56-
-- arbitrary other level.
57-
begin isolation level repeatable read;
55+
begin;
5856
-- encourage use of parallel plans
5957
set parallel_setup_cost=0;
6058
set parallel_tuple_cost=0;

‎src/test/regress/expected/select_parallel.out

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
--
44
create function sp_parallel_restricted(int) returns int as
55
$$begin return $1; end$$ language plpgsql parallel restricted;
6-
-- Serializable isolation would disable parallel query, so explicitly use an
7-
-- arbitrary other level.
8-
begin isolation level repeatable read;
6+
begin;
97
-- encourage use of parallel plans
108
set parallel_setup_cost=0;
119
set parallel_tuple_cost=0;

‎src/test/regress/expected/write_parallel.out

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
--
22
-- PARALLEL
33
--
4-
-- Serializable isolation would disable parallel query, so explicitly use an
5-
-- arbitrary other level.
6-
begin isolation level repeatable read;
4+
begin;
75
-- encourage use of parallel plans
86
set parallel_setup_cost=0;
97
set parallel_tuple_cost=0;
108
set min_parallel_table_scan_size=0;
119
set max_parallel_workers_per_gather=4;
1210
--
13-
-- Test write operations that has an underlying query that is eligble
11+
-- Test write operations that has an underlying query that is eligible
1412
-- for parallel plans
1513
--
1614
explain (costs off) create table parallel_write as

‎src/test/regress/sql/aggregates.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ ROLLBACK;
10021002
-- Secondly test the case of a parallel aggregate combiner function
10031003
-- returning NULL. For that use normal transition function, but a
10041004
-- combiner function returning NULL.
1005-
BEGIN ISOLATION LEVEL REPEATABLE READ;
1005+
BEGIN;
10061006
CREATE FUNCTION balkifnull(int8, int8)
10071007
RETURNS int8
10081008
PARALLEL SAFE
@@ -1035,7 +1035,7 @@ SELECT balk(hundred) FROM tenk1;
10351035
ROLLBACK;
10361036

10371037
-- test coverage for aggregate combine/serial/deserial functions
1038-
BEGIN ISOLATION LEVEL REPEATABLE READ;
1038+
BEGIN;
10391039

10401040
SET parallel_setup_cost = 0;
10411041
SET parallel_tuple_cost = 0;

‎src/test/regress/sql/explain.sql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ rollback;
8383
-- in any detail. We can check that it parses correctly as JSON, and then
8484
-- remove it from the displayed results.
8585

86-
-- Serializable isolation would disable parallel query, so explicitly use an
87-
-- arbitrary other level.
88-
begin isolation level repeatable read;
86+
begin;
8987
-- encourage use of parallel plans
9088
set parallel_setup_cost=0;
9189
set parallel_tuple_cost=0;

‎src/test/regress/sql/insert_parallel.sql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ insert into test_data select * from generate_series(1,10);
6666
-- END: setup some tables and data needed by the tests.
6767
--
6868

69-
-- Serializable isolation would disable parallel query, so explicitly use an
70-
-- arbitrary other level.
71-
begin isolation level repeatable read;
69+
begin;
7270

7371
-- encourage use of parallel plans
7472
set parallel_setup_cost=0;

‎src/test/regress/sql/select_parallel.sql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
create function sp_parallel_restricted(int) returns int as
66
$$begin return $1; end$$ language plpgsql parallel restricted;
77

8-
-- Serializable isolation would disable parallel query, so explicitly use an
9-
-- arbitrary other level.
10-
begin isolation level repeatable read;
8+
begin;
119

1210
-- encourage use of parallel plans
1311
set parallel_setup_cost=0;

‎src/test/regress/sql/write_parallel.sql

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
-- PARALLEL
33
--
44

5-
-- Serializable isolation would disable parallel query, so explicitly use an
6-
-- arbitrary other level.
7-
begin isolation level repeatable read;
5+
begin;
86

97
-- encourage use of parallel plans
108
set parallel_setup_cost=0;
@@ -13,7 +11,7 @@ set min_parallel_table_scan_size=0;
1311
set max_parallel_workers_per_gather=4;
1412

1513
--
16-
-- Test write operations that has an underlying query that is eligble
14+
-- Test write operations that has an underlying query that is eligible
1715
-- for parallel plans
1816
--
1917
explain (costs off) create table parallel_write as

0 commit comments

Comments
 (0)