diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out --- /tmp/cirrus-ci-build/src/test/regress/expected/select_parallel.out 2025-05-15 22:51:08.348098594 +0000 +++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/select_parallel.out 2025-05-15 22:56:57.381403065 +0000 @@ -1390,7 +1390,6 @@ select set_role_and_error(0); ERROR: division by zero CONTEXT: SQL function "set_role_and_error" statement 1 -parallel worker reset debug_parallel_query; drop function set_and_report_role(); drop function set_role_and_error(int); diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/plpgsql.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/plpgsql.out --- /tmp/cirrus-ci-build/src/test/regress/expected/plpgsql.out 2025-05-15 22:51:08.332041932 +0000 +++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/plpgsql.out 2025-05-15 22:57:13.317682433 +0000 @@ -4111,15 +4111,11 @@ $$ language plpgsql parallel safe; set debug_parallel_query to on; explain (verbose, costs off) select error_trap_test(); - QUERY PLAN ------------------------------------ - Gather - Output: (error_trap_test()) - Workers Planned: 1 - Single Copy: true - -> Result - Output: error_trap_test() -(6 rows) + QUERY PLAN +----------------------------- + Result + Output: error_trap_test() +(2 rows) select error_trap_test(); error_trap_test diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/partition_prune.out /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_prune.out --- /tmp/cirrus-ci-build/src/test/regress/expected/partition_prune.out 2025-05-15 22:51:08.328027766 +0000 +++ /tmp/cirrus-ci-build/src/bin/pg_upgrade/tmp_check/results/partition_prune.out 2025-05-15 22:57:22.945862905 +0000 @@ -4156,19 +4156,16 @@ -- Ensure that listp_12_2 is not scanned. (The nested Append is not seen in -- the plan as it's pulled in setref.c due to having just a single subnode). select explain_parallel_append('select * from listp where a = (select 1);'); - explain_parallel_append ----------------------------------------------------------------------- - Gather (actual rows=N loops=N) - Workers Planned: 2 - Workers Launched: N + explain_parallel_append +-------------------------------------------------------------- + Append (actual rows=N loops=N) InitPlan 1 -> Result (actual rows=N loops=N) - -> Parallel Append (actual rows=N loops=N) - -> Seq Scan on listp_12_1 listp_1 (actual rows=N loops=N) - Filter: (a = (InitPlan 1).col1) - -> Parallel Seq Scan on listp_12_2 listp_2 (never executed) - Filter: (a = (InitPlan 1).col1) -(10 rows) + -> Seq Scan on listp_12_1 listp_1 (actual rows=N loops=N) + Filter: (a = (InitPlan 1).col1) + -> Seq Scan on listp_12_2 listp_2 (never executed) + Filter: (a = (InitPlan 1).col1) +(7 rows) -- Like the above but throw some more complexity at the planner by adding -- a UNION ALL. We expect both sides of the union not to scan the @@ -4177,27 +4174,24 @@ 'select * from listp where a = (select 1) union all select * from listp where a = (select 2);'); - explain_parallel_append ------------------------------------------------------------------------------------ - Gather (actual rows=N loops=N) - Workers Planned: 2 - Workers Launched: N - -> Parallel Append (actual rows=N loops=N) - -> Parallel Append (actual rows=N loops=N) - InitPlan 2 - -> Result (actual rows=N loops=N) - -> Seq Scan on listp_12_1 listp_1 (never executed) - Filter: (a = (InitPlan 2).col1) - -> Parallel Seq Scan on listp_12_2 listp_2 (actual rows=N loops=N) - Filter: (a = (InitPlan 2).col1) - -> Parallel Append (actual rows=N loops=N) - InitPlan 1 - -> Result (actual rows=N loops=N) - -> Seq Scan on listp_12_1 listp_4 (actual rows=N loops=N) - Filter: (a = (InitPlan 1).col1) - -> Parallel Seq Scan on listp_12_2 listp_5 (never executed) - Filter: (a = (InitPlan 1).col1) -(18 rows) + explain_parallel_append +-------------------------------------------------------------------- + Append (actual rows=N loops=N) + -> Append (actual rows=N loops=N) + InitPlan 1 + -> Result (actual rows=N loops=N) + -> Seq Scan on listp_12_1 listp_1 (actual rows=N loops=N) + Filter: (a = (InitPlan 1).col1) + -> Seq Scan on listp_12_2 listp_2 (never executed) + Filter: (a = (InitPlan 1).col1) + -> Append (actual rows=N loops=N) + InitPlan 2 + -> Result (actual rows=N loops=N) + -> Seq Scan on listp_12_1 listp_4 (never executed) + Filter: (a = (InitPlan 2).col1) + -> Seq Scan on listp_12_2 listp_5 (actual rows=N loops=N) + Filter: (a = (InitPlan 2).col1) +(15 rows) drop table listp; reset parallel_tuple_cost;