diff options
| author | Tom Lane | 2022-08-18 16:36:06 +0000 |
|---|---|---|
| committer | Tom Lane | 2022-08-18 16:36:16 +0000 |
| commit | 2f17b57017e5f1993dbe0f389e01f1302a541196 (patch) | |
| tree | 1ce89553a899fc5213f0333d0251fa14a55db204 /src/include | |
| parent | ec97db399f1eccda6652d44b99d5363728832eb7 (diff) | |
Improve performance of adjust_appendrel_attrs_multilevel.
The present implementations of adjust_appendrel_attrs_multilevel and
its sibling adjust_child_relids_multilevel are very messy, because
they work by reconstructing the relids of the child's immediate
parent and then seeing if that's bms_equal to the relids of the
target parent. Aside from being quite inefficient, this will not
work with planned future changes to make joinrels' relid sets
contain outer-join relids in addition to baserels.
The whole thing can be solved at a stroke by adding explicit parent
and top_parent links to child RelOptInfos, and making these functions
work with RelOptInfo pointers instead of relids. Doing that is
simpler for most callers, too.
In my original version of this patch, I got rid of
RelOptInfo.top_parent_relids on the grounds that it was now redundant.
However, that adds a lot of code churn in places that otherwise would
not need changing, and arguably the extra indirection needed to fetch
top_parent->relids in those places costs something. So this version
leaves that field in place.
Discussion: https://postgr.es/m/553080.1657481916@sss.pgh.pa.us
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/nodes/pathnodes.h | 10 | ||||
| -rw-r--r-- | src/include/optimizer/appendinfo.h | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h index bdc7b50db97..294cfe9c47c 100644 --- a/src/include/nodes/pathnodes.h +++ b/src/include/nodes/pathnodes.h @@ -938,7 +938,15 @@ typedef struct RelOptInfo */ /* consider partitionwise join paths? (if partitioned rel) */ bool consider_partitionwise_join; - /* Relids of topmost parents (if "other" rel) */ + + /* + * inheritance links, if this is an otherrel (otherwise NULL): + */ + /* Immediate parent relation (dumping it would be too verbose) */ + struct RelOptInfo *parent pg_node_attr(read_write_ignore); + /* Topmost parent relation (dumping it would be too verbose) */ + struct RelOptInfo *top_parent pg_node_attr(read_write_ignore); + /* Relids of topmost parent (redundant, but handy) */ Relids top_parent_relids; /* diff --git a/src/include/optimizer/appendinfo.h b/src/include/optimizer/appendinfo.h index fc808dcd276..5e80a741a42 100644 --- a/src/include/optimizer/appendinfo.h +++ b/src/include/optimizer/appendinfo.h @@ -23,13 +23,13 @@ extern AppendRelInfo *make_append_rel_info(Relation parentrel, extern Node *adjust_appendrel_attrs(PlannerInfo *root, Node *node, int nappinfos, AppendRelInfo **appinfos); extern Node *adjust_appendrel_attrs_multilevel(PlannerInfo *root, Node *node, - Relids child_relids, - Relids top_parent_relids); + RelOptInfo *childrel, + RelOptInfo *parentrel); extern Relids adjust_child_relids(Relids relids, int nappinfos, AppendRelInfo **appinfos); extern Relids adjust_child_relids_multilevel(PlannerInfo *root, Relids relids, - Relids child_relids, - Relids top_parent_relids); + RelOptInfo *childrel, + RelOptInfo *parentrel); extern List *adjust_inherited_attnums(List *attnums, AppendRelInfo *context); extern List *adjust_inherited_attnums_multilevel(PlannerInfo *root, List *attnums, |