diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/executor/execParallel.c | 20 | ||||
| -rw-r--r-- | src/test/regress/expected/select_parallel.out | 44 | ||||
| -rw-r--r-- | src/test/regress/sql/select_parallel.sql | 28 |
3 files changed, 82 insertions, 10 deletions
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c index 4741aec46de..6eed6db3355 100644 --- a/src/backend/executor/execParallel.c +++ b/src/backend/executor/execParallel.c @@ -536,7 +536,7 @@ ExecParallelRetrieveInstrumentation(PlanState *planstate, /* * Finish parallel execution. We wait for parallel workers to finish, and - * accumulate their buffer usage and instrumentation. + * accumulate their buffer usage. */ void ExecParallelFinish(ParallelExecutorInfo *pei) @@ -553,23 +553,23 @@ ExecParallelFinish(ParallelExecutorInfo *pei) for (i = 0; i < pei->pcxt->nworkers_launched; ++i) InstrAccumParallelQuery(&pei->buffer_usage[i]); - /* Finally, accumulate instrumentation, if any. */ - if (pei->instrumentation) - ExecParallelRetrieveInstrumentation(pei->planstate, - pei->instrumentation); - pei->finished = true; } /* - * Clean up whatever ParallelExecutorInfo resources still exist after - * ExecParallelFinish. We separate these routines because someone might - * want to examine the contents of the DSM after ExecParallelFinish and - * before calling this routine. + * Accumulate instrumentation, and then clean up whatever ParallelExecutorInfo + * resources still exist after ExecParallelFinish. We separate these + * routines because someone might want to examine the contents of the DSM + * after ExecParallelFinish and before calling this routine. */ void ExecParallelCleanup(ParallelExecutorInfo *pei) { + /* Accumulate instrumentation, if any. */ + if (pei->instrumentation) + ExecParallelRetrieveInstrumentation(pei->planstate, + pei->instrumentation); + if (pei->pcxt != NULL) { DestroyParallelContext(pei->pcxt); diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out index 72dd4204ace..43801e0f8a2 100644 --- a/src/test/regress/expected/select_parallel.out +++ b/src/test/regress/expected/select_parallel.out @@ -123,6 +123,50 @@ select avg(aa::int8) from a_star; 13.6538461538461538 (1 row) +-- test accumulation of stats for parallel nodes +set enable_indexscan to off; +set enable_bitmapscan to off; +set enable_material to off; +alter table tenk2 set (parallel_workers = 0); +create function explain_parallel_stats() returns setof text +language plpgsql as +$$ +declare ln text; +begin + for ln in + explain (analyze, timing off, costs off) + select count(*) from tenk1, tenk2 where + tenk1.hundred > 1 and tenk2.thousand=0 + loop + ln := regexp_replace(ln, 'Planning time: \S*', 'Planning time: xxx'); + ln := regexp_replace(ln, 'Execution time: \S*', 'Execution time: xxx'); + return next ln; + end loop; +end; +$$; +select * from explain_parallel_stats(); + explain_parallel_stats +-------------------------------------------------------------------------- + Aggregate (actual rows=1 loops=1) + -> Nested Loop (actual rows=98000 loops=1) + -> Seq Scan on tenk2 (actual rows=10 loops=1) + Filter: (thousand = 0) + Rows Removed by Filter: 9990 + -> Gather (actual rows=9800 loops=10) + Workers Planned: 4 + Workers Launched: 4 + -> Parallel Seq Scan on tenk1 (actual rows=1960 loops=50) + Filter: (hundred > 1) + Rows Removed by Filter: 40 + Planning time: xxx ms + Execution time: xxx ms +(13 rows) + +reset enable_indexscan; +reset enable_bitmapscan; +reset enable_material; +alter table tenk2 reset (parallel_workers); +drop function explain_parallel_stats(); -- test the sanity of parallel query after the active role is dropped. set force_parallel_mode=1; drop role if exists regress_parallel_worker; diff --git a/src/test/regress/sql/select_parallel.sql b/src/test/regress/sql/select_parallel.sql index af0cc558104..7defc34cb78 100644 --- a/src/test/regress/sql/select_parallel.sql +++ b/src/test/regress/sql/select_parallel.sql @@ -45,6 +45,34 @@ select avg(aa::int8) from a_star; select avg(aa::int8) from a_star; +-- test accumulation of stats for parallel nodes +set enable_indexscan to off; +set enable_bitmapscan to off; +set enable_material to off; +alter table tenk2 set (parallel_workers = 0); +create function explain_parallel_stats() returns setof text +language plpgsql as +$$ +declare ln text; +begin + for ln in + explain (analyze, timing off, costs off) + select count(*) from tenk1, tenk2 where + tenk1.hundred > 1 and tenk2.thousand=0 + loop + ln := regexp_replace(ln, 'Planning time: \S*', 'Planning time: xxx'); + ln := regexp_replace(ln, 'Execution time: \S*', 'Execution time: xxx'); + return next ln; + end loop; +end; +$$; +select * from explain_parallel_stats(); +reset enable_indexscan; +reset enable_bitmapscan; +reset enable_material; +alter table tenk2 reset (parallel_workers); +drop function explain_parallel_stats(); + -- test the sanity of parallel query after the active role is dropped. set force_parallel_mode=1; drop role if exists regress_parallel_worker; |