database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Rewrite interaction of parallel mode with parallel executor support.

Browse Source 
In the previous coding, before returning from ExecutorRun, we'd shut
down all parallel workers.  This was dead wrong if ExecutorRun was
called with a non-zero tuple count; it had the effect of truncating
the query output.  To fix, give ExecutePlan control over whether to
enter parallel mode, and have it refuse to do so if the tuple count
is non-zero.  Rewrite the Gather logic so that it can cope with being
called outside parallel mode.

Commit 7aea8e4f2d is largely to blame
for this problem, though this patch modifies some subsequently-committed
code which relied on the guarantees it purported to make.
This commit is contained in:
Robert Haas
2015-10-16 11:56:02 -04:00
parent 816e336f12
commit bfc78d7196
5 changed files with 95 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/backend/executor/execMain.c
View File

@ -76,6 +76,7 @@ static void CheckValidRowMarkRel(Relation rel, RowMarkType markType);
static void ExecPostprocessPlan(EState *estate);
static void ExecEndPlan(PlanState *planstate, EState *estate);
static void ExecutePlan(EState *estate, PlanState *planstate,
bool use_parallel_mode,
CmdType operation,
bool sendTuples,
long numberTuples,
@ -243,11 +244,6 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
if (!(eflags & (EXEC_FLAG_SKIP_TRIGGERS | EXEC_FLAG_EXPLAIN_ONLY)))
AfterTriggerBeginQuery();
/* Enter parallel mode, if required by the query. */
if (queryDesc->plannedstmt->parallelModeNeeded &&
!(eflags & EXEC_FLAG_EXPLAIN_ONLY))
EnterParallelMode();
MemoryContextSwitchTo(oldcontext);
}
@ -341,15 +337,13 @@ standard_ExecutorRun(QueryDesc *queryDesc,
if (!ScanDirectionIsNoMovement(direction))
ExecutePlan(estate,
queryDesc->planstate,
queryDesc->plannedstmt->parallelModeNeeded,
operation,
sendTuples,
count,
direction,
dest);
/* Allow nodes to release or shut down resources. */
(void) ExecShutdownNode(queryDesc->planstate);
/*
* shutdown tuple receiver, if we started it
*/
@ -482,11 +476,6 @@ standard_ExecutorEnd(QueryDesc *queryDesc)
*/
MemoryContextSwitchTo(oldcontext);
/* Exit parallel mode, if it was required by the query. */
if (queryDesc->plannedstmt->parallelModeNeeded &&
!(estate->es_top_eflags & EXEC_FLAG_EXPLAIN_ONLY))
ExitParallelMode();
/*
* Release EState and per-query memory context. This should release
* everything the executor has allocated.
@ -1529,6 +1518,7 @@ ExecEndPlan(PlanState *planstate, EState *estate)
static void
ExecutePlan(EState *estate,
PlanState *planstate,
bool use_parallel_mode,
CmdType operation,
bool sendTuples,
long numberTuples,
@ -1548,6 +1538,20 @@ ExecutePlan(EState *estate,
*/
estate->es_direction = direction;
/*
* If a tuple count was supplied, we must force the plan to run without
* parallelism, because we might exit early.
*/
if (numberTuples != 0)
use_parallel_mode = false;
/*
* If a tuple count was supplied, we must force the plan to run without
* parallelism, because we might exit early.
*/
if (use_parallel_mode)
EnterParallelMode();
/*
* Loop until we've processed the proper number of tuples from the plan.
*/
@ -1566,7 +1570,11 @@ ExecutePlan(EState *estate,
* process so we just end the loop...
*/
if (TupIsNull(slot))
{
/* Allow nodes to release or shut down resources. */
(void) ExecShutdownNode(planstate);
break;
}
/*
* If we have a junk filter, then project a new tuple with the junk
@ -1603,6 +1611,9 @@ ExecutePlan(EState *estate,
if (numberTuples && numberTuples == current_tuple_count)
break;
}
if (use_parallel_mode)
ExitParallelMode();
}