Correctly identify which EC members are computable at a plan node.

find_computable_ec_member() had the wrong mental model of what
its primary caller prepare_sort_from_pathkeys() would do with
the selected EquivalenceClass member expression.  We will not
compute the EC expression in a plan node atop the one returning
the passed-in targetlist; rather, the EC expression will be
computed as an additional column of that targetlist.  So any
Var or quasi-Var used in the given tlist is also available to the
EC expression.  In simple cases this makes no difference because
the given tlist is just a list of Vars or quasi-Vars --- but if
we are considering an appendrel member produced by flattening
a UNION ALL, the tlist may contain expressions, resulting in
failure to match and a "could not find pathkey item to sort"
error.

To fix, we can flatten both the tlist and the EC members with
pull_var_clause(), and then just check for subset-ness, so
that the code is actually shorter than before.

While this bug is quite old, the present patch only works back to
v13.  We could possibly make it work in v12 by back-patching parts
of 375398244.  On the whole though I don't like the risk/reward
ratio of that idea.  v12's final release is next month, meaning
there would be no chance to correct matters if the patch causes a
regression.  Since this failure has escaped notice for 14 years,
it's likely nobody will hit it in the field with v12.

Per bug #18652 from Alexander Lakhin.

Andrei Lepikhov and Tom Lane

Discussion: https://postgr.es/m/18652-deaa782ebcca85d1@postgresql.org

diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
index 8a61dd5af826636be49b54d9037b1b0b1e4e3255..2922758e00d932a02562c8200448d324a17e4547 100644 (file)
--- a/src/backend/optimizer/path/equivclass.c
+++ b/src/backend/optimizer/path/equivclass.c
@@ -35,7 +35,6 @@
 static EquivalenceMember *add_eq_member(EquivalenceClass *ec,
                                        Expr *expr, Relids relids, Relids nullable_relids,
                                        bool is_child, Oid datatype);
-static bool is_exprlist_member(Expr *node, List *exprs);
 static void generate_base_implied_equalities_const(PlannerInfo *root,
                                                   EquivalenceClass *ec);
 static void generate_base_implied_equalities_no_const(PlannerInfo *root,
@@ -832,9 +831,18 @@ find_ec_member_matching_expr(EquivalenceClass *ec,
  *     expressions appearing in "exprs"; return NULL if no match.
  *
  * "exprs" can be either a list of bare expression trees, or a list of
- * TargetEntry nodes.  Either way, it should contain Vars and possibly
- * Aggrefs and WindowFuncs, which are matched to the corresponding elements
- * of the EquivalenceClass's expressions.
+ * TargetEntry nodes.  Typically it will contain Vars and possibly Aggrefs
+ * and WindowFuncs; however, when considering an appendrel member the list
+ * could contain arbitrary expressions.  We consider an EC member to be
+ * computable if all the Vars, PlaceHolderVars, Aggrefs, and WindowFuncs
+ * it needs are present in "exprs".
+ *
+ * There is some subtlety in that definition: for example, if an EC member is
+ * Var_A + 1 while what is in "exprs" is Var_A + 2, it's still computable.
+ * This works because in the final plan tree, the EC member's expression will
+ * be computed as part of the same plan node targetlist that is currently
+ * represented by "exprs".  So if we have Var_A available for the existing
+ * tlist member, it must be OK to use it in the EC expression too.
  *
  * Unlike find_ec_member_matching_expr, there's no special provision here
  * for binary-compatible relabeling.  This is intentional: if we have to
@@ -854,12 +862,24 @@ find_computable_ec_member(PlannerInfo *root,
                          Relids relids,
                          bool require_parallel_safe)
 {
+   List       *exprvars;
    ListCell   *lc;
 
+   /*
+    * Pull out the Vars and quasi-Vars present in "exprs".  In the typical
+    * non-appendrel case, this is just another representation of the same
+    * list.  However, it does remove the distinction between the case of a
+    * list of plain expressions and a list of TargetEntrys.
+    */
+   exprvars = pull_var_clause((Node *) exprs,
+                              PVC_INCLUDE_AGGREGATES |
+                              PVC_INCLUDE_WINDOWFUNCS |
+                              PVC_INCLUDE_PLACEHOLDERS);
+
    foreach(lc, ec->ec_members)
    {
        EquivalenceMember *em = (EquivalenceMember *) lfirst(lc);
-       List       *exprvars;
+       List       *emvars;
        ListCell   *lc2;
 
        /*
@@ -877,18 +897,18 @@ find_computable_ec_member(PlannerInfo *root,
            continue;
 
        /*
-        * Match if all Vars and quasi-Vars are available in "exprs".
+        * Match if all Vars and quasi-Vars are present in "exprs".
         */
-       exprvars = pull_var_clause((Node *) em->em_expr,
-                                  PVC_INCLUDE_AGGREGATES |
-                                  PVC_INCLUDE_WINDOWFUNCS |
-                                  PVC_INCLUDE_PLACEHOLDERS);
-       foreach(lc2, exprvars)
+       emvars = pull_var_clause((Node *) em->em_expr,
+                                PVC_INCLUDE_AGGREGATES |
+                                PVC_INCLUDE_WINDOWFUNCS |
+                                PVC_INCLUDE_PLACEHOLDERS);
+       foreach(lc2, emvars)
        {
-           if (!is_exprlist_member(lfirst(lc2), exprs))
+           if (!list_member(exprvars, lfirst(lc2)))
                break;
        }
-       list_free(exprvars);
+       list_free(emvars);
        if (lc2)
            continue;           /* we hit a non-available Var */
 
@@ -906,31 +926,6 @@ find_computable_ec_member(PlannerInfo *root,
    return NULL;
 }
 
-/*
- * is_exprlist_member
- *   Subroutine for find_computable_ec_member: is "node" in "exprs"?
- *
- * Per the requirements of that function, "exprs" might or might not have
- * TargetEntry superstructure.
- */
-static bool
-is_exprlist_member(Expr *node, List *exprs)
-{
-   ListCell   *lc;
-
-   foreach(lc, exprs)
-   {
-       Expr       *expr = (Expr *) lfirst(lc);
-
-       if (expr && IsA(expr, TargetEntry))
-           expr = ((TargetEntry *) expr)->expr;
-
-       if (equal(node, expr))
-           return true;
-   }
-   return false;
-}
-
 /*
  * Find an equivalence class member expression, all of whose Vars, come from
  * the indicated relation.

diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 3f2bb2414a2442771cf1eeb68e7d6c9aeb819429..9d718bc3bef7378570f9a7dc77f1da2d9e2a9c50 100644 (file)
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -1568,6 +1568,36 @@ select min(1-id) from matest0;
 
 reset enable_seqscan;
 reset enable_parallel_append;
+explain (verbose, costs off)  -- bug #18652
+select 1 - id as c from
+(select id from matest3 t1 union all select id * 2 from matest3 t2) ss
+order by c;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Result
+   Output: ((1 - t1.id))
+   ->  Merge Append
+         Sort Key: ((1 - t1.id))
+         ->  Index Scan using matest3i on public.matest3 t1
+               Output: t1.id, (1 - t1.id)
+         ->  Sort
+               Output: ((t2.id * 2)), ((1 - (t2.id * 2)))
+               Sort Key: ((1 - (t2.id * 2)))
+               ->  Seq Scan on public.matest3 t2
+                     Output: (t2.id * 2), (1 - (t2.id * 2))
+(11 rows)
+
+select 1 - id as c from
+(select id from matest3 t1 union all select id * 2 from matest3 t2) ss
+order by c;
+  c  
+-----
+ -11
+  -9
+  -5
+  -4
+(4 rows)
+
 drop table matest0 cascade;
 NOTICE:  drop cascades to 3 other objects
 DETAIL:  drop cascades to table matest1

diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index b950d8603039b0ed95a36168a0eae3fb031f56fb..0c066405fb536541c2ede95075f3df45676c90a1 100644 (file)
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -562,6 +562,14 @@ select min(1-id) from matest0;
 reset enable_seqscan;
 reset enable_parallel_append;
 
+explain (verbose, costs off)  -- bug #18652
+select 1 - id as c from
+(select id from matest3 t1 union all select id * 2 from matest3 t2) ss
+order by c;
+select 1 - id as c from
+(select id from matest3 t1 union all select id * 2 from matest3 t2) ss
+order by c;
+
 drop table matest0 cascade;
 
 --