summaryrefslogtreecommitdiff
path: root/src/backend/executor/execMain.c
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2017-10-27 16:04:01 +0200
committerRobert Haas <rhaas@postgresql.org>2017-10-27 16:04:10 +0200
commit965a16fa9f8c316c30f4ada3c1c98b5dd4666f25 (patch)
treee38839a9e424572faf810e0f9bb3b7d2c84320f4 /src/backend/executor/execMain.c
parent6a81ba1d4d26b46636d652a3a56143c159da899c (diff)
Fix mistaken failure to allow parallelism in corner case.
If we try to run a parallel plan in serial mode because, for example, it's going to be scanned via a cursor, but for some reason we're already in parallel mode (for example because an outer query is running in parallel), we'd incorrectly try to launch workers. Fix by adding a flag to the EState, so that we can be certain that ExecutePlan() and ExecGather()/ExecGatherMerge() will have the same idea about whether we are executing serially or in parallel. Report and fix by Amit Kapila with help from Kuntal Ghosh. A few tweaks by me. Discussion: http://postgr.es/m/CAA4eK1+_BuZrmVCeua5Eqnm4Co9DAXdM5HPAOE2J19ePbR912Q@mail.gmail.com
Diffstat (limited to 'src/backend/executor/execMain.c')
-rw-r--r--src/backend/executor/execMain.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index ac7e0fb48b3..684470928a4 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -1704,6 +1704,7 @@ ExecutePlan(EState *estate,
if (!execute_once || dest->mydest == DestIntoRel)
use_parallel_mode = false;
+ estate->es_use_parallel_mode = use_parallel_mode;
if (use_parallel_mode)
EnterParallelMode();