mirror of
https://github.com/postgres/postgres.git
synced 2025-09-03 15:22:11 +03:00
Use an explicit state flag to control PlaceHolderInfo creation.
Up to now, callers of find_placeholder_info() were required to pass a flag indicating if it's OK to make a new PlaceHolderInfo. That'd be fine if the callers had free choice, but they do not. Once we begin deconstruct_jointree() it's no longer OK to make more PHIs; while callers before that always want to create a PHI if it's not there already. So there's no freedom of action, only the opportunity to cause bugs by creating PHIs too late. Let's get rid of that in favor of adding a state flag PlannerInfo.placeholdersFrozen, which we can set at the point where it's no longer OK to make more PHIs. This patch also simplifies a couple of call sites that were using complicated logic to avoid calling find_placeholder_info() as much as possible. Now that that lookup is O(1) thanks to the previous commit, the extra bitmap manipulations are probably a net negative. Discussion: https://postgr.es/m/1405792.1660677844@sss.pgh.pa.us
This commit is contained in:
@@ -6245,7 +6245,7 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
|
||||
* scanning this rel, so be sure to include it in reltarget->cost.
|
||||
*/
|
||||
PlaceHolderVar *phv = (PlaceHolderVar *) node;
|
||||
PlaceHolderInfo *phinfo = find_placeholder_info(root, phv, false);
|
||||
PlaceHolderInfo *phinfo = find_placeholder_info(root, phv);
|
||||
QualCost cost;
|
||||
|
||||
tuple_width += phinfo->ph_width;
|
||||
|
@@ -1323,7 +1323,7 @@ generate_base_implied_equalities_no_const(PlannerInfo *root,
|
||||
PVC_RECURSE_WINDOWFUNCS |
|
||||
PVC_INCLUDE_PLACEHOLDERS);
|
||||
|
||||
add_vars_to_targetlist(root, vars, ec->ec_relids, false);
|
||||
add_vars_to_targetlist(root, vars, ec->ec_relids);
|
||||
list_free(vars);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user