Commit 5a6c168c authored by Tom Lane's avatar Tom Lane

Fix some more problems with nested append relations.

As of commit a87c7291 (which later got backpatched as far as 9.1),
we're explicitly supporting the notion that append relations can be
nested; this can occur when UNION ALL constructs are nested, or when
a UNION ALL contains a table with inheritance children.

Bug #11457 from Nelson Page, as well as an earlier report from Elvis
Pranskevichus, showed that there were still nasty bugs associated with such
cases: in particular the EquivalenceClass mechanism could try to generate
"join" clauses connecting an appendrel child to some grandparent appendrel,
which would result in assertion failures or bogus plans.

Upon investigation I concluded that all current callers of
find_childrel_appendrelinfo() need to be fixed to explicitly consider
multiple levels of parent appendrels.  The most complex fix was in
processing of "broken" EquivalenceClasses, which are ECs for which we have
been unable to generate all the derived equality clauses we would like to
because of missing cross-type equality operators in the underlying btree
operator family.  That code path is more or less entirely untested by
the regression tests to date, because no standard opfamilies have such
holes in them.  So I wrote a new regression test script to try to exercise
it a bit, which turned out to be quite a worthwhile activity as it exposed
existing bugs in all supported branches.

The present patch is essentially the same as far back as 9.2, which is
where parameterized paths were introduced.  In 9.0 and 9.1, we only need
to back-patch a small fragment of commit 5b7b5518, which fixes failure to
propagate out the original WHERE clauses when a broken EC contains constant
members.  (The regression test case results show that these older branches
are noticeably stupider than 9.2+ in terms of the quality of the plans
generated; but we don't really care about plan quality in such cases,
only that the plan not be outright wrong.  A more invasive fix in the
older branches would not be a good idea anyway from a plan-stability
standpoint.)
parent 0c013e08
...@@ -48,7 +48,7 @@ static List *generate_join_implied_equalities_broken(PlannerInfo *root, ...@@ -48,7 +48,7 @@ static List *generate_join_implied_equalities_broken(PlannerInfo *root,
Relids nominal_join_relids, Relids nominal_join_relids,
Relids outer_relids, Relids outer_relids,
Relids nominal_inner_relids, Relids nominal_inner_relids,
AppendRelInfo *inner_appinfo); RelOptInfo *inner_rel);
static Oid select_equality_operator(EquivalenceClass *ec, static Oid select_equality_operator(EquivalenceClass *ec,
Oid lefttype, Oid righttype); Oid lefttype, Oid righttype);
static RestrictInfo *create_join_clause(PlannerInfo *root, static RestrictInfo *create_join_clause(PlannerInfo *root,
...@@ -1000,22 +1000,18 @@ generate_join_implied_equalities(PlannerInfo *root, ...@@ -1000,22 +1000,18 @@ generate_join_implied_equalities(PlannerInfo *root,
Relids inner_relids = inner_rel->relids; Relids inner_relids = inner_rel->relids;
Relids nominal_inner_relids; Relids nominal_inner_relids;
Relids nominal_join_relids; Relids nominal_join_relids;
AppendRelInfo *inner_appinfo;
ListCell *lc; ListCell *lc;
/* If inner rel is a child, extra setup work is needed */ /* If inner rel is a child, extra setup work is needed */
if (inner_rel->reloptkind == RELOPT_OTHER_MEMBER_REL) if (inner_rel->reloptkind == RELOPT_OTHER_MEMBER_REL)
{ {
/* Lookup parent->child translation data */ /* Fetch relid set for the topmost parent rel */
inner_appinfo = find_childrel_appendrelinfo(root, inner_rel); nominal_inner_relids = find_childrel_top_parent(root, inner_rel)->relids;
/* Construct relids for the parent rel */
nominal_inner_relids = bms_make_singleton(inner_appinfo->parent_relid);
/* ECs will be marked with the parent's relid, not the child's */ /* ECs will be marked with the parent's relid, not the child's */
nominal_join_relids = bms_union(outer_relids, nominal_inner_relids); nominal_join_relids = bms_union(outer_relids, nominal_inner_relids);
} }
else else
{ {
inner_appinfo = NULL;
nominal_inner_relids = inner_relids; nominal_inner_relids = inner_relids;
nominal_join_relids = join_relids; nominal_join_relids = join_relids;
} }
...@@ -1051,7 +1047,7 @@ generate_join_implied_equalities(PlannerInfo *root, ...@@ -1051,7 +1047,7 @@ generate_join_implied_equalities(PlannerInfo *root,
nominal_join_relids, nominal_join_relids,
outer_relids, outer_relids,
nominal_inner_relids, nominal_inner_relids,
inner_appinfo); inner_rel);
result = list_concat(result, sublist); result = list_concat(result, sublist);
} }
...@@ -1244,7 +1240,7 @@ generate_join_implied_equalities_broken(PlannerInfo *root, ...@@ -1244,7 +1240,7 @@ generate_join_implied_equalities_broken(PlannerInfo *root,
Relids nominal_join_relids, Relids nominal_join_relids,
Relids outer_relids, Relids outer_relids,
Relids nominal_inner_relids, Relids nominal_inner_relids,
AppendRelInfo *inner_appinfo) RelOptInfo *inner_rel)
{ {
List *result = NIL; List *result = NIL;
ListCell *lc; ListCell *lc;
...@@ -1266,10 +1262,16 @@ generate_join_implied_equalities_broken(PlannerInfo *root, ...@@ -1266,10 +1262,16 @@ generate_join_implied_equalities_broken(PlannerInfo *root,
* RestrictInfos that are not listed in ec_derives, but there shouldn't be * RestrictInfos that are not listed in ec_derives, but there shouldn't be
* any duplication, and it's a sufficiently narrow corner case that we * any duplication, and it's a sufficiently narrow corner case that we
* shouldn't sweat too much over it anyway. * shouldn't sweat too much over it anyway.
*
* Since inner_rel might be an indirect descendant of the baserel
* mentioned in the ec_sources clauses, we have to be prepared to apply
* multiple levels of Var translation.
*/ */
if (inner_appinfo) if (inner_rel->reloptkind == RELOPT_OTHER_MEMBER_REL &&
result = (List *) adjust_appendrel_attrs(root, (Node *) result, result != NIL)
inner_appinfo); result = (List *) adjust_appendrel_attrs_multilevel(root,
(Node *) result,
inner_rel);
return result; return result;
} }
...@@ -2071,14 +2073,14 @@ generate_implied_equalities_for_column(PlannerInfo *root, ...@@ -2071,14 +2073,14 @@ generate_implied_equalities_for_column(PlannerInfo *root,
{ {
List *result = NIL; List *result = NIL;
bool is_child_rel = (rel->reloptkind == RELOPT_OTHER_MEMBER_REL); bool is_child_rel = (rel->reloptkind == RELOPT_OTHER_MEMBER_REL);
Index parent_relid; Relids parent_relids;
ListCell *lc1; ListCell *lc1;
/* If it's a child rel, we'll need to know what its parent is */ /* If it's a child rel, we'll need to know what its parent(s) are */
if (is_child_rel) if (is_child_rel)
parent_relid = find_childrel_appendrelinfo(root, rel)->parent_relid; parent_relids = find_childrel_parents(root, rel);
else else
parent_relid = 0; /* not used, but keep compiler quiet */ parent_relids = NULL; /* not used, but keep compiler quiet */
foreach(lc1, root->eq_classes) foreach(lc1, root->eq_classes)
{ {
...@@ -2148,10 +2150,10 @@ generate_implied_equalities_for_column(PlannerInfo *root, ...@@ -2148,10 +2150,10 @@ generate_implied_equalities_for_column(PlannerInfo *root,
/* /*
* Also, if this is a child rel, avoid generating a useless join * Also, if this is a child rel, avoid generating a useless join
* to its parent rel. * to its parent rel(s).
*/ */
if (is_child_rel && if (is_child_rel &&
bms_is_member(parent_relid, other_em->em_relids)) bms_overlap(parent_relids, other_em->em_relids))
continue; continue;
eq_op = select_equality_operator(cur_ec, eq_op = select_equality_operator(cur_ec,
......
...@@ -2586,16 +2586,11 @@ check_partial_indexes(PlannerInfo *root, RelOptInfo *rel) ...@@ -2586,16 +2586,11 @@ check_partial_indexes(PlannerInfo *root, RelOptInfo *rel)
* Add on any equivalence-derivable join clauses. Computing the correct * Add on any equivalence-derivable join clauses. Computing the correct
* relid sets for generate_join_implied_equalities is slightly tricky * relid sets for generate_join_implied_equalities is slightly tricky
* because the rel could be a child rel rather than a true baserel, and in * because the rel could be a child rel rather than a true baserel, and in
* that case we must remove its parent's relid from all_baserels. * that case we must remove its parents' relid(s) from all_baserels.
*/ */
if (rel->reloptkind == RELOPT_OTHER_MEMBER_REL) if (rel->reloptkind == RELOPT_OTHER_MEMBER_REL)
{
/* Lookup parent->child translation data */
AppendRelInfo *appinfo = find_childrel_appendrelinfo(root, rel);
otherrels = bms_difference(root->all_baserels, otherrels = bms_difference(root->all_baserels,
bms_make_singleton(appinfo->parent_relid)); find_childrel_parents(root, rel));
}
else else
otherrels = bms_difference(root->all_baserels, rel->relids); otherrels = bms_difference(root->all_baserels, rel->relids);
......
...@@ -1979,3 +1979,26 @@ adjust_inherited_tlist(List *tlist, AppendRelInfo *context) ...@@ -1979,3 +1979,26 @@ adjust_inherited_tlist(List *tlist, AppendRelInfo *context)
return new_tlist; return new_tlist;
} }
/*
* adjust_appendrel_attrs_multilevel
* Apply Var translations from a toplevel appendrel parent down to a child.
*
* In some cases we need to translate expressions referencing a baserel
* to reference an appendrel child that's multiple levels removed from it.
*/
Node *
adjust_appendrel_attrs_multilevel(PlannerInfo *root, Node *node,
RelOptInfo *child_rel)
{
AppendRelInfo *appinfo = find_childrel_appendrelinfo(root, child_rel);
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)
node = adjust_appendrel_attrs_multilevel(root, node, parent_rel);
else
Assert(parent_rel->reloptkind == RELOPT_BASEREL);
/* Now translate for this child */
return adjust_appendrel_attrs(root, node, appinfo);
}
...@@ -713,7 +713,8 @@ build_empty_join_rel(PlannerInfo *root) ...@@ -713,7 +713,8 @@ build_empty_join_rel(PlannerInfo *root)
* Get the AppendRelInfo associated with an appendrel child rel. * Get the AppendRelInfo associated with an appendrel child rel.
* *
* This search could be eliminated by storing a link in child RelOptInfos, * This search could be eliminated by storing a link in child RelOptInfos,
* but for now it doesn't seem performance-critical. * but for now it doesn't seem performance-critical. (Also, it might be
* difficult to maintain such a link during mutation of the append_rel_list.)
*/ */
AppendRelInfo * AppendRelInfo *
find_childrel_appendrelinfo(PlannerInfo *root, RelOptInfo *rel) find_childrel_appendrelinfo(PlannerInfo *root, RelOptInfo *rel)
...@@ -737,6 +738,62 @@ find_childrel_appendrelinfo(PlannerInfo *root, RelOptInfo *rel) ...@@ -737,6 +738,62 @@ find_childrel_appendrelinfo(PlannerInfo *root, RelOptInfo *rel)
} }
/*
* find_childrel_top_parent
* Fetch the topmost appendrel parent rel of an appendrel child rel.
*
* Since appendrels can be nested, a child could have multiple levels of
* appendrel ancestors. This function locates the topmost ancestor,
* which will be a regular baserel not an otherrel.
*/
RelOptInfo *
find_childrel_top_parent(PlannerInfo *root, RelOptInfo *rel)
{
do
{
AppendRelInfo *appinfo = find_childrel_appendrelinfo(root, rel);
Index prelid = appinfo->parent_relid;
/* traverse up to the parent rel, loop if it's also a child rel */
rel = find_base_rel(root, prelid);
} while (rel->reloptkind == RELOPT_OTHER_MEMBER_REL);
Assert(rel->reloptkind == RELOPT_BASEREL);
return rel;
}
/*
* find_childrel_parents
* Compute the set of parent relids of an appendrel child rel.
*
* Since appendrels can be nested, a child could have multiple levels of
* appendrel ancestors. This function computes a Relids set of all the
* parent relation IDs.
*/
Relids
find_childrel_parents(PlannerInfo *root, RelOptInfo *rel)
{
Relids result = NULL;
do
{
AppendRelInfo *appinfo = find_childrel_appendrelinfo(root, rel);
Index prelid = appinfo->parent_relid;
result = bms_add_member(result, prelid);
/* traverse up to the parent rel, loop if it's also a child rel */
rel = find_base_rel(root, prelid);
} while (rel->reloptkind == RELOPT_OTHER_MEMBER_REL);
Assert(rel->reloptkind == RELOPT_BASEREL);
return result;
}
/* /*
* get_baserel_parampathinfo * get_baserel_parampathinfo
* Get the ParamPathInfo for a parameterized path for a base relation, * Get the ParamPathInfo for a parameterized path for a base relation,
......
...@@ -145,6 +145,8 @@ extern RelOptInfo *build_join_rel(PlannerInfo *root, ...@@ -145,6 +145,8 @@ extern RelOptInfo *build_join_rel(PlannerInfo *root,
extern RelOptInfo *build_empty_join_rel(PlannerInfo *root); extern RelOptInfo *build_empty_join_rel(PlannerInfo *root);
extern AppendRelInfo *find_childrel_appendrelinfo(PlannerInfo *root, extern AppendRelInfo *find_childrel_appendrelinfo(PlannerInfo *root,
RelOptInfo *rel); RelOptInfo *rel);
extern RelOptInfo *find_childrel_top_parent(PlannerInfo *root, RelOptInfo *rel);
extern Relids find_childrel_parents(PlannerInfo *root, RelOptInfo *rel);
extern ParamPathInfo *get_baserel_parampathinfo(PlannerInfo *root, extern ParamPathInfo *get_baserel_parampathinfo(PlannerInfo *root,
RelOptInfo *baserel, RelOptInfo *baserel,
Relids required_outer); Relids required_outer);
......
...@@ -58,4 +58,7 @@ extern void expand_inherited_tables(PlannerInfo *root); ...@@ -58,4 +58,7 @@ extern void expand_inherited_tables(PlannerInfo *root);
extern Node *adjust_appendrel_attrs(PlannerInfo *root, Node *node, extern Node *adjust_appendrel_attrs(PlannerInfo *root, Node *node,
AppendRelInfo *appinfo); AppendRelInfo *appinfo);
extern Node *adjust_appendrel_attrs_multilevel(PlannerInfo *root, Node *node,
RelOptInfo *child_rel);
#endif /* PREP_H */ #endif /* PREP_H */
This diff is collapsed.
...@@ -98,7 +98,7 @@ test: event_trigger ...@@ -98,7 +98,7 @@ test: event_trigger
# ---------- # ----------
# Another group of parallel tests # Another group of parallel tests
# ---------- # ----------
test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock json jsonb indirect_toast test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock json jsonb indirect_toast equivclass
# ---------- # ----------
# Another group of parallel tests # Another group of parallel tests
# NB: temp.sql does a reconnect which transiently uses 2 connections, # NB: temp.sql does a reconnect which transiently uses 2 connections,
......
...@@ -126,6 +126,7 @@ test: advisory_lock ...@@ -126,6 +126,7 @@ test: advisory_lock
test: json test: json
test: jsonb test: jsonb
test: indirect_toast test: indirect_toast
test: equivclass
test: plancache test: plancache
test: limit test: limit
test: plpgsql test: plpgsql
......
--
-- Tests for the planner's "equivalence class" mechanism
--
-- One thing that's not tested well during normal querying is the logic
-- for handling "broken" ECs. This is because an EC can only become broken
-- if its underlying btree operator family doesn't include a complete set
-- of cross-type equality operators. There are not (and should not be)
-- any such families built into Postgres; so we have to hack things up
-- to create one. We do this by making two alias types that are really
-- int8 (so we need no new C code) and adding only some operators for them
-- into the standard integer_ops opfamily.
create type int8alias1;
create function int8alias1in(cstring) returns int8alias1
strict immutable language internal as 'int8in';
create function int8alias1out(int8alias1) returns cstring
strict immutable language internal as 'int8out';
create type int8alias1 (
input = int8alias1in,
output = int8alias1out,
like = int8
);
create type int8alias2;
create function int8alias2in(cstring) returns int8alias2
strict immutable language internal as 'int8in';
create function int8alias2out(int8alias2) returns cstring
strict immutable language internal as 'int8out';
create type int8alias2 (
input = int8alias2in,
output = int8alias2out,
like = int8
);
create cast (int8 as int8alias1) without function;
create cast (int8 as int8alias2) without function;
create cast (int8alias1 as int8) without function;
create cast (int8alias2 as int8) without function;
create function int8alias1eq(int8alias1, int8alias1) returns bool
strict immutable language internal as 'int8eq';
create operator = (
procedure = int8alias1eq,
leftarg = int8alias1, rightarg = int8alias1,
commutator = =,
restrict = eqsel, join = eqjoinsel,
merges
);
alter operator family integer_ops using btree add
operator 3 = (int8alias1, int8alias1);
create function int8alias2eq(int8alias2, int8alias2) returns bool
strict immutable language internal as 'int8eq';
create operator = (
procedure = int8alias2eq,
leftarg = int8alias2, rightarg = int8alias2,
commutator = =,
restrict = eqsel, join = eqjoinsel,
merges
);
alter operator family integer_ops using btree add
operator 3 = (int8alias2, int8alias2);
create function int8alias1eq(int8, int8alias1) returns bool
strict immutable language internal as 'int8eq';
create operator = (
procedure = int8alias1eq,
leftarg = int8, rightarg = int8alias1,
restrict = eqsel, join = eqjoinsel,
merges
);
alter operator family integer_ops using btree add
operator 3 = (int8, int8alias1);
create function int8alias1eq(int8alias1, int8alias2) returns bool
strict immutable language internal as 'int8eq';
create operator = (
procedure = int8alias1eq,
leftarg = int8alias1, rightarg = int8alias2,
restrict = eqsel, join = eqjoinsel,
merges
);
alter operator family integer_ops using btree add
operator 3 = (int8alias1, int8alias2);
create function int8alias1lt(int8alias1, int8alias1) returns bool
strict immutable language internal as 'int8lt';
create operator < (
procedure = int8alias1lt,
leftarg = int8alias1, rightarg = int8alias1
);
alter operator family integer_ops using btree add
operator 1 < (int8alias1, int8alias1);
create function int8alias1cmp(int8, int8alias1) returns int
strict immutable language internal as 'btint8cmp';
alter operator family integer_ops using btree add
function 1 int8alias1cmp (int8, int8alias1);
create table ec0 (ff int8 primary key, f1 int8, f2 int8);
create table ec1 (ff int8 primary key, f1 int8alias1, f2 int8alias2);
create table ec2 (xf int8 primary key, x1 int8alias1, x2 int8alias2);
-- for the moment we only want to look at nestloop plans
set enable_hashjoin = off;
set enable_mergejoin = off;
--
-- Note that for cases where there's a missing operator, we don't care so
-- much whether the plan is ideal as that we don't fail or generate an
-- outright incorrect plan.
--
explain (costs off)
select * from ec0 where ff = f1 and f1 = '42'::int8;
explain (costs off)
select * from ec0 where ff = f1 and f1 = '42'::int8alias1;
explain (costs off)
select * from ec1 where ff = f1 and f1 = '42'::int8alias1;
explain (costs off)
select * from ec1 where ff = f1 and f1 = '42'::int8alias2;
explain (costs off)
select * from ec1, ec2 where ff = x1 and ff = '42'::int8;
explain (costs off)
select * from ec1, ec2 where ff = x1 and ff = '42'::int8alias1;
explain (costs off)
select * from ec1, ec2 where ff = x1 and '42'::int8 = x1;
explain (costs off)
select * from ec1, ec2 where ff = x1 and x1 = '42'::int8alias1;
explain (costs off)
select * from ec1, ec2 where ff = x1 and x1 = '42'::int8alias2;
create unique index ec1_expr1 on ec1((ff + 1));
create unique index ec1_expr2 on ec1((ff + 2 + 1));
create unique index ec1_expr3 on ec1((ff + 3 + 1));
create unique index ec1_expr4 on ec1((ff + 4));
explain (costs off)
select * from ec1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss1
where ss1.x = ec1.f1 and ec1.ff = 42::int8;
explain (costs off)
select * from ec1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss1
where ss1.x = ec1.f1 and ec1.ff = 42::int8 and ec1.ff = ec1.f1;
explain (costs off)
select * from ec1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss2
where ss1.x = ec1.f1 and ss1.x = ss2.x and ec1.ff = 42::int8;
-- let's try that as a mergejoin
set enable_mergejoin = on;
set enable_nestloop = off;
explain (costs off)
select * from ec1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss2
where ss1.x = ec1.f1 and ss1.x = ss2.x and ec1.ff = 42::int8;
-- check partially indexed scan
set enable_nestloop = on;
set enable_mergejoin = off;
drop index ec1_expr3;
explain (costs off)
select * from ec1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss1
where ss1.x = ec1.f1 and ec1.ff = 42::int8;
-- let's try that as a mergejoin
set enable_mergejoin = on;
set enable_nestloop = off;
explain (costs off)
select * from ec1,
(select ff + 1 as x from
(select ff + 2 as ff from ec1
union all
select ff + 3 as ff from ec1) ss0
union all
select ff + 4 as x from ec1) as ss1
where ss1.x = ec1.f1 and ec1.ff = 42::int8;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment