]> granicus.if.org Git - postgresql/blobdiff - src/backend/optimizer/plan/setrefs.c
pgindent run for 9.0
[postgresql] / src / backend / optimizer / plan / setrefs.c
index b3be9b741520079f6dfa63209fe17c41b8518dc1..70be2e66f2d20d7dcd7e64cc45fc98e9f37fcfa9 100644 (file)
@@ -4,25 +4,27 @@
  *       Post-processing of a completed plan tree: fix references to subplan
  *       vars, compute regproc values for operators, etc
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.139 2007/11/15 22:25:15 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.160 2010/02/26 02:00:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "access/transam.h"
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
-#include "parser/parse_expr.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 
 typedef struct
@@ -36,7 +38,8 @@ typedef struct
 {
        List       *tlist;                      /* underlying target list */
        int                     num_vars;               /* number of plain Var tlist entries */
-       bool            has_non_vars;   /* are there non-plain-Var entries? */
+       bool            has_ph_vars;    /* are there PlaceHolderVar entries? */
+       bool            has_non_vars;   /* are there other entries? */
        /* array of num_vars entries: */
        tlist_vinfo vars[1];            /* VARIABLE LENGTH ARRAY */
 } indexed_tlist;                               /* VARIABLE LENGTH STRUCT */
@@ -63,6 +66,17 @@ typedef struct
        int                     rtoffset;
 } fix_upper_expr_context;
 
+/*
+ * Check if a Const node is a regclass value.  We accept plain OID too,
+ * since a regclass Const will get folded to that type if it's an argument
+ * to oideq or similar operators.  (This might result in some extraneous
+ * values in a plan's list of relation dependencies, but the worst result
+ * would be occasional useless replans.)
+ */
+#define ISREGCLASSCONST(con) \
+       (((con)->consttype == REGCLASSOID || (con)->consttype == OIDOID) && \
+        !(con)->constisnull)
+
 #define fix_scan_list(glob, lst, rtoffset) \
        ((List *) fix_scan_expr(glob, (Node *) (lst), rtoffset))
 
@@ -73,6 +87,7 @@ static Plan *set_subqueryscan_references(PlannerGlobal *glob,
 static bool trivial_subqueryscan(SubqueryScan *plan);
 static Node *fix_scan_expr(PlannerGlobal *glob, Node *node, int rtoffset);
 static Node *fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context);
+static bool fix_scan_expr_walker(Node *node, fix_scan_expr_context *context);
 static void set_join_references(PlannerGlobal *glob, Join *join, int rtoffset);
 static void set_inner_join_references(PlannerGlobal *glob, Plan *inner_plan,
                                                  indexed_tlist *outer_itlist);
@@ -86,6 +101,10 @@ static Var *search_indexed_tlist_for_var(Var *var,
 static Var *search_indexed_tlist_for_non_var(Node *node,
                                                                 indexed_tlist *itlist,
                                                                 Index newvarno);
+static Var *search_indexed_tlist_for_sortgroupref(Node *node,
+                                                                         Index sortgroupref,
+                                                                         indexed_tlist *itlist,
+                                                                         Index newvarno);
 static List *fix_join_expr(PlannerGlobal *glob,
                          List *clauses,
                          indexed_tlist *outer_itlist,
@@ -100,6 +119,8 @@ static Node *fix_upper_expr(PlannerGlobal *glob,
 static Node *fix_upper_expr_mutator(Node *node,
                                           fix_upper_expr_context *context);
 static bool fix_opfuncids_walker(Node *node, void *context);
+static bool extract_query_dependencies_walker(Node *node,
+                                                                 PlannerGlobal *context);
 
 
 /*****************************************************************************
@@ -126,10 +147,12 @@ static bool fix_opfuncids_walker(Node *node, void *context);
  * 4. We compute regproc OIDs for operators (ie, we look up the function
  * that implements each op).
  *
- * 5. We create a list of OIDs of relations that the plan depends on.
+ * 5. We create lists of specific objects that the plan depends on.
  * This will be used by plancache.c to drive invalidation of cached plans.
- * (Someday we might want to generalize this to include other types of
- * objects, but for now tracking relations seems to solve most problems.)
+ * Relation dependencies are represented by OIDs, and everything else by
+ * PlanInvalItems (this distinction is motivated by the shared-inval APIs).
+ * Currently, relations and user-defined functions are the only types of
+ * objects that are explicitly tracked this way.
  *
  * We also perform one final optimization step, which is to delete
  * SubqueryScan plan nodes that aren't doing anything useful (ie, have
@@ -147,12 +170,15 @@ static bool fix_opfuncids_walker(Node *node, void *context);
  *     glob: global data for planner run
  *     plan: the topmost node of the plan
  *     rtable: the rangetable for the current subquery
+ *     rowmarks: the PlanRowMark list for the current subquery
  *
  * The return value is normally the same Plan node passed in, but can be
  * different when the passed-in Plan is a SubqueryScan we decide isn't needed.
  *
- * The flattened rangetable entries are appended to glob->finalrtable, and
- * the list of relation OIDs is appended to glob->relationOids.
+ * The flattened rangetable entries are appended to glob->finalrtable,
+ * and we also append rowmarks entries to glob->finalrowmarks.
+ * Plan dependencies are appended to glob->relationOids (for relations)
+ * and glob->invalItems (for everything else).
  *
  * Notice that we modify Plan nodes in-place, but use expression_tree_mutator
  * to process targetlist and qual expressions. We can assume that the Plan
@@ -160,7 +186,8 @@ static bool fix_opfuncids_walker(Node *node, void *context);
  * it's not so safe to assume that for expression tree nodes.
  */
 Plan *
-set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable)
+set_plan_references(PlannerGlobal *glob, Plan *plan,
+                                       List *rtable, List *rowmarks)
 {
        int                     rtoffset = list_length(glob->finalrtable);
        ListCell   *lc;
@@ -169,7 +196,9 @@ set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable)
         * In the flat rangetable, we zero out substructure pointers that are not
         * needed by the executor; this reduces the storage space and copying cost
         * for cached plans.  We keep only the alias and eref Alias fields, which
-        * are needed by EXPLAIN.
+        * are needed by EXPLAIN, and the selectedCols and modifiedCols bitmaps,
+        * which are needed for executor-startup permissions checking and for
+        * trigger event checking.
         */
        foreach(lc, rtable)
        {
@@ -182,11 +211,13 @@ set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable)
 
                /* zap unneeded sub-structure */
                newrte->subquery = NULL;
+               newrte->joinaliasvars = NIL;
                newrte->funcexpr = NULL;
                newrte->funccoltypes = NIL;
                newrte->funccoltypmods = NIL;
                newrte->values_lists = NIL;
-               newrte->joinaliasvars = NIL;
+               newrte->ctecoltypes = NIL;
+               newrte->ctecoltypmods = NIL;
 
                glob->finalrtable = lappend(glob->finalrtable, newrte);
 
@@ -207,6 +238,27 @@ set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable)
                                                                                         newrte->relid);
        }
 
+       /*
+        * Adjust RT indexes of PlanRowMarks and add to final rowmarks list
+        */
+       foreach(lc, rowmarks)
+       {
+               PlanRowMark *rc = (PlanRowMark *) lfirst(lc);
+               PlanRowMark *newrc;
+
+               Assert(IsA(rc, PlanRowMark));
+
+               /* flat copy is enough since all fields are scalars */
+               newrc = (PlanRowMark *) palloc(sizeof(PlanRowMark));
+               memcpy(newrc, rc, sizeof(PlanRowMark));
+
+               /* adjust indexes */
+               newrc->rti += rtoffset;
+               newrc->prti += rtoffset;
+
+               glob->finalrowmarks = lappend(glob->finalrowmarks, newrc);
+       }
+
        /* Now fix the Plan tree */
        return set_plan_refs(glob, plan, rtoffset);
 }
@@ -324,7 +376,28 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
                                        fix_scan_list(glob, splan->values_lists, rtoffset);
                        }
                        break;
+               case T_CteScan:
+                       {
+                               CteScan    *splan = (CteScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(glob, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(glob, splan->scan.plan.qual, rtoffset);
+                       }
+                       break;
+               case T_WorkTableScan:
+                       {
+                               WorkTableScan *splan = (WorkTableScan *) plan;
 
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(glob, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(glob, splan->scan.plan.qual, rtoffset);
+                       }
+                       break;
                case T_NestLoop:
                case T_MergeJoin:
                case T_HashJoin:
@@ -352,6 +425,27 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
                         */
                        Assert(plan->qual == NIL);
                        break;
+               case T_LockRows:
+                       {
+                               LockRows   *splan = (LockRows *) plan;
+
+                               /*
+                                * Like the plan types above, LockRows doesn't evaluate its
+                                * tlist or quals.      But we have to fix up the RT indexes in
+                                * its rowmarks.
+                                */
+                               set_dummy_tlist_references(plan, rtoffset);
+                               Assert(splan->plan.qual == NIL);
+
+                               foreach(l, splan->rowMarks)
+                               {
+                                       PlanRowMark *rc = (PlanRowMark *) lfirst(l);
+
+                                       rc->rti += rtoffset;
+                                       rc->prti += rtoffset;
+                               }
+                       }
+                       break;
                case T_Limit:
                        {
                                Limit      *splan = (Limit *) plan;
@@ -375,6 +469,23 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
                case T_Group:
                        set_upper_references(glob, plan, rtoffset);
                        break;
+               case T_WindowAgg:
+                       {
+                               WindowAgg  *wplan = (WindowAgg *) plan;
+
+                               set_upper_references(glob, plan, rtoffset);
+
+                               /*
+                                * Like Limit node limit/offset expressions, WindowAgg has
+                                * frame offset expressions, which cannot contain subplan
+                                * variable refs, so fix_scan_expr works for them.
+                                */
+                               wplan->startOffset =
+                                       fix_scan_expr(glob, wplan->startOffset, rtoffset);
+                               wplan->endOffset =
+                                       fix_scan_expr(glob, wplan->endOffset, rtoffset);
+                       }
+                       break;
                case T_Result:
                        {
                                Result     *splan = (Result *) plan;
@@ -397,6 +508,36 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
                                        fix_scan_expr(glob, splan->resconstantqual, rtoffset);
                        }
                        break;
+               case T_ModifyTable:
+                       {
+                               ModifyTable *splan = (ModifyTable *) plan;
+
+                               /*
+                                * planner.c already called set_returning_clause_references,
+                                * so we should not process either the targetlist or the
+                                * returningLists.
+                                */
+                               Assert(splan->plan.qual == NIL);
+
+                               foreach(l, splan->resultRelations)
+                               {
+                                       lfirst_int(l) += rtoffset;
+                               }
+                               foreach(l, splan->rowMarks)
+                               {
+                                       PlanRowMark *rc = (PlanRowMark *) lfirst(l);
+
+                                       rc->rti += rtoffset;
+                                       rc->prti += rtoffset;
+                               }
+                               foreach(l, splan->plans)
+                               {
+                                       lfirst(l) = set_plan_refs(glob,
+                                                                                         (Plan *) lfirst(l),
+                                                                                         rtoffset);
+                               }
+                       }
+                       break;
                case T_Append:
                        {
                                Append     *splan = (Append *) plan;
@@ -415,6 +556,11 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
                                }
                        }
                        break;
+               case T_RecursiveUnion:
+                       /* This doesn't evaluate targetlist or check quals either */
+                       set_dummy_tlist_references(plan, rtoffset);
+                       Assert(plan->qual == NIL);
+                       break;
                case T_BitmapAnd:
                        {
                                BitmapAnd  *splan = (BitmapAnd *) plan;
@@ -480,10 +626,12 @@ set_subqueryscan_references(PlannerGlobal *glob,
        Plan       *result;
 
        /* First, recursively process the subplan */
-       plan->subplan = set_plan_references(glob, plan->subplan, plan->subrtable);
+       plan->subplan = set_plan_references(glob, plan->subplan,
+                                                                               plan->subrtable, plan->subrowmark);
 
-       /* subrtable is no longer needed in the plan tree */
+       /* subrtable/subrowmark are no longer needed in the plan tree */
        plan->subrtable = NIL;
+       plan->subrowmark = NIL;
 
        if (trivial_subqueryscan(plan))
        {
@@ -610,6 +758,79 @@ copyVar(Var *var)
        return newvar;
 }
 
+/*
+ * fix_expr_common
+ *             Do generic set_plan_references processing on an expression node
+ *
+ * This is code that is common to all variants of expression-fixing.
+ * We must look up operator opcode info for OpExpr and related nodes,
+ * add OIDs from regclass Const nodes into glob->relationOids,
+ * and add catalog TIDs for user-defined functions into glob->invalItems.
+ *
+ * We assume it's okay to update opcode info in-place.  So this could possibly
+ * scribble on the planner's input data structures, but it's OK.
+ */
+static void
+fix_expr_common(PlannerGlobal *glob, Node *node)
+{
+       /* We assume callers won't call us on a NULL pointer */
+       if (IsA(node, Aggref))
+       {
+               record_plan_function_dependency(glob,
+                                                                               ((Aggref *) node)->aggfnoid);
+       }
+       else if (IsA(node, WindowFunc))
+       {
+               record_plan_function_dependency(glob,
+                                                                               ((WindowFunc *) node)->winfnoid);
+       }
+       else if (IsA(node, FuncExpr))
+       {
+               record_plan_function_dependency(glob,
+                                                                               ((FuncExpr *) node)->funcid);
+       }
+       else if (IsA(node, OpExpr))
+       {
+               set_opfuncid((OpExpr *) node);
+               record_plan_function_dependency(glob,
+                                                                               ((OpExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, DistinctExpr))
+       {
+               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
+               record_plan_function_dependency(glob,
+                                                                               ((DistinctExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, NullIfExpr))
+       {
+               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
+               record_plan_function_dependency(glob,
+                                                                               ((NullIfExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, ScalarArrayOpExpr))
+       {
+               set_sa_opfuncid((ScalarArrayOpExpr *) node);
+               record_plan_function_dependency(glob,
+                                                                        ((ScalarArrayOpExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, ArrayCoerceExpr))
+       {
+               if (OidIsValid(((ArrayCoerceExpr *) node)->elemfuncid))
+                       record_plan_function_dependency(glob,
+                                                                        ((ArrayCoerceExpr *) node)->elemfuncid);
+       }
+       else if (IsA(node, Const))
+       {
+               Const      *con = (Const *) node;
+
+               /* Check for regclass reference */
+               if (ISREGCLASSCONST(con))
+                       glob->relationOids =
+                               lappend_oid(glob->relationOids,
+                                                       DatumGetObjectId(con->constvalue));
+       }
+}
+
 /*
  * fix_scan_expr
  *             Do set_plan_references processing on a scan-level expression
@@ -625,7 +846,24 @@ fix_scan_expr(PlannerGlobal *glob, Node *node, int rtoffset)
 
        context.glob = glob;
        context.rtoffset = rtoffset;
-       return fix_scan_expr_mutator(node, &context);
+
+       if (rtoffset != 0 || glob->lastPHId != 0)
+       {
+               return fix_scan_expr_mutator(node, &context);
+       }
+       else
+       {
+               /*
+                * If rtoffset == 0, we don't need to change any Vars, and if there
+                * are no placeholders anywhere we won't need to remove them.  Then
+                * it's OK to just scribble on the input node tree instead of copying
+                * (since the only change, filling in any unset opfuncid fields, is
+                * harmless).  This saves just enough cycles to be noticeable on
+                * trivial queries.
+                */
+               (void) fix_scan_expr_walker(node, &context);
+               return node;
+       }
 }
 
 static Node *
@@ -659,34 +897,29 @@ fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context)
                cexpr->cvarno += context->rtoffset;
                return (Node *) cexpr;
        }
-
-       /*
-        * Since we update opcode info in-place, this part could possibly scribble
-        * on the planner's input data structures, but it's OK.
-        */
-       if (IsA(node, OpExpr))
-               set_opfuncid((OpExpr *) node);
-       else if (IsA(node, DistinctExpr))
-               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, NullIfExpr))
-               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, ScalarArrayOpExpr))
-               set_sa_opfuncid((ScalarArrayOpExpr *) node);
-       else if (IsA(node, Const))
+       if (IsA(node, PlaceHolderVar))
        {
-               Const      *con = (Const *) node;
+               /* At scan level, we should always just evaluate the contained expr */
+               PlaceHolderVar *phv = (PlaceHolderVar *) node;
 
-               /* Check for regclass reference */
-               if (con->consttype == REGCLASSOID && !con->constisnull)
-                       context->glob->relationOids =
-                               lappend_oid(context->glob->relationOids,
-                                                       DatumGetObjectId(con->constvalue));
-               /* Fall through to let expression_tree_mutator copy it */
+               return fix_scan_expr_mutator((Node *) phv->phexpr, context);
        }
+       fix_expr_common(context->glob, node);
        return expression_tree_mutator(node, fix_scan_expr_mutator,
                                                                   (void *) context);
 }
 
+static bool
+fix_scan_expr_walker(Node *node, fix_scan_expr_context *context)
+{
+       if (node == NULL)
+               return false;
+       Assert(!IsA(node, PlaceHolderVar));
+       fix_expr_common(context->glob, node);
+       return expression_tree_walker(node, fix_scan_expr_walker,
+                                                                 (void *) context);
+}
+
 /*
  * set_join_references
  *       Modify the target list and quals of a join node to reference its
@@ -984,10 +1217,25 @@ set_upper_references(PlannerGlobal *glob, Plan *plan, int rtoffset)
                TargetEntry *tle = (TargetEntry *) lfirst(l);
                Node       *newexpr;
 
-               newexpr = fix_upper_expr(glob,
-                                                                (Node *) tle->expr,
-                                                                subplan_itlist,
-                                                                rtoffset);
+               /* If it's a non-Var sort/group item, first try to match by sortref */
+               if (tle->ressortgroupref != 0 && !IsA(tle->expr, Var))
+               {
+                       newexpr = (Node *)
+                               search_indexed_tlist_for_sortgroupref((Node *) tle->expr,
+                                                                                                         tle->ressortgroupref,
+                                                                                                         subplan_itlist,
+                                                                                                         OUTER);
+                       if (!newexpr)
+                               newexpr = fix_upper_expr(glob,
+                                                                                (Node *) tle->expr,
+                                                                                subplan_itlist,
+                                                                                rtoffset);
+               }
+               else
+                       newexpr = fix_upper_expr(glob,
+                                                                        (Node *) tle->expr,
+                                                                        subplan_itlist,
+                                                                        rtoffset);
                tle = flatCopyTargetEntry(tle);
                tle->expr = (Expr *) newexpr;
                output_targetlist = lappend(output_targetlist, tle);
@@ -1081,6 +1329,7 @@ build_tlist_index(List *tlist)
                           list_length(tlist) * sizeof(tlist_vinfo));
 
        itlist->tlist = tlist;
+       itlist->has_ph_vars = false;
        itlist->has_non_vars = false;
 
        /* Find the Vars and fill in the index array */
@@ -1098,6 +1347,8 @@ build_tlist_index(List *tlist)
                        vinfo->resno = tle->resno;
                        vinfo++;
                }
+               else if (tle->expr && IsA(tle->expr, PlaceHolderVar))
+                       itlist->has_ph_vars = true;
                else
                        itlist->has_non_vars = true;
        }
@@ -1111,7 +1362,9 @@ build_tlist_index(List *tlist)
  * build_tlist_index_other_vars --- build a restricted tlist index
  *
  * This is like build_tlist_index, but we only index tlist entries that
- * are Vars and belong to some rel other than the one specified.
+ * are Vars belonging to some rel other than the one specified.  We will set
+ * has_ph_vars (allowing PlaceHolderVars to be matched), but not has_non_vars
+ * (so nothing other than Vars and PlaceHolderVars can be matched).
  */
 static indexed_tlist *
 build_tlist_index_other_vars(List *tlist, Index ignore_rel)
@@ -1126,6 +1379,7 @@ build_tlist_index_other_vars(List *tlist, Index ignore_rel)
                           list_length(tlist) * sizeof(tlist_vinfo));
 
        itlist->tlist = tlist;
+       itlist->has_ph_vars = false;
        itlist->has_non_vars = false;
 
        /* Find the desired Vars and fill in the index array */
@@ -1146,6 +1400,8 @@ build_tlist_index_other_vars(List *tlist, Index ignore_rel)
                                vinfo++;
                        }
                }
+               else if (tle->expr && IsA(tle->expr, PlaceHolderVar))
+                       itlist->has_ph_vars = true;
        }
 
        itlist->num_vars = (vinfo - itlist->vars);
@@ -1196,7 +1452,8 @@ search_indexed_tlist_for_var(Var *var, indexed_tlist *itlist,
  * If a match is found, return a Var constructed to reference the tlist item.
  * If no match, return NULL.
  *
- * NOTE: it is a waste of time to call this if !itlist->has_non_vars
+ * NOTE: it is a waste of time to call this unless itlist->has_ph_vars or
+ * itlist->has_non_vars
  */
 static Var *
 search_indexed_tlist_for_non_var(Node *node,
@@ -1222,6 +1479,49 @@ search_indexed_tlist_for_non_var(Node *node,
        return NULL;                            /* no match */
 }
 
+/*
+ * search_indexed_tlist_for_sortgroupref --- find a sort/group expression
+ *             (which is assumed not to be just a Var)
+ *
+ * If a match is found, return a Var constructed to reference the tlist item.
+ * If no match, return NULL.
+ *
+ * This is needed to ensure that we select the right subplan TLE in cases
+ * where there are multiple textually-equal()-but-volatile sort expressions.
+ * And it's also faster than search_indexed_tlist_for_non_var.
+ */
+static Var *
+search_indexed_tlist_for_sortgroupref(Node *node,
+                                                                         Index sortgroupref,
+                                                                         indexed_tlist *itlist,
+                                                                         Index newvarno)
+{
+       ListCell   *lc;
+
+       foreach(lc, itlist->tlist)
+       {
+               TargetEntry *tle = (TargetEntry *) lfirst(lc);
+
+               /* The equal() check should be redundant, but let's be paranoid */
+               if (tle->ressortgroupref == sortgroupref &&
+                       equal(node, tle->expr))
+               {
+                       /* Found a matching subplan output expression */
+                       Var                *newvar;
+
+                       newvar = makeVar(newvarno,
+                                                        tle->resno,
+                                                        exprType((Node *) tle->expr),
+                                                        exprTypmod((Node *) tle->expr),
+                                                        0);
+                       newvar->varnoold = 0;           /* wasn't ever a plain Var */
+                       newvar->varoattno = 0;
+                       return newvar;
+               }
+       }
+       return NULL;                            /* no match */
+}
+
 /*
  * fix_join_expr
  *        Create a new set of targetlist entries or join qual clauses by
@@ -1311,6 +1611,31 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
                /* No referent found for Var */
                elog(ERROR, "variable not found in subplan target lists");
        }
+       if (IsA(node, PlaceHolderVar))
+       {
+               PlaceHolderVar *phv = (PlaceHolderVar *) node;
+
+               /* See if the PlaceHolderVar has bubbled up from a lower plan node */
+               if (context->outer_itlist->has_ph_vars)
+               {
+                       newvar = search_indexed_tlist_for_non_var((Node *) phv,
+                                                                                                         context->outer_itlist,
+                                                                                                         OUTER);
+                       if (newvar)
+                               return (Node *) newvar;
+               }
+               if (context->inner_itlist && context->inner_itlist->has_ph_vars)
+               {
+                       newvar = search_indexed_tlist_for_non_var((Node *) phv,
+                                                                                                         context->inner_itlist,
+                                                                                                         INNER);
+                       if (newvar)
+                               return (Node *) newvar;
+               }
+
+               /* If not supplied by input plans, evaluate the contained expr */
+               return fix_join_expr_mutator((Node *) phv->phexpr, context);
+       }
        /* Try matching more complex expressions too, if tlists have any */
        if (context->outer_itlist->has_non_vars)
        {
@@ -1328,30 +1653,7 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
                if (newvar)
                        return (Node *) newvar;
        }
-
-       /*
-        * Since we update opcode info in-place, this part could possibly scribble
-        * on the planner's input data structures, but it's OK.
-        */
-       if (IsA(node, OpExpr))
-               set_opfuncid((OpExpr *) node);
-       else if (IsA(node, DistinctExpr))
-               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, NullIfExpr))
-               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, ScalarArrayOpExpr))
-               set_sa_opfuncid((ScalarArrayOpExpr *) node);
-       else if (IsA(node, Const))
-       {
-               Const      *con = (Const *) node;
-
-               /* Check for regclass reference */
-               if (con->consttype == REGCLASSOID && !con->constisnull)
-                       context->glob->relationOids =
-                               lappend_oid(context->glob->relationOids,
-                                                       DatumGetObjectId(con->constvalue));
-               /* Fall through to let expression_tree_mutator copy it */
-       }
+       fix_expr_common(context->glob, node);
        return expression_tree_mutator(node,
                                                                   fix_join_expr_mutator,
                                                                   (void *) context);
@@ -1417,6 +1719,22 @@ fix_upper_expr_mutator(Node *node, fix_upper_expr_context *context)
                        elog(ERROR, "variable not found in subplan target list");
                return (Node *) newvar;
        }
+       if (IsA(node, PlaceHolderVar))
+       {
+               PlaceHolderVar *phv = (PlaceHolderVar *) node;
+
+               /* See if the PlaceHolderVar has bubbled up from a lower plan node */
+               if (context->subplan_itlist->has_ph_vars)
+               {
+                       newvar = search_indexed_tlist_for_non_var((Node *) phv,
+                                                                                                         context->subplan_itlist,
+                                                                                                         OUTER);
+                       if (newvar)
+                               return (Node *) newvar;
+               }
+               /* If not supplied by input plan, evaluate the contained expr */
+               return fix_upper_expr_mutator((Node *) phv->phexpr, context);
+       }
        /* Try matching more complex expressions too, if tlist has any */
        if (context->subplan_itlist->has_non_vars)
        {
@@ -1426,30 +1744,7 @@ fix_upper_expr_mutator(Node *node, fix_upper_expr_context *context)
                if (newvar)
                        return (Node *) newvar;
        }
-
-       /*
-        * Since we update opcode info in-place, this part could possibly scribble
-        * on the planner's input data structures, but it's OK.
-        */
-       if (IsA(node, OpExpr))
-               set_opfuncid((OpExpr *) node);
-       else if (IsA(node, DistinctExpr))
-               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, NullIfExpr))
-               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, ScalarArrayOpExpr))
-               set_sa_opfuncid((ScalarArrayOpExpr *) node);
-       else if (IsA(node, Const))
-       {
-               Const      *con = (Const *) node;
-
-               /* Check for regclass reference */
-               if (con->consttype == REGCLASSOID && !con->constisnull)
-                       context->glob->relationOids =
-                               lappend_oid(context->glob->relationOids,
-                                                       DatumGetObjectId(con->constvalue));
-               /* Fall through to let expression_tree_mutator copy it */
-       }
+       fix_expr_common(context->glob, node);
        return expression_tree_mutator(node,
                                                                   fix_upper_expr_mutator,
                                                                   (void *) context);
@@ -1461,7 +1756,7 @@ fix_upper_expr_mutator(Node *node, fix_upper_expr_context *context)
  *
  * If the query involves more than just the result table, we have to
  * adjust any Vars that refer to other tables to reference junk tlist
- * entries in the top plan's targetlist.  Vars referencing the result
+ * entries in the top subplan's targetlist.  Vars referencing the result
  * table should be left alone, however (the executor will evaluate them
  * using the actual heap tuple, after firing triggers if any). In the
  * adjusted RETURNING list, result-table Vars will still have their
@@ -1471,8 +1766,8 @@ fix_upper_expr_mutator(Node *node, fix_upper_expr_context *context)
  * glob->relationOids.
  *
  * 'rlist': the RETURNING targetlist to be fixed
- * 'topplan': the top Plan node for the query (not yet passed through
- *             set_plan_references)
+ * 'topplan': the top subplan node that will be just below the ModifyTable
+ *             node (note it's not yet passed through set_plan_references)
  * 'resultRelation': RT index of the associated result relation
  *
  * Note: we assume that result relations will have rtoffset zero, that is,
@@ -1492,6 +1787,13 @@ set_returning_clause_references(PlannerGlobal *glob,
         * top plan's targetlist for Vars of non-result relations, and use
         * fix_join_expr to convert RETURNING Vars into references to those tlist
         * entries, while leaving result-rel Vars as-is.
+        *
+        * PlaceHolderVars will also be sought in the targetlist, but no
+        * more-complex expressions will be.  Note that it is not possible for a
+        * PlaceHolderVar to refer to the result relation, since the result is
+        * never below an outer join.  If that case could happen, we'd have to be
+        * prepared to pick apart the PlaceHolderVar and evaluate its contained
+        * expression instead.
         */
        itlist = build_tlist_index_other_vars(topplan->targetlist, resultRelation);
 
@@ -1568,3 +1870,121 @@ set_sa_opfuncid(ScalarArrayOpExpr *opexpr)
        if (opexpr->opfuncid == InvalidOid)
                opexpr->opfuncid = get_opcode(opexpr->opno);
 }
+
+/*****************************************************************************
+ *                                     QUERY DEPENDENCY MANAGEMENT
+ *****************************************************************************/
+
+/*
+ * record_plan_function_dependency
+ *             Mark the current plan as depending on a particular function.
+ *
+ * This is exported so that the function-inlining code can record a
+ * dependency on a function that it's removed from the plan tree.
+ */
+void
+record_plan_function_dependency(PlannerGlobal *glob, Oid funcid)
+{
+       /*
+        * For performance reasons, we don't bother to track built-in functions;
+        * we just assume they'll never change (or at least not in ways that'd
+        * invalidate plans using them).  For this purpose we can consider a
+        * built-in function to be one with OID less than FirstBootstrapObjectId.
+        * Note that the OID generator guarantees never to generate such an OID
+        * after startup, even at OID wraparound.
+        */
+       if (funcid >= (Oid) FirstBootstrapObjectId)
+       {
+               HeapTuple       func_tuple;
+               PlanInvalItem *inval_item;
+
+               func_tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid));
+               if (!HeapTupleIsValid(func_tuple))
+                       elog(ERROR, "cache lookup failed for function %u", funcid);
+
+               inval_item = makeNode(PlanInvalItem);
+
+               /*
+                * It would work to use any syscache on pg_proc, but plancache.c
+                * expects us to use PROCOID.
+                */
+               inval_item->cacheId = PROCOID;
+               inval_item->tupleId = func_tuple->t_self;
+
+               glob->invalItems = lappend(glob->invalItems, inval_item);
+
+               ReleaseSysCache(func_tuple);
+       }
+}
+
+/*
+ * extract_query_dependencies
+ *             Given a not-yet-planned query or queries (i.e. a Query node or list
+ *             of Query nodes), extract dependencies just as set_plan_references
+ *             would do.
+ *
+ * This is needed by plancache.c to handle invalidation of cached unplanned
+ * queries.
+ */
+void
+extract_query_dependencies(Node *query,
+                                                  List **relationOids,
+                                                  List **invalItems)
+{
+       PlannerGlobal glob;
+
+       /* Make up a dummy PlannerGlobal so we can use this module's machinery */
+       MemSet(&glob, 0, sizeof(glob));
+       glob.type = T_PlannerGlobal;
+       glob.relationOids = NIL;
+       glob.invalItems = NIL;
+
+       (void) extract_query_dependencies_walker(query, &glob);
+
+       *relationOids = glob.relationOids;
+       *invalItems = glob.invalItems;
+}
+
+static bool
+extract_query_dependencies_walker(Node *node, PlannerGlobal *context)
+{
+       if (node == NULL)
+               return false;
+       Assert(!IsA(node, PlaceHolderVar));
+       /* Extract function dependencies and check for regclass Consts */
+       fix_expr_common(context, node);
+       if (IsA(node, Query))
+       {
+               Query      *query = (Query *) node;
+               ListCell   *lc;
+
+               if (query->commandType == CMD_UTILITY)
+               {
+                       /* Ignore utility statements, except EXPLAIN */
+                       if (IsA(query->utilityStmt, ExplainStmt))
+                       {
+                               query = (Query *) ((ExplainStmt *) query->utilityStmt)->query;
+                               Assert(IsA(query, Query));
+                               Assert(query->commandType != CMD_UTILITY);
+                       }
+                       else
+                               return false;
+               }
+
+               /* Collect relation OIDs in this Query's rtable */
+               foreach(lc, query->rtable)
+               {
+                       RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+
+                       if (rte->rtekind == RTE_RELATION)
+                               context->relationOids = lappend_oid(context->relationOids,
+                                                                                                       rte->relid);
+               }
+
+               /* And recurse into the query's subexpressions */
+               return query_tree_walker(query, extract_query_dependencies_walker,
+                                                                (void *) context, 0);
+       }
+       return expression_tree_walker(node, extract_query_dependencies_walker,
+                                                                 (void *) context);
+}