Change more places to be less trusting of RestrictInfo.is_pushed_down.

On further reflection, commit e5d83995e didn't go far enough: pretty much
everywhere in the planner that examines a clause's is_pushed_down flag
ought to be changed to use the more complicated behavior where we also
check the clause's required_relids.  Otherwise we could make incorrect
decisions about whether, say, a clause is safe to use as a hash clause.

Some (many?) of these places are safe as-is, either because they are
never reached while considering a parameterized path, or because there
are additional checks that would reject a pushed-down clause anyway.
However, it seems smarter to just code them all the same way rather
than rely on easily-broken reasoning of that sort.

In support of that, invent a new macro RINFO_IS_PUSHED_DOWN that should
be used in place of direct tests on the is_pushed_down flag.

Like the previous patch, back-patch to all supported branches.

Discussion: https://postgr.es/m/f8128b11-c5bf-3539-48cd-234178b2314d@proxel.se

diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 5a0c48227627d80592abeb0783a213926237e7e0..cbde638ba5b4e96e3f41d598e7fa4627f8797665 100644 (file)
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -137,6 +137,7 @@ static bool has_indexed_join_quals(NestPath *joinpath);
 static double approx_tuple_count(PlannerInfo *root, JoinPath *path,
                                   List *quals);
 static double calc_joinrel_size_estimate(PlannerInfo *root,
+                                                  RelOptInfo *joinrel,
                                                   double outer_rows,
                                                   double inner_rows,
                                                   SpecialJoinInfo *sjinfo,
@@ -3244,13 +3245,15 @@ compute_semi_anti_join_factors(PlannerInfo *root,
         */
        if (jointype == JOIN_ANTI)
        {
+               Relids          joinrelids = bms_union(outerrel->relids, innerrel->relids);
+
                joinquals = NIL;
                foreach(l, restrictlist)
                {
                        RestrictInfo *rinfo = (RestrictInfo *) lfirst(l);
 
                        Assert(IsA(rinfo, RestrictInfo));
-                       if (!rinfo->is_pushed_down)
+                       if (!RINFO_IS_PUSHED_DOWN(rinfo, joinrelids))
                                joinquals = lappend(joinquals, rinfo);
                }
        }
@@ -3559,6 +3562,7 @@ set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
                                                   List *restrictlist)
 {
        rel->rows = calc_joinrel_size_estimate(root,
+                                                                                  rel,
                                                                                   outer_rel->rows,
                                                                                   inner_rel->rows,
                                                                                   sjinfo,
@@ -3599,6 +3603,7 @@ get_parameterized_joinrel_size(PlannerInfo *root, RelOptInfo *rel,
         * estimate for any pair with the same parameterization.
         */
        nrows = calc_joinrel_size_estimate(root,
+                                                                          rel,
                                                                           outer_rows,
                                                                           inner_rows,
                                                                           sjinfo,
@@ -3616,6 +3621,7 @@ get_parameterized_joinrel_size(PlannerInfo *root, RelOptInfo *rel,
  */
 static double
 calc_joinrel_size_estimate(PlannerInfo *root,
+                                                  RelOptInfo *joinrel,
                                                   double outer_rows,
                                                   double inner_rows,
                                                   SpecialJoinInfo *sjinfo,
@@ -3648,7 +3654,7 @@ calc_joinrel_size_estimate(PlannerInfo *root,
                        RestrictInfo *rinfo = (RestrictInfo *) lfirst(l);
 
                        Assert(IsA(rinfo, RestrictInfo));
-                       if (rinfo->is_pushed_down)
+                       if (RINFO_IS_PUSHED_DOWN(rinfo, joinrel->relids))
                                pushedquals = lappend(pushedquals, rinfo);
                        else
                                joinquals = lappend(joinquals, rinfo);

diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 088bd8fff57e0a0350022a3c7b746a5c99ee886f..f1bca4c0aebcfb9e78924109aaacb8eb9363e3c1 100644 (file)
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -1145,7 +1145,7 @@ hash_inner_and_outer(PlannerInfo *root,
                 * If processing an outer join, only use its own join clauses for
                 * hashing.  For inner joins we need not be so picky.
                 */
-               if (isouterjoin && restrictinfo->is_pushed_down)
+               if (isouterjoin && RINFO_IS_PUSHED_DOWN(restrictinfo, joinrel->relids))
                        continue;
 
                if (!restrictinfo->can_join ||
@@ -1345,7 +1345,7 @@ select_mergejoin_clauses(PlannerInfo *root,
                 * we don't set have_nonmergeable_joinclause here because pushed-down
                 * clauses will become otherquals not joinquals.)
                 */
-               if (isouterjoin && restrictinfo->is_pushed_down)
+               if (isouterjoin && RINFO_IS_PUSHED_DOWN(restrictinfo, joinrel->relids))
                        continue;
 
                /* Check that clause is a mergeable operator clause */

diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 4d200e01449581beee251a0e474d052ae1a94dd4..a03ad5186e943a53d89c37a68a700b97400a017b 100644 (file)
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -31,6 +31,7 @@ static bool has_legal_joinclause(PlannerInfo *root, RelOptInfo *rel);
 static bool is_dummy_rel(RelOptInfo *rel);
 static void mark_dummy_rel(RelOptInfo *rel);
 static bool restriction_is_constant_false(List *restrictlist,
+                                                         RelOptInfo *joinrel,
                                                          bool only_pushed_down);
 
 
@@ -759,7 +760,7 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
        {
                case JOIN_INNER:
                        if (is_dummy_rel(rel1) || is_dummy_rel(rel2) ||
-                               restriction_is_constant_false(restrictlist, false))
+                               restriction_is_constant_false(restrictlist, joinrel, false))
                        {
                                mark_dummy_rel(joinrel);
                                break;
@@ -773,12 +774,12 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
                        break;
                case JOIN_LEFT:
                        if (is_dummy_rel(rel1) ||
-                               restriction_is_constant_false(restrictlist, true))
+                               restriction_is_constant_false(restrictlist, joinrel, true))
                        {
                                mark_dummy_rel(joinrel);
                                break;
                        }
-                       if (restriction_is_constant_false(restrictlist, false) &&
+                       if (restriction_is_constant_false(restrictlist, joinrel, false) &&
                                bms_is_subset(rel2->relids, sjinfo->syn_righthand))
                                mark_dummy_rel(rel2);
                        add_paths_to_joinrel(root, joinrel, rel1, rel2,
@@ -790,7 +791,7 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
                        break;
                case JOIN_FULL:
                        if ((is_dummy_rel(rel1) && is_dummy_rel(rel2)) ||
-                               restriction_is_constant_false(restrictlist, true))
+                               restriction_is_constant_false(restrictlist, joinrel, true))
                        {
                                mark_dummy_rel(joinrel);
                                break;
@@ -826,7 +827,7 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
                                bms_is_subset(sjinfo->min_righthand, rel2->relids))
                        {
                                if (is_dummy_rel(rel1) || is_dummy_rel(rel2) ||
-                                       restriction_is_constant_false(restrictlist, false))
+                                       restriction_is_constant_false(restrictlist, joinrel, false))
                                {
                                        mark_dummy_rel(joinrel);
                                        break;
@@ -849,7 +850,7 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
                                                                   sjinfo) != NULL)
                        {
                                if (is_dummy_rel(rel1) || is_dummy_rel(rel2) ||
-                                       restriction_is_constant_false(restrictlist, false))
+                                       restriction_is_constant_false(restrictlist, joinrel, false))
                                {
                                        mark_dummy_rel(joinrel);
                                        break;
@@ -864,12 +865,12 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
                        break;
                case JOIN_ANTI:
                        if (is_dummy_rel(rel1) ||
-                               restriction_is_constant_false(restrictlist, true))
+                               restriction_is_constant_false(restrictlist, joinrel, true))
                        {
                                mark_dummy_rel(joinrel);
                                break;
                        }
-                       if (restriction_is_constant_false(restrictlist, false) &&
+                       if (restriction_is_constant_false(restrictlist, joinrel, false) &&
                                bms_is_subset(rel2->relids, sjinfo->syn_righthand))
                                mark_dummy_rel(rel2);
                        add_paths_to_joinrel(root, joinrel, rel1, rel2,
@@ -1227,18 +1228,21 @@ mark_dummy_rel(RelOptInfo *rel)
 
 
 /*
- * restriction_is_constant_false --- is a restrictlist just FALSE?
+ * restriction_is_constant_false --- is a restrictlist just false?
  *
- * In cases where a qual is provably constant FALSE, eval_const_expressions
+ * In cases where a qual is provably constant false, eval_const_expressions
  * will generally have thrown away anything that's ANDed with it.  In outer
  * join situations this will leave us computing cartesian products only to
  * decide there's no match for an outer row, which is pretty stupid.  So,
  * we need to detect the case.
  *
- * If only_pushed_down is TRUE, then consider only pushed-down quals.
+ * If only_pushed_down is true, then consider only quals that are pushed-down
+ * from the point of view of the joinrel.
  */
 static bool
-restriction_is_constant_false(List *restrictlist, bool only_pushed_down)
+restriction_is_constant_false(List *restrictlist,
+                                                         RelOptInfo *joinrel,
+                                                         bool only_pushed_down)
 {
        ListCell   *lc;
 
@@ -1253,7 +1257,7 @@ restriction_is_constant_false(List *restrictlist, bool only_pushed_down)
                RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
 
                Assert(IsA(rinfo, RestrictInfo));
-               if (only_pushed_down && !rinfo->is_pushed_down)
+               if (only_pushed_down && !RINFO_IS_PUSHED_DOWN(rinfo, joinrel->relids))
                        continue;
 
                if (rinfo->clause && IsA(rinfo->clause, Const))

diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c
index 5e6a3fa1094fedf96c834c9be1766a840c0dc14f..ac88722643cedb23d5bcff7441cb58e9034f83a2 100644 (file)
--- a/src/backend/optimizer/plan/analyzejoins.c
+++ b/src/backend/optimizer/plan/analyzejoins.c
@@ -240,8 +240,7 @@ join_is_removable(PlannerInfo *root, SpecialJoinInfo *sjinfo)
                 * above the outer join, even if it references no other rels (it might
                 * be from WHERE, for example).
                 */
-               if (restrictinfo->is_pushed_down ||
-                       !bms_equal(restrictinfo->required_relids, joinrelids))
+               if (RINFO_IS_PUSHED_DOWN(restrictinfo, joinrelids))
                {
                        /*
                         * If such a clause actually references the inner rel then join
@@ -413,8 +412,7 @@ remove_rel_from_query(PlannerInfo *root, int relid, Relids joinrelids)
 
                remove_join_clause_from_rels(root, rinfo, rinfo->required_relids);
 
-               if (rinfo->is_pushed_down ||
-                       !bms_equal(rinfo->required_relids, joinrelids))
+               if (RINFO_IS_PUSHED_DOWN(rinfo, joinrelids))
                {
                        /* Recheck that qual doesn't actually reference the target rel */
                        Assert(!bms_is_member(relid, rinfo->clause_relids));

diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index dd271ff0c5d86c4c010b360d1d4e75246903ad9a..642c1768db52f05ba862b4f881d870322e477620 100644 (file)
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -1527,6 +1527,11 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
         * attach quals to the lowest level where they can be evaluated.  But
         * if we were ever to re-introduce a mechanism for delaying evaluation
         * of "expensive" quals, this area would need work.
+        *
+        * Note: generally, use of is_pushed_down has to go through the macro
+        * RINFO_IS_PUSHED_DOWN, because that flag alone is not always sufficient
+        * to tell whether a clause must be treated as pushed-down in context.
+        * This seems like another reason why it should perhaps be rethought.
         *----------
         */
        if (is_deduced)

diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 90255acdcb43dc30d83230f302a6869de28813c1..9e50877f5dfad9036ec16f47f729f85888d37e64 100644 (file)
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -597,7 +597,7 @@ extract_actual_clauses(List *restrictinfo_list,
  * extract_actual_join_clauses
  *
  * Extract bare clauses from 'restrictinfo_list', separating those that
- * syntactically match the join level from those that were pushed down.
+ * semantically match the join level from those that were pushed down.
  * Pseudoconstant clauses are excluded from the results.
  *
  * This is only used at outer joins, since for plain joins we don't care
@@ -620,15 +620,7 @@ extract_actual_join_clauses(List *restrictinfo_list,
 
                Assert(IsA(rinfo, RestrictInfo));
 
-               /*
-                * We must check both is_pushed_down and required_relids, since an
-                * outer-join clause that's been pushed down to some lower join level
-                * via path parameterization will not be marked is_pushed_down;
-                * nonetheless, it must be treated as a filter clause not a join
-                * clause so far as the lower join level is concerned.
-                */
-               if (rinfo->is_pushed_down ||
-                       !bms_is_subset(rinfo->required_relids, joinrelids))
+               if (RINFO_IS_PUSHED_DOWN(rinfo, joinrelids))
                {
                        if (!rinfo->pseudoconstant)
                                *otherquals = lappend(*otherquals, rinfo->clause);

diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index c2f0ae497bdc6aa0d9e1ed9ca41c3598d916a147..dc5ffdc126bf2c5c59d2442c1a513774c17831a1 100644 (file)
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -1111,7 +1111,8 @@ typedef struct HashPath
  * if we decide that it can be pushed down into the nullable side of the join.
  * In that case it acts as a plain filter qual for wherever it gets evaluated.
  * (In short, is_pushed_down is only false for non-degenerate outer join
- * conditions.  Possibly we should rename it to reflect that meaning?)
+ * conditions.  Possibly we should rename it to reflect that meaning?  But
+ * see also the comments for RINFO_IS_PUSHED_DOWN, below.)
  *
  * RestrictInfo nodes also contain an outerjoin_delayed flag, which is true
  * if the clause's applicability must be delayed due to any outer joins
@@ -1238,6 +1239,20 @@ typedef struct RestrictInfo
        Selectivity right_bucketsize;           /* avg bucketsize of right side */
 } RestrictInfo;
 
+/*
+ * This macro embodies the correct way to test whether a RestrictInfo is
+ * "pushed down" to a given outer join, that is, should be treated as a filter
+ * clause rather than a join clause at that outer join.  This is certainly so
+ * if is_pushed_down is true; but examining that is not sufficient anymore,
+ * because outer-join clauses will get pushed down to lower outer joins when
+ * we generate a path for the lower outer join that is parameterized by the
+ * LHS of the upper one.  We can detect such a clause by noting that its
+ * required_relids exceed the scope of the join.
+ */
+#define RINFO_IS_PUSHED_DOWN(rinfo, joinrelids) \
+       ((rinfo)->is_pushed_down || \
+        !bms_is_subset((rinfo)->required_relids, joinrelids))
+
 /*
  * Since mergejoinscansel() is a relatively expensive function, and would
  * otherwise be invoked many times while planning a large join tree,