mirror of
https://github.com/postgres/postgres.git
synced 2025-07-15 19:21:59 +03:00
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 commit7b67a0a49
and extended inf24cf960d
) to not trust the parallel_safe flag at top level. Discussion: <874m2w4k5d.fsf@ex.ansel.ydns.eu>
This commit is contained in:
@ -2128,11 +2128,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
|
||||
@ -2164,7 +2166,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)
|
||||
{
|
||||
@ -2172,6 +2174,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 */
|
||||
|
Reference in New Issue
Block a user