mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Flush Memoize cache when non-key parameters change, take 2
It's possible that a subplan below a Memoize node contains a parameter from above the Memoize node. If this parameter changes then cache entries may become out-dated due to the new parameter value. Previously Memoize was mistakenly not aware of this. We fix this here by flushing the cache whenever a parameter that's not part of the cache key changes. Bug: #17213 Reported by: Elvis Pranskevichus Author: David Rowley Discussion: https://postgr.es/m/17213-988ed34b225a2862@postgresql.org Backpatch-through: 14, where Memoize was added
This commit is contained in:
@ -280,7 +280,7 @@ static Material *make_material(Plan *lefttree);
|
||||
static Memoize *make_memoize(Plan *lefttree, Oid *hashoperators,
|
||||
Oid *collations, List *param_exprs,
|
||||
bool singlerow, bool binary_mode,
|
||||
uint32 est_entries);
|
||||
uint32 est_entries, Bitmapset *keyparamids);
|
||||
static WindowAgg *make_windowagg(List *tlist, Index winref,
|
||||
int partNumCols, AttrNumber *partColIdx, Oid *partOperators, Oid *partCollations,
|
||||
int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations,
|
||||
@ -1586,6 +1586,7 @@ static Memoize *
|
||||
create_memoize_plan(PlannerInfo *root, MemoizePath *best_path, int flags)
|
||||
{
|
||||
Memoize *plan;
|
||||
Bitmapset *keyparamids;
|
||||
Plan *subplan;
|
||||
Oid *operators;
|
||||
Oid *collations;
|
||||
@ -1617,9 +1618,11 @@ create_memoize_plan(PlannerInfo *root, MemoizePath *best_path, int flags)
|
||||
i++;
|
||||
}
|
||||
|
||||
keyparamids = pull_paramids((Expr *) param_exprs);
|
||||
|
||||
plan = make_memoize(subplan, operators, collations, param_exprs,
|
||||
best_path->singlerow, best_path->binary_mode,
|
||||
best_path->est_entries);
|
||||
best_path->est_entries, keyparamids);
|
||||
|
||||
copy_generic_path_info(&plan->plan, (Path *) best_path);
|
||||
|
||||
@ -6419,7 +6422,7 @@ materialize_finished_plan(Plan *subplan)
|
||||
static Memoize *
|
||||
make_memoize(Plan *lefttree, Oid *hashoperators, Oid *collations,
|
||||
List *param_exprs, bool singlerow, bool binary_mode,
|
||||
uint32 est_entries)
|
||||
uint32 est_entries, Bitmapset *keyparamids)
|
||||
{
|
||||
Memoize *node = makeNode(Memoize);
|
||||
Plan *plan = &node->plan;
|
||||
@ -6436,6 +6439,7 @@ make_memoize(Plan *lefttree, Oid *hashoperators, Oid *collations,
|
||||
node->singlerow = singlerow;
|
||||
node->binary_mode = binary_mode;
|
||||
node->est_entries = est_entries;
|
||||
node->keyparamids = keyparamids;
|
||||
|
||||
return node;
|
||||
}
|
||||
|
Reference in New Issue
Block a user