Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7b3f850

Browse files
committed
Revert "Fix accumulation of parallel worker instrumentation."
This reverts commit778e78a. Perfurther discussion, that doesn't seem to be the best possible fix.Discussion:http://postgr.es/m/CAA4eK1LW2aFKzY3=vwvc=t-juzPPVWP2uT1bpx_MeyEqnM+p8g@mail.gmail.com
1 parentc55253b commit7b3f850

File tree

3 files changed

+13
-66
lines changed

3 files changed

+13
-66
lines changed

‎src/backend/executor/execParallel.c

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -612,19 +612,6 @@ ExecParallelReinitialize(PlanState *planstate,
612612
/* Old workers must already be shut down */
613613
Assert(pei->finished);
614614

615-
/* Clear the instrumentation space from the last round. */
616-
if (pei->instrumentation)
617-
{
618-
Instrumentation*instrument;
619-
SharedExecutorInstrumentation*sh_instr;
620-
inti;
621-
622-
sh_instr=pei->instrumentation;
623-
instrument=GetInstrumentationArray(sh_instr);
624-
for (i=0;i<sh_instr->num_workers*sh_instr->num_plan_nodes;++i)
625-
InstrInit(&instrument[i],pei->planstate->state->es_instrument);
626-
}
627-
628615
ReinitializeParallelDSM(pei->pcxt);
629616
pei->tqueue=ExecParallelSetupTupleQueues(pei->pcxt, true);
630617
pei->reader=NULL;
@@ -712,33 +699,21 @@ ExecParallelRetrieveInstrumentation(PlanState *planstate,
712699
for (n=0;n<instrumentation->num_workers;++n)
713700
InstrAggNode(planstate->instrument,&instrument[n]);
714701

715-
if (!planstate->worker_instrument)
716-
{
717-
/*
718-
* Allocate space for the per-worker detail.
719-
*
720-
* Worker instrumentation should be allocated in the same context as
721-
* the regular instrumentation information, which is the per-query
722-
* context. Switch into per-query memory context.
723-
*/
724-
oldcontext=MemoryContextSwitchTo(planstate->state->es_query_cxt);
725-
ibytes=
726-
mul_size(instrumentation->num_workers,sizeof(Instrumentation));
727-
planstate->worker_instrument=
728-
palloc(ibytes+ offsetof(WorkerInstrumentation,instrument));
729-
MemoryContextSwitchTo(oldcontext);
730-
731-
for (n=0;n<instrumentation->num_workers;++n)
732-
InstrInit(&planstate->worker_instrument->instrument[n],
733-
planstate->state->es_instrument);
734-
}
702+
/*
703+
* Also store the per-worker detail.
704+
*
705+
* Worker instrumentation should be allocated in the same context as the
706+
* regular instrumentation information, which is the per-query context.
707+
* Switch into per-query memory context.
708+
*/
709+
oldcontext=MemoryContextSwitchTo(planstate->state->es_query_cxt);
710+
ibytes=mul_size(instrumentation->num_workers,sizeof(Instrumentation));
711+
planstate->worker_instrument=
712+
palloc(ibytes+ offsetof(WorkerInstrumentation,instrument));
713+
MemoryContextSwitchTo(oldcontext);
735714

736715
planstate->worker_instrument->num_workers=instrumentation->num_workers;
737-
738-
/* Accumulate the per-worker detail. */
739-
for (n=0;n<instrumentation->num_workers;++n)
740-
InstrAggNode(&planstate->worker_instrument->instrument[n],
741-
&instrument[n]);
716+
memcpy(&planstate->worker_instrument->instrument,instrument,ibytes);
742717

743718
returnplanstate_tree_walker(planstate,ExecParallelRetrieveInstrumentation,
744719
instrumentation);

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -300,28 +300,7 @@ select count(*) from bmscantest where a>1;
300300
99999
301301
(1 row)
302302

303-
-- test accumulation of stats for parallel node
304303
reset enable_seqscan;
305-
alter table tenk2 set (parallel_workers = 0);
306-
explain (analyze, timing off, summary off, costs off)
307-
select count(*) from tenk1, tenk2 where tenk1.hundred > 1
308-
and tenk2.thousand=0;
309-
QUERY PLAN
310-
--------------------------------------------------------------------------
311-
Aggregate (actual rows=1 loops=1)
312-
-> Nested Loop (actual rows=98000 loops=1)
313-
-> Seq Scan on tenk2 (actual rows=10 loops=1)
314-
Filter: (thousand = 0)
315-
Rows Removed by Filter: 9990
316-
-> Gather (actual rows=9800 loops=10)
317-
Workers Planned: 4
318-
Workers Launched: 4
319-
-> Parallel Seq Scan on tenk1 (actual rows=1960 loops=50)
320-
Filter: (hundred > 1)
321-
Rows Removed by Filter: 40
322-
(11 rows)
323-
324-
alter table tenk2 reset (parallel_workers);
325304
reset enable_indexscan;
326305
reset enable_hashjoin;
327306
reset enable_mergejoin;

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,7 @@ insert into bmscantest select r, 'fooooooooooooooooooooooooooooooooooooooooooooo
116116
createindexi_bmtestON bmscantest(a);
117117
selectcount(*)from bmscantestwhere a>1;
118118

119-
-- test accumulation of stats for parallel node
120119
reset enable_seqscan;
121-
altertable tenk2set (parallel_workers=0);
122-
explain (analyze, timing off, summary off, costs off)
123-
selectcount(*)from tenk1, tenk2wheretenk1.hundred>1
124-
andtenk2.thousand=0;
125-
altertable tenk2 reset (parallel_workers);
126-
127120
reset enable_indexscan;
128121
reset enable_hashjoin;
129122
reset enable_mergejoin;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp