postgres.git / summary / log / commit / refs
commit 01f08cbbc975c56cbffc8e051ee4470ab7516358
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon Nov 21 16:09:24 2016 +0000
Fix test for subplans in force-parallel mode.
We mustn't force parallel mode if the query has any subplans, since
ExecSerializePlan doesn't transmit them to workers. Testing
top_plan->initPlan is inadequate because (1) there might be initPlans
attached to lower plan nodes, and (2) non-initPlan subplans don't
work either. There's certainly room for improvement in those
restrictions, but for the moment that's what we've got.
Amit Kapila, per report from Andreas Seltenreich
Discussion: <8737im6pmh.fsf@credativ.de>
src/backend/optimizer/plan/planner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index d84f1b7dd8d..ba6992df25c 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -327,11 +327,11 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
* actually a safe thing to do. (Note: we assume adding a Material node
* above did not change the parallel safety of the plan, so we can still
* rely on best_path->parallel_safe. However, that flag doesn't account
- * for initPlans, which render the plan parallel-unsafe.)
+ * for subplans, which we are unable to transmit to workers presently.)
*/
if (force_parallel_mode != FORCE_PARALLEL_OFF &&
best_path->parallel_safe &&
- top_plan->initPlan == NIL)
+ glob->subplans == NIL)
{
Gather *gather = makeNode(Gather);
[parent: 90f8b4be5b9c]