Mark a query's topmost Paths parallel-unsafe if they will have initPlans.

Andreas Seltenreich found another case where we were being too optimistic
about allowing a plan to be considered parallelizable despite it containing
initPlans.  It seems like the real issue here is that if we know we are
going to tack initPlans onto the topmost Plan node for a subquery, we
had better mark that subquery's result Paths as not-parallel-safe.  That
fixes this problem and allows reversion of a kluge (added in commit
7b67a0a49 and extended in f24cf960d) to not trust the parallel_safe flag
at top level.

Discussion: <874m2w4k5d.fsf@ex.ansel.ydns.eu>

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index ba6992df25cef4012fa46fd1e0735211075757ce..d9e2b45065efadf4bd5bfa5e16d12b6959dde9f8 100644 (file)
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -326,12 +326,9 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
         * Optionally add a Gather node for testing purposes, provided this is
         * 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 subplans, which we are unable to transmit to workers presently.)
+        * rely on best_path->parallel_safe.)
         */
-       if (force_parallel_mode != FORCE_PARALLEL_OFF &&
-               best_path->parallel_safe &&
-               glob->subplans == NIL)
+       if (force_parallel_mode != FORCE_PARALLEL_OFF && best_path->parallel_safe)
        {
                Gather     *gather = makeNode(Gather);
 
@@ -782,10 +779,10 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
        SS_identify_outer_params(root);
 
        /*
-        * If any initPlans were created in this query level, increment the
-        * surviving Paths' costs to account for them.  They won't actually get
-        * attached to the plan tree till create_plan() runs, but we want to be
-        * sure their costs are included now.
+        * If any initPlans were created in this query level, adjust the surviving
+        * Paths' costs and parallel-safety flags to account for them.  The
+        * initPlans won't actually get attached to the plan tree till
+        * create_plan() runs, but we must include their effects now.
         */
        final_rel = fetch_upper_rel(root, UPPERREL_FINAL, NULL);
        SS_charge_for_initplans(root, final_rel);

diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 6edefb1138833ce7d79261895029d035649c2d25..f196db14299c7cb923ae6e2457285bda37481c06 100644 (file)
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -2134,11 +2134,13 @@ SS_identify_outer_params(PlannerInfo *root)
 }
 
 /*
- * SS_charge_for_initplans - account for cost of initplans in Path costs
+ * SS_charge_for_initplans - account for initplans in Path costs & parallelism
  *
  * If any initPlans have been created in the current query level, they will
  * get attached to the Plan tree created from whichever Path we select from
- * the given rel; so increment all the rel's Paths' costs to account for them.
+ * the given rel.  Increment all that rel's Paths' costs to account for them,
+ * and make sure the paths get marked as parallel-unsafe, since we can't
+ * currently transmit initPlans to parallel workers.
  *
  * This is separate from SS_attach_initplans because we might conditionally
  * create more initPlans during create_plan(), depending on which Path we
@@ -2170,7 +2172,7 @@ SS_charge_for_initplans(PlannerInfo *root, RelOptInfo *final_rel)
        }
 
        /*
-        * Now adjust the costs.
+        * Now adjust the costs and parallel_safe flags.
         */
        foreach(lc, final_rel->pathlist)
        {
@@ -2178,6 +2180,7 @@ SS_charge_for_initplans(PlannerInfo *root, RelOptInfo *final_rel)
 
                path->startup_cost += initplan_cost;
                path->total_cost += initplan_cost;
+               path->parallel_safe = false;
        }
 
        /* We needn't do set_cheapest() here, caller will do it */