diff options
| author | Robert Haas <rhaas@postgresql.org> | 2017-04-03 22:41:31 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2017-04-03 22:41:31 -0400 |
| commit | 7a39b5e4d11229ece930a51fd7cb29e535db4494 (patch) | |
| tree | 00bb00bac5129ead888147abec54bcd02f23273d /src/backend/optimizer/prep/prepunion.c | |
| parent | 93cd7684ee2bba227fa371daa81b88f25456dcb2 (diff) | |
| download | postgresql-7a39b5e4d11229ece930a51fd7cb29e535db4494.tar.gz postgresql-7a39b5e4d11229ece930a51fd7cb29e535db4494.zip | |
Abstract logic to allow for multiple kinds of child rels.
Currently, the only type of child relation is an "other member rel",
which is the child of a baserel, but in the future joins and even
upper relations may have child rels. To facilitate that, introduce
macros that test to test for particular RelOptKind values, and use
them in various places where they help to clarify the sense of a test.
(For example, a test may allow RELOPT_OTHER_MEMBER_REL either because
it intends to allow child rels, or because it intends to allow simple
rels.)
Also, remove find_childrel_top_parent, which will not work for a
child rel that is not a baserel. Instead, add a new RelOptInfo
member top_parent_relids to track the same kind of information in a
more generic manner.
Ashutosh Bapat, slightly tweaked by me. Review and testing of the
patch set from which this was taken by Rajkumar Raghuwanshi and Rafia
Sabih.
Discussion: http://postgr.es/m/CA+TgmoagTnF2yqR3PT2rv=om=wJiZ4-A+ATwdnriTGku1CLYxA@mail.gmail.com
Diffstat (limited to 'src/backend/optimizer/prep/prepunion.c')
| -rw-r--r-- | src/backend/optimizer/prep/prepunion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index e327e66f6b9..b5cb4de6a26 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -271,7 +271,7 @@ recurse_set_operations(Node *setOp, PlannerInfo *root, * used for much here, but it carries the subroot data structures * forward to setrefs.c processing. */ - rel = build_simple_rel(root, rtr->rtindex, RELOPT_BASEREL); + rel = build_simple_rel(root, rtr->rtindex, NULL); /* plan_params should not be in use in current query level */ Assert(root->plan_params == NIL); @@ -2143,7 +2143,7 @@ adjust_appendrel_attrs_multilevel(PlannerInfo *root, Node *node, RelOptInfo *parent_rel = find_base_rel(root, appinfo->parent_relid); /* If parent is also a child, first recurse to apply its translations */ - if (parent_rel->reloptkind == RELOPT_OTHER_MEMBER_REL) + if (IS_OTHER_REL(parent_rel)) node = adjust_appendrel_attrs_multilevel(root, node, parent_rel); else Assert(parent_rel->reloptkind == RELOPT_BASEREL); |