]> granicus.if.org Git - postgresql/blobdiff - src/backend/optimizer/plan/setrefs.c
Add a Gather executor node.
[postgresql] / src / backend / optimizer / plan / setrefs.c
index c356d265e84ec8b8e9e4f86475cfec5810fc56e5..b1cede2ef0d20e3c5d984c09797e9c8fc11c70ba 100644 (file)
@@ -2,26 +2,30 @@
  *
  * setrefs.c
  *       Post-processing of a completed plan tree: fix references to subplan
- *       vars, and compute regproc values for operators
+ *       vars, compute regproc values for operators, etc
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2015, 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.128 2007/01/22 01:35:20 tgl Exp $
+ *       src/backend/optimizer/plan/setrefs.c
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "access/transam.h"
+#include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
-#include "optimizer/clauses.h"
+#include "nodes/nodeFuncs.h"
+#include "optimizer/pathnode.h"
 #include "optimizer/planmain.h"
+#include "optimizer/planner.h"
 #include "optimizer/tlist.h"
-#include "parser/parse_expr.h"
-#include "parser/parsetree.h"
+#include "tcop/utility.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 
 typedef struct
@@ -35,55 +39,106 @@ 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? */
-       /* array of num_vars entries: */
-       tlist_vinfo vars[1];            /* VARIABLE LENGTH ARRAY */
-} indexed_tlist;                               /* VARIABLE LENGTH STRUCT */
+       bool            has_ph_vars;    /* are there PlaceHolderVar entries? */
+       bool            has_non_vars;   /* are there other entries? */
+       tlist_vinfo vars[FLEXIBLE_ARRAY_MEMBER];        /* has num_vars entries */
+} indexed_tlist;
 
 typedef struct
 {
+       PlannerInfo *root;
+       int                     rtoffset;
+} fix_scan_expr_context;
+
+typedef struct
+{
+       PlannerInfo *root;
        indexed_tlist *outer_itlist;
        indexed_tlist *inner_itlist;
        Index           acceptable_rel;
-} join_references_context;
+       int                     rtoffset;
+} fix_join_expr_context;
 
 typedef struct
 {
+       PlannerInfo *root;
        indexed_tlist *subplan_itlist;
-       Index           subvarno;
-} replace_vars_with_subplan_refs_context;
+       Index           newvarno;
+       int                     rtoffset;
+} fix_upper_expr_context;
 
-static Plan *set_subqueryscan_references(SubqueryScan *plan, List *rtable);
+/*
+ * 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(root, lst, rtoffset) \
+       ((List *) fix_scan_expr(root, (Node *) (lst), rtoffset))
+
+static void add_rtes_to_flat_rtable(PlannerInfo *root, bool recursing);
+static void flatten_unplanned_rtes(PlannerGlobal *glob, RangeTblEntry *rte);
+static bool flatten_rtes_walker(Node *node, PlannerGlobal *glob);
+static void add_rte_to_flat_rtable(PlannerGlobal *glob, RangeTblEntry *rte);
+static Plan *set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset);
+static Plan *set_indexonlyscan_references(PlannerInfo *root,
+                                                        IndexOnlyScan *plan,
+                                                        int rtoffset);
+static Plan *set_subqueryscan_references(PlannerInfo *root,
+                                                       SubqueryScan *plan,
+                                                       int rtoffset);
 static bool trivial_subqueryscan(SubqueryScan *plan);
-static void adjust_plan_varnos(Plan *plan, int rtoffset);
-static void adjust_expr_varnos(Node *node, int rtoffset);
-static bool adjust_expr_varnos_walker(Node *node, int *context);
-static void fix_expr_references(Plan *plan, Node *node);
-static bool fix_expr_references_walker(Node *node, void *context);
-static void set_join_references(Join *join);
-static void set_inner_join_references(Plan *inner_plan,
-                                                 indexed_tlist *outer_itlist);
-static void set_uppernode_references(Plan *plan, Index subvarno);
+static void set_foreignscan_references(PlannerInfo *root,
+                                                  ForeignScan *fscan,
+                                                  int rtoffset);
+static void set_customscan_references(PlannerInfo *root,
+                                                 CustomScan *cscan,
+                                                 int rtoffset);
+static Node *fix_scan_expr(PlannerInfo *root, 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(PlannerInfo *root, Join *join, int rtoffset);
+static void set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset);
+static void set_dummy_tlist_references(Plan *plan, int rtoffset);
 static indexed_tlist *build_tlist_index(List *tlist);
 static Var *search_indexed_tlist_for_var(Var *var,
                                                         indexed_tlist *itlist,
-                                                        Index newvarno);
+                                                        Index newvarno,
+                                                        int rtoffset);
 static Var *search_indexed_tlist_for_non_var(Node *node,
                                                                 indexed_tlist *itlist,
                                                                 Index newvarno);
-static List *join_references(List *clauses,
-                               indexed_tlist *outer_itlist,
-                               indexed_tlist *inner_itlist,
-                               Index acceptable_rel);
-static Node *join_references_mutator(Node *node,
-                                               join_references_context *context);
-static Node *replace_vars_with_subplan_refs(Node *node,
-                                                          indexed_tlist *subplan_itlist,
-                                                          Index subvarno);
-static Node *replace_vars_with_subplan_refs_mutator(Node *node,
-                                                       replace_vars_with_subplan_refs_context *context);
+static Var *search_indexed_tlist_for_sortgroupref(Node *node,
+                                                                         Index sortgroupref,
+                                                                         indexed_tlist *itlist,
+                                                                         Index newvarno);
+static List *fix_join_expr(PlannerInfo *root,
+                         List *clauses,
+                         indexed_tlist *outer_itlist,
+                         indexed_tlist *inner_itlist,
+                         Index acceptable_rel, int rtoffset);
+static Node *fix_join_expr_mutator(Node *node,
+                                         fix_join_expr_context *context);
+static Node *fix_upper_expr(PlannerInfo *root,
+                          Node *node,
+                          indexed_tlist *subplan_itlist,
+                          Index newvarno,
+                          int rtoffset);
+static Node *fix_upper_expr_mutator(Node *node,
+                                          fix_upper_expr_context *context);
+static List *set_returning_clause_references(PlannerInfo *root,
+                                                               List *rlist,
+                                                               Plan *topplan,
+                                                               Index resultRelation,
+                                                               int rtoffset);
 static bool fix_opfuncids_walker(Node *node, void *context);
-
+static bool extract_query_dependencies_walker(Node *node,
+                                                                 PlannerInfo *context);
 
 /*****************************************************************************
  *
@@ -94,205 +149,752 @@ static bool fix_opfuncids_walker(Node *node, void *context);
 /*
  * set_plan_references
  *
- * This is the final processing pass of the planner/optimizer. The plan
+ * This is the final processing pass of the planner/optimizer.  The plan
  * tree is complete; we just have to adjust some representational details
- * for the convenience of the executor.  We update Vars in upper plan nodes
- * to refer to the outputs of their subplans, and we compute regproc OIDs
- * for operators (ie, we look up the function that implements each op).
+ * for the convenience of the executor:
+ *
+ * 1. We flatten the various subquery rangetables into a single list, and
+ * zero out RangeTblEntry fields that are not useful to the executor.
+ *
+ * 2. We adjust Vars in scan nodes to be consistent with the flat rangetable.
+ *
+ * 3. We adjust Vars in upper plan nodes to refer to the outputs of their
+ * subplans.
+ *
+ * 4. PARAM_MULTIEXPR Params are replaced by regular PARAM_EXEC Params,
+ * now that we have finished planning all MULTIEXPR subplans.
+ *
+ * 5. We compute regproc OIDs for operators (ie, we look up the function
+ * that implements each op).
+ *
+ * 6. We create lists of specific objects that the plan depends on.
+ * This will be used by plancache.c to drive invalidation of cached plans.
+ * 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.
+ *
+ * 7. We assign every plan node in the tree a unique ID.
  *
  * We also perform one final optimization step, which is to delete
  * SubqueryScan plan nodes that aren't doing anything useful (ie, have
  * no qual and a no-op targetlist).  The reason for doing this last is that
  * it can't readily be done before set_plan_references, because it would
- * break set_uppernode_references: the Vars in the subquery's top tlist
- * won't match up with the Vars in the outer plan tree.  The SubqueryScan
+ * break set_upper_references: the Vars in the subquery's top tlist
+ * wouldn't match up with the Vars in the outer plan tree.  The SubqueryScan
  * serves a necessary function as a buffer between outer query and subquery
- * variable numbering ... but the executor doesn't care about that, only the
- * planner.
+ * variable numbering ... but after we've flattened the rangetable this is
+ * no longer a problem, since then there's only one rtindex namespace.
  *
  * set_plan_references recursively traverses the whole plan tree.
  *
  * 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.
  *
- * Note: to delete a SubqueryScan, we have to renumber Vars in its child nodes
- * and append the modified subquery rangetable to the outer rangetable.
- * Therefore "rtable" is an in/out argument and really should be declared
- * "List **".  But in the interest of notational simplicity we don't do that.
- * (Since rtable can't be NIL if there's a SubqueryScan, the list header
- * address won't change when we append a subquery rangetable.)
+ * The flattened rangetable entries are appended to root->glob->finalrtable.
+ * Also, rowmarks entries are appended to root->glob->finalrowmarks, and the
+ * RT indexes of ModifyTable result relations to root->glob->resultRelations.
+ * Plan dependencies are appended to root->glob->relationOids (for relations)
+ * and root->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
+ * nodes were just built by the planner and are not multiply referenced, but
+ * it's not so safe to assume that for expression tree nodes.
  */
 Plan *
-set_plan_references(Plan *plan, List *rtable)
+set_plan_references(PlannerInfo *root, Plan *plan)
+{
+       PlannerGlobal *glob = root->glob;
+       int                     rtoffset = list_length(glob->finalrtable);
+       ListCell   *lc;
+
+       /*
+        * Add all the query's RTEs to the flattened rangetable.  The live ones
+        * will have their rangetable indexes increased by rtoffset.  (Additional
+        * RTEs, not referenced by the Plan tree, might get added after those.)
+        */
+       add_rtes_to_flat_rtable(root, false);
+
+       /*
+        * Adjust RT indexes of PlanRowMarks and add to final rowmarks list
+        */
+       foreach(lc, root->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 ... but *not* the rowmarkId */
+               newrc->rti += rtoffset;
+               newrc->prti += rtoffset;
+
+               glob->finalrowmarks = lappend(glob->finalrowmarks, newrc);
+       }
+
+       /* Now fix the Plan tree */
+       return set_plan_refs(root, plan, rtoffset);
+}
+
+/*
+ * Extract RangeTblEntries from the plan's rangetable, and add to flat rtable
+ *
+ * This can recurse into subquery plans; "recursing" is true if so.
+ */
+static void
+add_rtes_to_flat_rtable(PlannerInfo *root, bool recursing)
+{
+       PlannerGlobal *glob = root->glob;
+       Index           rti;
+       ListCell   *lc;
+
+       /*
+        * Add the query's own RTEs to the flattened rangetable.
+        *
+        * At top level, we must add all RTEs so that their indexes in the
+        * flattened rangetable match up with their original indexes.  When
+        * recursing, we only care about extracting relation RTEs.
+        */
+       foreach(lc, root->parse->rtable)
+       {
+               RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+
+               if (!recursing || rte->rtekind == RTE_RELATION)
+                       add_rte_to_flat_rtable(glob, rte);
+       }
+
+       /*
+        * If there are any dead subqueries, they are not referenced in the Plan
+        * tree, so we must add RTEs contained in them to the flattened rtable
+        * separately.  (If we failed to do this, the executor would not perform
+        * expected permission checks for tables mentioned in such subqueries.)
+        *
+        * Note: this pass over the rangetable can't be combined with the previous
+        * one, because that would mess up the numbering of the live RTEs in the
+        * flattened rangetable.
+        */
+       rti = 1;
+       foreach(lc, root->parse->rtable)
+       {
+               RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+
+               /*
+                * We should ignore inheritance-parent RTEs: their contents have been
+                * pulled up into our rangetable already.  Also ignore any subquery
+                * RTEs without matching RelOptInfos, as they likewise have been
+                * pulled up.
+                */
+               if (rte->rtekind == RTE_SUBQUERY && !rte->inh &&
+                       rti < root->simple_rel_array_size)
+               {
+                       RelOptInfo *rel = root->simple_rel_array[rti];
+
+                       if (rel != NULL)
+                       {
+                               Assert(rel->relid == rti);              /* sanity check on array */
+
+                               /*
+                                * The subquery might never have been planned at all, if it
+                                * was excluded on the basis of self-contradictory constraints
+                                * in our query level.  In this case apply
+                                * flatten_unplanned_rtes.
+                                *
+                                * If it was planned but the plan is dummy, we assume that it
+                                * has been omitted from our plan tree (see
+                                * set_subquery_pathlist), and recurse to pull up its RTEs.
+                                *
+                                * Otherwise, it should be represented by a SubqueryScan node
+                                * somewhere in our plan tree, and we'll pull up its RTEs when
+                                * we process that plan node.
+                                *
+                                * However, if we're recursing, then we should pull up RTEs
+                                * whether the subplan is dummy or not, because we've found
+                                * that some upper query level is treating this one as dummy,
+                                * and so we won't scan this level's plan tree at all.
+                                */
+                               if (rel->subplan == NULL)
+                                       flatten_unplanned_rtes(glob, rte);
+                               else if (recursing || is_dummy_plan(rel->subplan))
+                               {
+                                       Assert(rel->subroot != NULL);
+                                       add_rtes_to_flat_rtable(rel->subroot, true);
+                               }
+                       }
+               }
+               rti++;
+       }
+}
+
+/*
+ * Extract RangeTblEntries from a subquery that was never planned at all
+ */
+static void
+flatten_unplanned_rtes(PlannerGlobal *glob, RangeTblEntry *rte)
+{
+       /* Use query_tree_walker to find all RTEs in the parse tree */
+       (void) query_tree_walker(rte->subquery,
+                                                        flatten_rtes_walker,
+                                                        (void *) glob,
+                                                        QTW_EXAMINE_RTES);
+}
+
+static bool
+flatten_rtes_walker(Node *node, PlannerGlobal *glob)
+{
+       if (node == NULL)
+               return false;
+       if (IsA(node, RangeTblEntry))
+       {
+               RangeTblEntry *rte = (RangeTblEntry *) node;
+
+               /* As above, we need only save relation RTEs */
+               if (rte->rtekind == RTE_RELATION)
+                       add_rte_to_flat_rtable(glob, rte);
+               return false;
+       }
+       if (IsA(node, Query))
+       {
+               /* Recurse into subselects */
+               return query_tree_walker((Query *) node,
+                                                                flatten_rtes_walker,
+                                                                (void *) glob,
+                                                                QTW_EXAMINE_RTES);
+       }
+       return expression_tree_walker(node, flatten_rtes_walker,
+                                                                 (void *) glob);
+}
+
+/*
+ * Add (a copy of) the given RTE to the final rangetable
+ *
+ * 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 ctename, alias and eref Alias fields,
+ * which are needed by EXPLAIN, and the selectedCols, insertedCols and
+ * updatedCols bitmaps, which are needed for executor-startup permissions
+ * checking and for trigger event checking.
+ */
+static void
+add_rte_to_flat_rtable(PlannerGlobal *glob, RangeTblEntry *rte)
+{
+       RangeTblEntry *newrte;
+
+       /* flat copy to duplicate all the scalar fields */
+       newrte = (RangeTblEntry *) palloc(sizeof(RangeTblEntry));
+       memcpy(newrte, rte, sizeof(RangeTblEntry));
+
+       /* zap unneeded sub-structure */
+       newrte->tablesample = NULL;
+       newrte->subquery = NULL;
+       newrte->joinaliasvars = NIL;
+       newrte->functions = NIL;
+       newrte->values_lists = NIL;
+       newrte->values_collations = NIL;
+       newrte->ctecoltypes = NIL;
+       newrte->ctecoltypmods = NIL;
+       newrte->ctecolcollations = NIL;
+       newrte->securityQuals = NIL;
+
+       glob->finalrtable = lappend(glob->finalrtable, newrte);
+
+       /*
+        * Check for RT index overflow; it's very unlikely, but if it did happen,
+        * the executor would get confused by varnos that match the special varno
+        * values.
+        */
+       if (IS_SPECIAL_VARNO(list_length(glob->finalrtable)))
+               ereport(ERROR,
+                               (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+                                errmsg("too many range table entries")));
+
+       /*
+        * If it's a plain relation RTE, add the table to relationOids.
+        *
+        * We do this even though the RTE might be unreferenced in the plan tree;
+        * this would correspond to cases such as views that were expanded, child
+        * tables that were eliminated by constraint exclusion, etc. Schema
+        * invalidation on such a rel must still force rebuilding of the plan.
+        *
+        * Note we don't bother to avoid making duplicate list entries.  We could,
+        * but it would probably cost more cycles than it would save.
+        */
+       if (newrte->rtekind == RTE_RELATION)
+               glob->relationOids = lappend_oid(glob->relationOids, newrte->relid);
+}
+
+/*
+ * set_plan_refs: recurse through the Plan nodes of a single subquery level
+ */
+static Plan *
+set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
 {
        ListCell   *l;
 
        if (plan == NULL)
                return NULL;
 
+       /* Assign this node a unique ID. */
+       plan->plan_node_id = root->glob->lastPlanNodeId++;
+
        /*
         * Plan-type-specific fixes
         */
        switch (nodeTag(plan))
        {
                case T_SeqScan:
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
+                       {
+                               SeqScan    *splan = (SeqScan *) plan;
+
+                               splan->scanrelid += rtoffset;
+                               splan->plan.targetlist =
+                                       fix_scan_list(root, splan->plan.targetlist, rtoffset);
+                               splan->plan.qual =
+                                       fix_scan_list(root, splan->plan.qual, rtoffset);
+                       }
+                       break;
+               case T_SampleScan:
+                       {
+                               SampleScan *splan = (SampleScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                               splan->tablesample = (TableSampleClause *)
+                                       fix_scan_expr(root, (Node *) splan->tablesample, rtoffset);
+                       }
                        break;
                case T_IndexScan:
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
-                       fix_expr_references(plan,
-                                                               (Node *) ((IndexScan *) plan)->indexqual);
-                       fix_expr_references(plan,
-                                                               (Node *) ((IndexScan *) plan)->indexqualorig);
+                       {
+                               IndexScan  *splan = (IndexScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                               splan->indexqual =
+                                       fix_scan_list(root, splan->indexqual, rtoffset);
+                               splan->indexqualorig =
+                                       fix_scan_list(root, splan->indexqualorig, rtoffset);
+                               splan->indexorderby =
+                                       fix_scan_list(root, splan->indexorderby, rtoffset);
+                               splan->indexorderbyorig =
+                                       fix_scan_list(root, splan->indexorderbyorig, rtoffset);
+                       }
+                       break;
+               case T_IndexOnlyScan:
+                       {
+                               IndexOnlyScan *splan = (IndexOnlyScan *) plan;
+
+                               return set_indexonlyscan_references(root, splan, rtoffset);
+                       }
                        break;
                case T_BitmapIndexScan:
-                       /* no need to fix targetlist and qual */
-                       Assert(plan->targetlist == NIL);
-                       Assert(plan->qual == NIL);
-                       fix_expr_references(plan,
-                                                        (Node *) ((BitmapIndexScan *) plan)->indexqual);
-                       fix_expr_references(plan,
-                                                (Node *) ((BitmapIndexScan *) plan)->indexqualorig);
+                       {
+                               BitmapIndexScan *splan = (BitmapIndexScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               /* no need to fix targetlist and qual */
+                               Assert(splan->scan.plan.targetlist == NIL);
+                               Assert(splan->scan.plan.qual == NIL);
+                               splan->indexqual =
+                                       fix_scan_list(root, splan->indexqual, rtoffset);
+                               splan->indexqualorig =
+                                       fix_scan_list(root, splan->indexqualorig, rtoffset);
+                       }
                        break;
                case T_BitmapHeapScan:
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
-                       fix_expr_references(plan,
-                                                (Node *) ((BitmapHeapScan *) plan)->bitmapqualorig);
+                       {
+                               BitmapHeapScan *splan = (BitmapHeapScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                               splan->bitmapqualorig =
+                                       fix_scan_list(root, splan->bitmapqualorig, rtoffset);
+                       }
                        break;
                case T_TidScan:
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
-                       fix_expr_references(plan, (Node *) ((TidScan *) plan)->tidquals);
+                       {
+                               TidScan    *splan = (TidScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                               splan->tidquals =
+                                       fix_scan_list(root, splan->tidquals, rtoffset);
+                       }
                        break;
                case T_SubqueryScan:
                        /* Needs special treatment, see comments below */
-                       return set_subqueryscan_references((SubqueryScan *) plan, rtable);
+                       return set_subqueryscan_references(root,
+                                                                                          (SubqueryScan *) plan,
+                                                                                          rtoffset);
                case T_FunctionScan:
                        {
-                               RangeTblEntry *rte;
-
-                               fix_expr_references(plan, (Node *) plan->targetlist);
-                               fix_expr_references(plan, (Node *) plan->qual);
-                               rte = rt_fetch(((FunctionScan *) plan)->scan.scanrelid,
-                                                          rtable);
-                               Assert(rte->rtekind == RTE_FUNCTION);
-                               fix_expr_references(plan, rte->funcexpr);
+                               FunctionScan *splan = (FunctionScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                               splan->functions =
+                                       fix_scan_list(root, splan->functions, rtoffset);
                        }
                        break;
                case T_ValuesScan:
                        {
-                               RangeTblEntry *rte;
-
-                               fix_expr_references(plan, (Node *) plan->targetlist);
-                               fix_expr_references(plan, (Node *) plan->qual);
-                               rte = rt_fetch(((ValuesScan *) plan)->scan.scanrelid,
-                                                          rtable);
-                               Assert(rte->rtekind == RTE_VALUES);
-                               fix_expr_references(plan, (Node *) rte->values_lists);
+                               ValuesScan *splan = (ValuesScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                               splan->values_lists =
+                                       fix_scan_list(root, splan->values_lists, rtoffset);
                        }
                        break;
-               case T_NestLoop:
-                       set_join_references((Join *) plan);
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
-                       fix_expr_references(plan, (Node *) ((Join *) plan)->joinqual);
+               case T_CteScan:
+                       {
+                               CteScan    *splan = (CteScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                       }
                        break;
-               case T_MergeJoin:
-                       set_join_references((Join *) plan);
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
-                       fix_expr_references(plan, (Node *) ((Join *) plan)->joinqual);
-                       fix_expr_references(plan,
-                                                               (Node *) ((MergeJoin *) plan)->mergeclauses);
+               case T_WorkTableScan:
+                       {
+                               WorkTableScan *splan = (WorkTableScan *) plan;
+
+                               splan->scan.scanrelid += rtoffset;
+                               splan->scan.plan.targetlist =
+                                       fix_scan_list(root, splan->scan.plan.targetlist, rtoffset);
+                               splan->scan.plan.qual =
+                                       fix_scan_list(root, splan->scan.plan.qual, rtoffset);
+                       }
+                       break;
+               case T_ForeignScan:
+                       set_foreignscan_references(root, (ForeignScan *) plan, rtoffset);
+                       break;
+               case T_CustomScan:
+                       set_customscan_references(root, (CustomScan *) plan, rtoffset);
                        break;
+
+               case T_NestLoop:
+               case T_MergeJoin:
                case T_HashJoin:
-                       set_join_references((Join *) plan);
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
-                       fix_expr_references(plan, (Node *) ((Join *) plan)->joinqual);
-                       fix_expr_references(plan,
-                                                               (Node *) ((HashJoin *) plan)->hashclauses);
+                       set_join_references(root, (Join *) plan, rtoffset);
                        break;
+
                case T_Hash:
                case T_Material:
                case T_Sort:
                case T_Unique:
                case T_SetOp:
+               case T_Gather:
 
                        /*
                         * These plan types don't actually bother to evaluate their
-                        * targetlists (because they just return their unmodified input
-                        * tuples).  The optimizer is lazy about creating really valid
-                        * targetlists for them --- it tends to just put in a pointer to
-                        * the child plan node's tlist.  Hence, we leave the tlist alone.
-                        * In particular, we do not want to process subplans in the tlist,
-                        * since we will likely end up reprocessing subplans that also
-                        * appear in lower levels of the plan tree!
-                        *
+                        * targetlistsbecause they just return their unmodified input
+                        * tuples.  Even though the targetlist won't be used by the
+                        * executor, we fix it up for possible use by EXPLAIN (not to
+                        * mention ease of debugging --- wrong varnos are very confusing).
+                        */
+                       set_dummy_tlist_references(plan, rtoffset);
+
+                       /*
                         * Since these plan types don't check quals either, we should not
                         * find any qual expression attached to them.
                         */
                        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:
-
-                       /*
-                        * Like the plan types above, Limit doesn't evaluate its tlist or
-                        * quals.  It does have live expressions for limit/offset,
-                        * however.
-                        */
-                       Assert(plan->qual == NIL);
-                       fix_expr_references(plan, ((Limit *) plan)->limitOffset);
-                       fix_expr_references(plan, ((Limit *) plan)->limitCount);
+                       {
+                               Limit      *splan = (Limit *) plan;
+
+                               /*
+                                * Like the plan types above, Limit doesn't evaluate its tlist
+                                * or quals.  It does have live expressions for limit/offset,
+                                * however; and those cannot contain subplan variable refs, so
+                                * fix_scan_expr works for them.
+                                */
+                               set_dummy_tlist_references(plan, rtoffset);
+                               Assert(splan->plan.qual == NIL);
+
+                               splan->limitOffset =
+                                       fix_scan_expr(root, splan->limitOffset, rtoffset);
+                               splan->limitCount =
+                                       fix_scan_expr(root, splan->limitCount, rtoffset);
+                       }
                        break;
                case T_Agg:
+                       set_upper_references(root, plan, rtoffset);
+                       break;
                case T_Group:
-                       set_uppernode_references(plan, (Index) 0);
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
+                       set_upper_references(root, plan, rtoffset);
+                       break;
+               case T_WindowAgg:
+                       {
+                               WindowAgg  *wplan = (WindowAgg *) plan;
+
+                               set_upper_references(root, 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(root, wplan->startOffset, rtoffset);
+                               wplan->endOffset =
+                                       fix_scan_expr(root, wplan->endOffset, rtoffset);
+                       }
                        break;
                case T_Result:
-
-                       /*
-                        * Result may or may not have a subplan; no need to fix up subplan
-                        * references if it hasn't got one...
-                        *
-                        * XXX why does Result use a different subvarno from Agg/Group?
-                        */
-                       if (plan->lefttree != NULL)
-                               set_uppernode_references(plan, (Index) OUTER);
-                       fix_expr_references(plan, (Node *) plan->targetlist);
-                       fix_expr_references(plan, (Node *) plan->qual);
-                       fix_expr_references(plan, ((Result *) plan)->resconstantqual);
+                       {
+                               Result     *splan = (Result *) plan;
+
+                               /*
+                                * Result may or may not have a subplan; if not, it's more
+                                * like a scan node than an upper node.
+                                */
+                               if (splan->plan.lefttree != NULL)
+                                       set_upper_references(root, plan, rtoffset);
+                               else
+                               {
+                                       splan->plan.targetlist =
+                                               fix_scan_list(root, splan->plan.targetlist, rtoffset);
+                                       splan->plan.qual =
+                                               fix_scan_list(root, splan->plan.qual, rtoffset);
+                               }
+                               /* resconstantqual can't contain any subplan variable refs */
+                               splan->resconstantqual =
+                                       fix_scan_expr(root, splan->resconstantqual, rtoffset);
+                       }
+                       break;
+               case T_ModifyTable:
+                       {
+                               ModifyTable *splan = (ModifyTable *) plan;
+
+                               Assert(splan->plan.targetlist == NIL);
+                               Assert(splan->plan.qual == NIL);
+
+                               splan->withCheckOptionLists =
+                                       fix_scan_list(root, splan->withCheckOptionLists, rtoffset);
+
+                               if (splan->returningLists)
+                               {
+                                       List       *newRL = NIL;
+                                       ListCell   *lcrl,
+                                                          *lcrr,
+                                                          *lcp;
+
+                                       /*
+                                        * Pass each per-subplan returningList through
+                                        * set_returning_clause_references().
+                                        */
+                                       Assert(list_length(splan->returningLists) == list_length(splan->resultRelations));
+                                       Assert(list_length(splan->returningLists) == list_length(splan->plans));
+                                       forthree(lcrl, splan->returningLists,
+                                                        lcrr, splan->resultRelations,
+                                                        lcp, splan->plans)
+                                       {
+                                               List       *rlist = (List *) lfirst(lcrl);
+                                               Index           resultrel = lfirst_int(lcrr);
+                                               Plan       *subplan = (Plan *) lfirst(lcp);
+
+                                               rlist = set_returning_clause_references(root,
+                                                                                                                               rlist,
+                                                                                                                               subplan,
+                                                                                                                               resultrel,
+                                                                                                                               rtoffset);
+                                               newRL = lappend(newRL, rlist);
+                                       }
+                                       splan->returningLists = newRL;
+
+                                       /*
+                                        * Set up the visible plan targetlist as being the same as
+                                        * the first RETURNING list. This is for the use of
+                                        * EXPLAIN; the executor won't pay any attention to the
+                                        * targetlist.  We postpone this step until here so that
+                                        * we don't have to do set_returning_clause_references()
+                                        * twice on identical targetlists.
+                                        */
+                                       splan->plan.targetlist = copyObject(linitial(newRL));
+                               }
+
+                               /*
+                                * We treat ModifyTable with ON CONFLICT as a form of 'pseudo
+                                * join', where the inner side is the EXCLUDED tuple.
+                                * Therefore use fix_join_expr to setup the relevant variables
+                                * to INNER_VAR. We explicitly don't create any OUTER_VARs as
+                                * those are already used by RETURNING and it seems better to
+                                * be non-conflicting.
+                                */
+                               if (splan->onConflictSet)
+                               {
+                                       indexed_tlist *itlist;
+
+                                       itlist = build_tlist_index(splan->exclRelTlist);
+
+                                       splan->onConflictSet =
+                                               fix_join_expr(root, splan->onConflictSet,
+                                                                         NULL, itlist,
+                                                                         linitial_int(splan->resultRelations),
+                                                                         rtoffset);
+
+                                       splan->onConflictWhere = (Node *)
+                                               fix_join_expr(root, (List *) splan->onConflictWhere,
+                                                                         NULL, itlist,
+                                                                         linitial_int(splan->resultRelations),
+                                                                         rtoffset);
+
+                                       pfree(itlist);
+
+                                       splan->exclRelTlist =
+                                               fix_scan_list(root, splan->exclRelTlist, rtoffset);
+                               }
+
+                               splan->nominalRelation += rtoffset;
+                               splan->exclRelRTI += rtoffset;
+
+                               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(root,
+                                                                                         (Plan *) lfirst(l),
+                                                                                         rtoffset);
+                               }
+
+                               /*
+                                * Append this ModifyTable node's final result relation RT
+                                * index(es) to the global list for the plan, and set its
+                                * resultRelIndex to reflect their starting position in the
+                                * global list.
+                                */
+                               splan->resultRelIndex = list_length(root->glob->resultRelations);
+                               root->glob->resultRelations =
+                                       list_concat(root->glob->resultRelations,
+                                                               list_copy(splan->resultRelations));
+                       }
                        break;
                case T_Append:
-
-                       /*
-                        * Append, like Sort et al, doesn't actually evaluate its
-                        * targetlist or check quals, and we haven't bothered to give it
-                        * its own tlist copy. So, don't fix targetlist/qual. But do
-                        * recurse into child plans.
-                        */
+                       {
+                               Append     *splan = (Append *) plan;
+
+                               /*
+                                * Append, like Sort et al, doesn't actually evaluate its
+                                * targetlist or check quals.
+                                */
+                               set_dummy_tlist_references(plan, rtoffset);
+                               Assert(splan->plan.qual == NIL);
+                               foreach(l, splan->appendplans)
+                               {
+                                       lfirst(l) = set_plan_refs(root,
+                                                                                         (Plan *) lfirst(l),
+                                                                                         rtoffset);
+                               }
+                       }
+                       break;
+               case T_MergeAppend:
+                       {
+                               MergeAppend *splan = (MergeAppend *) plan;
+
+                               /*
+                                * MergeAppend, like Sort et al, doesn't actually evaluate its
+                                * targetlist or check quals.
+                                */
+                               set_dummy_tlist_references(plan, rtoffset);
+                               Assert(splan->plan.qual == NIL);
+                               foreach(l, splan->mergeplans)
+                               {
+                                       lfirst(l) = set_plan_refs(root,
+                                                                                         (Plan *) lfirst(l),
+                                                                                         rtoffset);
+                               }
+                       }
+                       break;
+               case T_RecursiveUnion:
+                       /* This doesn't evaluate targetlist or check quals either */
+                       set_dummy_tlist_references(plan, rtoffset);
                        Assert(plan->qual == NIL);
-                       foreach(l, ((Append *) plan)->appendplans)
-                               lfirst(l) = set_plan_references((Plan *) lfirst(l), rtable);
                        break;
                case T_BitmapAnd:
-                       /* BitmapAnd works like Append, but has no tlist */
-                       Assert(plan->targetlist == NIL);
-                       Assert(plan->qual == NIL);
-                       foreach(l, ((BitmapAnd *) plan)->bitmapplans)
-                               lfirst(l) = set_plan_references((Plan *) lfirst(l), rtable);
+                       {
+                               BitmapAnd  *splan = (BitmapAnd *) plan;
+
+                               /* BitmapAnd works like Append, but has no tlist */
+                               Assert(splan->plan.targetlist == NIL);
+                               Assert(splan->plan.qual == NIL);
+                               foreach(l, splan->bitmapplans)
+                               {
+                                       lfirst(l) = set_plan_refs(root,
+                                                                                         (Plan *) lfirst(l),
+                                                                                         rtoffset);
+                               }
+                       }
                        break;
                case T_BitmapOr:
-                       /* BitmapOr works like Append, but has no tlist */
-                       Assert(plan->targetlist == NIL);
-                       Assert(plan->qual == NIL);
-                       foreach(l, ((BitmapOr *) plan)->bitmapplans)
-                               lfirst(l) = set_plan_references((Plan *) lfirst(l), rtable);
+                       {
+                               BitmapOr   *splan = (BitmapOr *) plan;
+
+                               /* BitmapOr works like Append, but has no tlist */
+                               Assert(splan->plan.targetlist == NIL);
+                               Assert(splan->plan.qual == NIL);
+                               foreach(l, splan->bitmapplans)
+                               {
+                                       lfirst(l) = set_plan_refs(root,
+                                                                                         (Plan *) lfirst(l),
+                                                                                         rtoffset);
+                               }
+                       }
                        break;
                default:
                        elog(ERROR, "unrecognized node type: %d",
@@ -301,29 +903,62 @@ set_plan_references(Plan *plan, List *rtable)
        }
 
        /*
-        * Now recurse into child plans and initplans, if any
+        * Now recurse into child plans, if any
         *
         * NOTE: it is essential that we recurse into child plans AFTER we set
         * subplan references in this plan's tlist and quals.  If we did the
         * reference-adjustments bottom-up, then we would fail to match this
         * plan's var nodes against the already-modified nodes of the children.
-        * Fortunately, that consideration doesn't apply to SubPlan nodes; else
-        * we'd need two passes over the expression trees.
         */
-       plan->lefttree = set_plan_references(plan->lefttree, rtable);
-       plan->righttree = set_plan_references(plan->righttree, rtable);
-
-       foreach(l, plan->initPlan)
-       {
-               SubPlan    *sp = (SubPlan *) lfirst(l);
-
-               Assert(IsA(sp, SubPlan));
-               sp->plan = set_plan_references(sp->plan, sp->rtable);
-       }
+       plan->lefttree = set_plan_refs(root, plan->lefttree, rtoffset);
+       plan->righttree = set_plan_refs(root, plan->righttree, rtoffset);
 
        return plan;
 }
 
+/*
+ * set_indexonlyscan_references
+ *             Do set_plan_references processing on an IndexOnlyScan
+ *
+ * This is unlike the handling of a plain IndexScan because we have to
+ * convert Vars referencing the heap into Vars referencing the index.
+ * We can use the fix_upper_expr machinery for that, by working from a
+ * targetlist describing the index columns.
+ */
+static Plan *
+set_indexonlyscan_references(PlannerInfo *root,
+                                                        IndexOnlyScan *plan,
+                                                        int rtoffset)
+{
+       indexed_tlist *index_itlist;
+
+       index_itlist = build_tlist_index(plan->indextlist);
+
+       plan->scan.scanrelid += rtoffset;
+       plan->scan.plan.targetlist = (List *)
+               fix_upper_expr(root,
+                                          (Node *) plan->scan.plan.targetlist,
+                                          index_itlist,
+                                          INDEX_VAR,
+                                          rtoffset);
+       plan->scan.plan.qual = (List *)
+               fix_upper_expr(root,
+                                          (Node *) plan->scan.plan.qual,
+                                          index_itlist,
+                                          INDEX_VAR,
+                                          rtoffset);
+       /* indexqual is already transformed to reference index columns */
+       plan->indexqual = fix_scan_list(root, plan->indexqual, rtoffset);
+       /* indexorderby is already transformed to reference index columns */
+       plan->indexorderby = fix_scan_list(root, plan->indexorderby, rtoffset);
+       /* indextlist must NOT be transformed to reference index columns */
+       plan->indextlist = fix_scan_list(root, plan->indextlist, rtoffset);
+
+       pfree(index_itlist);
+
+       return (Plan *) plan;
+}
+
 /*
  * set_subqueryscan_references
  *             Do set_plan_references processing on a SubqueryScan
@@ -332,58 +967,31 @@ set_plan_references(Plan *plan, List *rtable)
  * to do the normal processing on it.
  */
 static Plan *
-set_subqueryscan_references(SubqueryScan *plan, List *rtable)
+set_subqueryscan_references(PlannerInfo *root,
+                                                       SubqueryScan *plan,
+                                                       int rtoffset)
 {
+       RelOptInfo *rel;
        Plan       *result;
-       RangeTblEntry *rte;
-       ListCell   *l;
 
-       /* First, recursively process the subplan */
-       rte = rt_fetch(plan->scan.scanrelid, rtable);
-       Assert(rte->rtekind == RTE_SUBQUERY);
-       plan->subplan = set_plan_references(plan->subplan,
-                                                                               rte->subquery->rtable);
+       /* Need to look up the subquery's RelOptInfo, since we need its subroot */
+       rel = find_base_rel(root, plan->scan.scanrelid);
+       Assert(rel->subplan == plan->subplan);
 
-       /*
-        * We have to process any initplans too; set_plan_references can't do it
-        * for us because of the possibility of double-processing.
-        */
-       foreach(l, plan->scan.plan.initPlan)
-       {
-               SubPlan    *sp = (SubPlan *) lfirst(l);
-
-               Assert(IsA(sp, SubPlan));
-               sp->plan = set_plan_references(sp->plan, sp->rtable);
-       }
+       /* Recursively process the subplan */
+       plan->subplan = set_plan_references(rel->subroot, plan->subplan);
 
        if (trivial_subqueryscan(plan))
        {
                /*
-                * We can omit the SubqueryScan node and just pull up the subplan. We
-                * have to merge its rtable into the outer rtable, which means
-                * adjusting varnos throughout the subtree.
+                * We can omit the SubqueryScan node and just pull up the subplan.
                 */
-               int                     rtoffset = list_length(rtable);
-               List       *sub_rtable;
                ListCell   *lp,
                                   *lc;
 
-               sub_rtable = copyObject(rte->subquery->rtable);
-               range_table_walker(sub_rtable,
-                                                  adjust_expr_varnos_walker,
-                                                  (void *) &rtoffset,
-                                                  QTW_IGNORE_RT_SUBQUERIES);
-               rtable = list_concat(rtable, sub_rtable);
-
-               /*
-                * we have to copy the subplan to make sure there are no duplicately
-                * linked nodes in it, else adjust_plan_varnos might increment some
-                * varnos twice
-                */
-               result = copyObject(plan->subplan);
-
-               adjust_plan_varnos(result, rtoffset);
+               result = plan->subplan;
 
+               /* We have to be sure we don't lose any initplans */
                result->initPlan = list_concat(plan->scan.plan.initPlan,
                                                                           result->initPlan);
 
@@ -406,16 +1014,19 @@ set_subqueryscan_references(SubqueryScan *plan, List *rtable)
        else
        {
                /*
-                * Keep the SubqueryScan node.  We have to do the processing that
+                * Keep the SubqueryScan node.  We have to do the processing that
                 * set_plan_references would otherwise have done on it.  Notice we do
-                * not do set_uppernode_references() here, because a SubqueryScan will
+                * not do set_upper_references() here, because a SubqueryScan will
                 * always have been created with correct references to its subplan's
                 * outputs to begin with.
                 */
-               result = (Plan *) plan;
+               plan->scan.scanrelid += rtoffset;
+               plan->scan.plan.targetlist =
+                       fix_scan_list(root, plan->scan.plan.targetlist, rtoffset);
+               plan->scan.plan.qual =
+                       fix_scan_list(root, plan->scan.plan.qual, rtoffset);
 
-               fix_expr_references(result, (Node *) result->targetlist);
-               fix_expr_references(result, (Node *) result->qual);
+               result = (Plan *) plan;
        }
 
        return result;
@@ -480,259 +1091,391 @@ trivial_subqueryscan(SubqueryScan *plan)
 }
 
 /*
- * adjust_plan_varnos
- *             Offset varnos and other rangetable indexes in a plan tree by rtoffset.
+ * set_foreignscan_references
+ *        Do set_plan_references processing on a ForeignScan
  */
 static void
-adjust_plan_varnos(Plan *plan, int rtoffset)
+set_foreignscan_references(PlannerInfo *root,
+                                                  ForeignScan *fscan,
+                                                  int rtoffset)
 {
-       ListCell   *l;
+       /* Adjust scanrelid if it's valid */
+       if (fscan->scan.scanrelid > 0)
+               fscan->scan.scanrelid += rtoffset;
 
-       if (plan == NULL)
-               return;
+       if (fscan->fdw_scan_tlist != NIL || fscan->scan.scanrelid == 0)
+       {
+               /* Adjust tlist, qual, fdw_exprs to reference foreign scan tuple */
+               indexed_tlist *itlist = build_tlist_index(fscan->fdw_scan_tlist);
+
+               fscan->scan.plan.targetlist = (List *)
+                       fix_upper_expr(root,
+                                                  (Node *) fscan->scan.plan.targetlist,
+                                                  itlist,
+                                                  INDEX_VAR,
+                                                  rtoffset);
+               fscan->scan.plan.qual = (List *)
+                       fix_upper_expr(root,
+                                                  (Node *) fscan->scan.plan.qual,
+                                                  itlist,
+                                                  INDEX_VAR,
+                                                  rtoffset);
+               fscan->fdw_exprs = (List *)
+                       fix_upper_expr(root,
+                                                  (Node *) fscan->fdw_exprs,
+                                                  itlist,
+                                                  INDEX_VAR,
+                                                  rtoffset);
+               pfree(itlist);
+               /* fdw_scan_tlist itself just needs fix_scan_list() adjustments */
+               fscan->fdw_scan_tlist =
+                       fix_scan_list(root, fscan->fdw_scan_tlist, rtoffset);
+       }
+       else
+       {
+               /* Adjust tlist, qual, fdw_exprs in the standard way */
+               fscan->scan.plan.targetlist =
+                       fix_scan_list(root, fscan->scan.plan.targetlist, rtoffset);
+               fscan->scan.plan.qual =
+                       fix_scan_list(root, fscan->scan.plan.qual, rtoffset);
+               fscan->fdw_exprs =
+                       fix_scan_list(root, fscan->fdw_exprs, rtoffset);
+       }
 
-       /*
-        * Plan-type-specific fixes
-        */
-       switch (nodeTag(plan))
+       /* Adjust fs_relids if needed */
+       if (rtoffset > 0)
        {
-               case T_SeqScan:
-                       ((SeqScan *) plan)->scanrelid += rtoffset;
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       break;
-               case T_IndexScan:
-                       ((IndexScan *) plan)->scan.scanrelid += rtoffset;
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       adjust_expr_varnos((Node *) ((IndexScan *) plan)->indexqual,
-                                                          rtoffset);
-                       adjust_expr_varnos((Node *) ((IndexScan *) plan)->indexqualorig,
-                                                          rtoffset);
-                       break;
-               case T_BitmapIndexScan:
-                       ((BitmapIndexScan *) plan)->scan.scanrelid += rtoffset;
-                       /* no need to fix targetlist and qual */
-                       Assert(plan->targetlist == NIL);
-                       Assert(plan->qual == NIL);
-                       adjust_expr_varnos((Node *) ((BitmapIndexScan *) plan)->indexqual,
-                                                          rtoffset);
-                       adjust_expr_varnos((Node *) ((BitmapIndexScan *) plan)->indexqualorig,
-                                                          rtoffset);
-                       break;
-               case T_BitmapHeapScan:
-                       ((BitmapHeapScan *) plan)->scan.scanrelid += rtoffset;
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       adjust_expr_varnos((Node *) ((BitmapHeapScan *) plan)->bitmapqualorig,
-                                                          rtoffset);
-                       break;
-               case T_TidScan:
-                       ((TidScan *) plan)->scan.scanrelid += rtoffset;
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       adjust_expr_varnos((Node *) ((TidScan *) plan)->tidquals,
-                                                          rtoffset);
-                       break;
-               case T_SubqueryScan:
-                       ((SubqueryScan *) plan)->scan.scanrelid += rtoffset;
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       /* we should not recurse into the subquery! */
-                       break;
-               case T_FunctionScan:
-                       ((FunctionScan *) plan)->scan.scanrelid += rtoffset;
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       /* rte was already fixed by set_subqueryscan_references */
-                       break;
-               case T_ValuesScan:
-                       ((ValuesScan *) plan)->scan.scanrelid += rtoffset;
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       /* rte was already fixed by set_subqueryscan_references */
-                       break;
-               case T_NestLoop:
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       adjust_expr_varnos((Node *) ((Join *) plan)->joinqual, rtoffset);
-                       break;
-               case T_MergeJoin:
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       adjust_expr_varnos((Node *) ((Join *) plan)->joinqual, rtoffset);
-                       adjust_expr_varnos((Node *) ((MergeJoin *) plan)->mergeclauses,
-                                                          rtoffset);
-                       break;
-               case T_HashJoin:
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       adjust_expr_varnos((Node *) ((Join *) plan)->joinqual, rtoffset);
-                       adjust_expr_varnos((Node *) ((HashJoin *) plan)->hashclauses,
-                                                          rtoffset);
-                       break;
-               case T_Hash:
-               case T_Material:
-               case T_Sort:
-               case T_Unique:
-               case T_SetOp:
+               Bitmapset  *tempset = NULL;
+               int                     x = -1;
 
-                       /*
-                        * Even though the targetlist won't be used by the executor, we
-                        * fix it up for possible use by EXPLAIN (not to mention ease of
-                        * debugging --- wrong varnos are very confusing).
-                        */
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       Assert(plan->qual == NIL);
-                       break;
-               case T_Limit:
+               while ((x = bms_next_member(fscan->fs_relids, x)) >= 0)
+                       tempset = bms_add_member(tempset, x + rtoffset);
+               fscan->fs_relids = tempset;
+       }
+}
 
-                       /*
-                        * Like the plan types above, Limit doesn't evaluate its tlist or
-                        * quals.  It does have live expressions for limit/offset,
-                        * however.
-                        */
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       Assert(plan->qual == NIL);
-                       adjust_expr_varnos(((Limit *) plan)->limitOffset, rtoffset);
-                       adjust_expr_varnos(((Limit *) plan)->limitCount, rtoffset);
-                       break;
-               case T_Agg:
-               case T_Group:
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       break;
-               case T_Result:
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       adjust_expr_varnos((Node *) plan->qual, rtoffset);
-                       adjust_expr_varnos(((Result *) plan)->resconstantqual, rtoffset);
-                       break;
-               case T_Append:
-                       adjust_expr_varnos((Node *) plan->targetlist, rtoffset);
-                       Assert(plan->qual == NIL);
-                       foreach(l, ((Append *) plan)->appendplans)
-                               adjust_plan_varnos((Plan *) lfirst(l), rtoffset);
-                       break;
-               case T_BitmapAnd:
-                       /* BitmapAnd works like Append, but has no tlist */
-                       Assert(plan->targetlist == NIL);
-                       Assert(plan->qual == NIL);
-                       foreach(l, ((BitmapAnd *) plan)->bitmapplans)
-                               adjust_plan_varnos((Plan *) lfirst(l), rtoffset);
-                       break;
-               case T_BitmapOr:
-                       /* BitmapOr works like Append, but has no tlist */
-                       Assert(plan->targetlist == NIL);
-                       Assert(plan->qual == NIL);
-                       foreach(l, ((BitmapOr *) plan)->bitmapplans)
-                               adjust_plan_varnos((Plan *) lfirst(l), rtoffset);
-                       break;
-               default:
-                       elog(ERROR, "unrecognized node type: %d",
-                                (int) nodeTag(plan));
-                       break;
+/*
+ * set_customscan_references
+ *        Do set_plan_references processing on a CustomScan
+ */
+static void
+set_customscan_references(PlannerInfo *root,
+                                                 CustomScan *cscan,
+                                                 int rtoffset)
+{
+       ListCell   *lc;
+
+       /* Adjust scanrelid if it's valid */
+       if (cscan->scan.scanrelid > 0)
+               cscan->scan.scanrelid += rtoffset;
+
+       if (cscan->custom_scan_tlist != NIL || cscan->scan.scanrelid == 0)
+       {
+               /* Adjust tlist, qual, custom_exprs to reference custom scan tuple */
+               indexed_tlist *itlist = build_tlist_index(cscan->custom_scan_tlist);
+
+               cscan->scan.plan.targetlist = (List *)
+                       fix_upper_expr(root,
+                                                  (Node *) cscan->scan.plan.targetlist,
+                                                  itlist,
+                                                  INDEX_VAR,
+                                                  rtoffset);
+               cscan->scan.plan.qual = (List *)
+                       fix_upper_expr(root,
+                                                  (Node *) cscan->scan.plan.qual,
+                                                  itlist,
+                                                  INDEX_VAR,
+                                                  rtoffset);
+               cscan->custom_exprs = (List *)
+                       fix_upper_expr(root,
+                                                  (Node *) cscan->custom_exprs,
+                                                  itlist,
+                                                  INDEX_VAR,
+                                                  rtoffset);
+               pfree(itlist);
+               /* custom_scan_tlist itself just needs fix_scan_list() adjustments */
+               cscan->custom_scan_tlist =
+                       fix_scan_list(root, cscan->custom_scan_tlist, rtoffset);
+       }
+       else
+       {
+               /* Adjust tlist, qual, custom_exprs in the standard way */
+               cscan->scan.plan.targetlist =
+                       fix_scan_list(root, cscan->scan.plan.targetlist, rtoffset);
+               cscan->scan.plan.qual =
+                       fix_scan_list(root, cscan->scan.plan.qual, rtoffset);
+               cscan->custom_exprs =
+                       fix_scan_list(root, cscan->custom_exprs, rtoffset);
        }
 
-       /*
-        * Now recurse into child plans.
-        *
-        * We don't need to (and in fact mustn't) recurse into subqueries, so no
-        * need to examine initPlan list.
-        */
-       adjust_plan_varnos(plan->lefttree, rtoffset);
-       adjust_plan_varnos(plan->righttree, rtoffset);
+       /* Adjust child plan-nodes recursively, if needed */
+       foreach(lc, cscan->custom_plans)
+       {
+               lfirst(lc) = set_plan_refs(root, (Plan *) lfirst(lc), rtoffset);
+       }
+
+       /* Adjust custom_relids if needed */
+       if (rtoffset > 0)
+       {
+               Bitmapset  *tempset = NULL;
+               int                     x = -1;
+
+               while ((x = bms_next_member(cscan->custom_relids, x)) >= 0)
+                       tempset = bms_add_member(tempset, x + rtoffset);
+               cscan->custom_relids = tempset;
+       }
 }
 
 /*
- * adjust_expr_varnos
- *             Offset varnos of Vars in an expression by rtoffset.
+ * copyVar
+ *             Copy a Var node.
  *
- * This is different from the rewriter's OffsetVarNodes in that it has to
- * work on an already-planned expression tree; in particular, we should not
- * disturb INNER and OUTER references. On the other hand, we don't have to
- * recurse into subqueries nor deal with outer-level Vars, so it's pretty
- * simple.
+ * fix_scan_expr and friends do this enough times that it's worth having
+ * a bespoke routine instead of using the generic copyObject() function.
+ */
+static inline Var *
+copyVar(Var *var)
+{
+       Var                *newvar = (Var *) palloc(sizeof(Var));
+
+       *newvar = *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 root->glob->relationOids, and
+ * add PlanInvalItems for user-defined functions into root->glob->invalItems.
+ * We also fill in column index lists for GROUPING() expressions.
+ *
+ * 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
-adjust_expr_varnos(Node *node, int rtoffset)
+fix_expr_common(PlannerInfo *root, Node *node)
 {
-       /* This tree walk requires no special setup, so away we go... */
-       adjust_expr_varnos_walker(node, &rtoffset);
+       /* We assume callers won't call us on a NULL pointer */
+       if (IsA(node, Aggref))
+       {
+               record_plan_function_dependency(root,
+                                                                               ((Aggref *) node)->aggfnoid);
+       }
+       else if (IsA(node, WindowFunc))
+       {
+               record_plan_function_dependency(root,
+                                                                               ((WindowFunc *) node)->winfnoid);
+       }
+       else if (IsA(node, FuncExpr))
+       {
+               record_plan_function_dependency(root,
+                                                                               ((FuncExpr *) node)->funcid);
+       }
+       else if (IsA(node, OpExpr))
+       {
+               set_opfuncid((OpExpr *) node);
+               record_plan_function_dependency(root,
+                                                                               ((OpExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, DistinctExpr))
+       {
+               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
+               record_plan_function_dependency(root,
+                                                                               ((DistinctExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, NullIfExpr))
+       {
+               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
+               record_plan_function_dependency(root,
+                                                                               ((NullIfExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, ScalarArrayOpExpr))
+       {
+               set_sa_opfuncid((ScalarArrayOpExpr *) node);
+               record_plan_function_dependency(root,
+                                                                        ((ScalarArrayOpExpr *) node)->opfuncid);
+       }
+       else if (IsA(node, ArrayCoerceExpr))
+       {
+               if (OidIsValid(((ArrayCoerceExpr *) node)->elemfuncid))
+                       record_plan_function_dependency(root,
+                                                                        ((ArrayCoerceExpr *) node)->elemfuncid);
+       }
+       else if (IsA(node, Const))
+       {
+               Const      *con = (Const *) node;
+
+               /* Check for regclass reference */
+               if (ISREGCLASSCONST(con))
+                       root->glob->relationOids =
+                               lappend_oid(root->glob->relationOids,
+                                                       DatumGetObjectId(con->constvalue));
+       }
+       else if (IsA(node, GroupingFunc))
+       {
+               GroupingFunc *g = (GroupingFunc *) node;
+               AttrNumber *grouping_map = root->grouping_map;
+
+               /* If there are no grouping sets, we don't need this. */
+
+               Assert(grouping_map || g->cols == NIL);
+
+               if (grouping_map)
+               {
+                       ListCell   *lc;
+                       List       *cols = NIL;
+
+                       foreach(lc, g->refs)
+                       {
+                               cols = lappend_int(cols, grouping_map[lfirst_int(lc)]);
+                       }
+
+                       Assert(!g->cols || equal(cols, g->cols));
+
+                       if (!g->cols)
+                               g->cols = cols;
+               }
+       }
 }
 
-static bool
-adjust_expr_varnos_walker(Node *node, int *context)
+/*
+ * fix_param_node
+ *             Do set_plan_references processing on a Param
+ *
+ * If it's a PARAM_MULTIEXPR, replace it with the appropriate Param from
+ * root->multiexpr_params; otherwise no change is needed.
+ * Just for paranoia's sake, we make a copy of the node in either case.
+ */
+static Node *
+fix_param_node(PlannerInfo *root, Param *p)
+{
+       if (p->paramkind == PARAM_MULTIEXPR)
+       {
+               int                     subqueryid = p->paramid >> 16;
+               int                     colno = p->paramid & 0xFFFF;
+               List       *params;
+
+               if (subqueryid <= 0 ||
+                       subqueryid > list_length(root->multiexpr_params))
+                       elog(ERROR, "unexpected PARAM_MULTIEXPR ID: %d", p->paramid);
+               params = (List *) list_nth(root->multiexpr_params, subqueryid - 1);
+               if (colno <= 0 || colno > list_length(params))
+                       elog(ERROR, "unexpected PARAM_MULTIEXPR ID: %d", p->paramid);
+               return copyObject(list_nth(params, colno - 1));
+       }
+       return copyObject(p);
+}
+
+/*
+ * fix_scan_expr
+ *             Do set_plan_references processing on a scan-level expression
+ *
+ * This consists of incrementing all Vars' varnos by rtoffset,
+ * replacing PARAM_MULTIEXPR Params, expanding PlaceHolderVars,
+ * looking up operator opcode info for OpExpr and related nodes,
+ * and adding OIDs from regclass Const nodes into root->glob->relationOids.
+ */
+static Node *
+fix_scan_expr(PlannerInfo *root, Node *node, int rtoffset)
+{
+       fix_scan_expr_context context;
+
+       context.root = root;
+       context.rtoffset = rtoffset;
+
+       if (rtoffset != 0 ||
+               root->multiexpr_params != NIL ||
+               root->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 MULTIEXPR subqueries then we don't need to replace
+                * PARAM_MULTIEXPR Params, 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 *
+fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context)
 {
        if (node == NULL)
-               return false;
+               return NULL;
        if (IsA(node, Var))
        {
-               Var                *var = (Var *) node;
+               Var                *var = copyVar((Var *) node);
 
                Assert(var->varlevelsup == 0);
-               if (var->varno > 0 && var->varno != INNER && var->varno != OUTER)
-                       var->varno += *context;
+
+               /*
+                * We should not see any Vars marked INNER_VAR or OUTER_VAR.  But an
+                * indexqual expression could contain INDEX_VAR Vars.
+                */
+               Assert(var->varno != INNER_VAR);
+               Assert(var->varno != OUTER_VAR);
+               if (!IS_SPECIAL_VARNO(var->varno))
+                       var->varno += context->rtoffset;
                if (var->varnoold > 0)
-                       var->varnoold += *context;
-               return false;
+                       var->varnoold += context->rtoffset;
+               return (Node *) var;
        }
-       return expression_tree_walker(node, adjust_expr_varnos_walker,
-                                                                 (void *) context);
-}
+       if (IsA(node, Param))
+               return fix_param_node(context->root, (Param *) node);
+       if (IsA(node, CurrentOfExpr))
+       {
+               CurrentOfExpr *cexpr = (CurrentOfExpr *) copyObject(node);
 
-/*
- * fix_expr_references
- *       Do final cleanup on expressions (targetlists or quals).
- *
- * This consists of looking up operator opcode info for OpExpr nodes
- * and recursively performing set_plan_references on subplans.
- *
- * The Plan argument is currently unused, but might be needed again someday.
- */
-static void
-fix_expr_references(Plan *plan, Node *node)
-{
-       /* This tree walk requires no special setup, so away we go... */
-       fix_expr_references_walker(node, NULL);
+               Assert(cexpr->cvarno != INNER_VAR);
+               Assert(cexpr->cvarno != OUTER_VAR);
+               if (!IS_SPECIAL_VARNO(cexpr->cvarno))
+                       cexpr->cvarno += context->rtoffset;
+               return (Node *) cexpr;
+       }
+       if (IsA(node, PlaceHolderVar))
+       {
+               /* At scan level, we should always just evaluate the contained expr */
+               PlaceHolderVar *phv = (PlaceHolderVar *) node;
+
+               return fix_scan_expr_mutator((Node *) phv->phexpr, context);
+       }
+       fix_expr_common(context->root, node);
+       return expression_tree_mutator(node, fix_scan_expr_mutator,
+                                                                  (void *) context);
 }
 
 static bool
-fix_expr_references_walker(Node *node, void *context)
+fix_scan_expr_walker(Node *node, fix_scan_expr_context *context)
 {
        if (node == NULL)
                return false;
-       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, ScalarArrayOpExpr))
-               set_sa_opfuncid((ScalarArrayOpExpr *) node);
-       else if (IsA(node, NullIfExpr))
-               set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, SubPlan))
-       {
-               SubPlan    *sp = (SubPlan *) node;
-
-               sp->plan = set_plan_references(sp->plan, sp->rtable);
-       }
-       return expression_tree_walker(node, fix_expr_references_walker, context);
+       Assert(!IsA(node, PlaceHolderVar));
+       fix_expr_common(context->root, node);
+       return expression_tree_walker(node, fix_scan_expr_walker,
+                                                                 (void *) context);
 }
 
 /*
  * set_join_references
- *       Modifies the target list and quals of a join node to reference its
- *       subplans, by setting the varnos to OUTER or INNER and setting attno
- *       values to the result domain number of either the corresponding outer
- *       or inner join tuple item.
- *
- * In the case of a nestloop with inner indexscan, we will also need to
- * apply the same transformation to any outer vars appearing in the
- * quals of the child indexscan.  set_inner_join_references does that.
- *
- *     'join' is a join plan node
+ *       Modify the target list and quals of a join node to reference its
+ *       subplans, by setting the varnos to OUTER_VAR or INNER_VAR and setting
+ *       attno values to the result domain number of either the corresponding
+ *       outer or inner join tuple item.  Also perform opcode lookup for these
+ *       expressions, and add regclass OIDs to root->glob->relationOids.
  */
 static void
-set_join_references(Join *join)
+set_join_references(PlannerInfo *root, Join *join, int rtoffset)
 {
        Plan       *outer_plan = join->plan.lefttree;
        Plan       *inner_plan = join->plan.righttree;
@@ -742,216 +1485,117 @@ set_join_references(Join *join)
        outer_itlist = build_tlist_index(outer_plan->targetlist);
        inner_itlist = build_tlist_index(inner_plan->targetlist);
 
-       /* All join plans have tlist, qual, and joinqual */
-       join->plan.targetlist = join_references(join->plan.targetlist,
-                                                                                       outer_itlist,
-                                                                                       inner_itlist,
-                                                                                       (Index) 0);
-       join->plan.qual = join_references(join->plan.qual,
-                                                                         outer_itlist,
-                                                                         inner_itlist,
-                                                                         (Index) 0);
-       join->joinqual = join_references(join->joinqual,
-                                                                        outer_itlist,
-                                                                        inner_itlist,
-                                                                        (Index) 0);
+       /*
+        * First process the joinquals (including merge or hash clauses).  These
+        * are logically below the join so they can always use all values
+        * available from the input tlists.  It's okay to also handle
+        * NestLoopParams now, because those couldn't refer to nullable
+        * subexpressions.
+        */
+       join->joinqual = fix_join_expr(root,
+                                                                  join->joinqual,
+                                                                  outer_itlist,
+                                                                  inner_itlist,
+                                                                  (Index) 0,
+                                                                  rtoffset);
 
        /* Now do join-type-specific stuff */
        if (IsA(join, NestLoop))
        {
-               /* This processing is split out to handle possible recursion */
-               set_inner_join_references(inner_plan,
-                                                                 outer_itlist);
-       }
-       else if (IsA(join, MergeJoin))
-       {
-               MergeJoin  *mj = (MergeJoin *) join;
-
-               mj->mergeclauses = join_references(mj->mergeclauses,
-                                                                                  outer_itlist,
-                                                                                  inner_itlist,
-                                                                                  (Index) 0);
-       }
-       else if (IsA(join, HashJoin))
-       {
-               HashJoin   *hj = (HashJoin *) join;
-
-               hj->hashclauses = join_references(hj->hashclauses,
-                                                                                 outer_itlist,
-                                                                                 inner_itlist,
-                                                                                 (Index) 0);
-       }
-
-       pfree(outer_itlist);
-       pfree(inner_itlist);
-}
-
-/*
- * set_inner_join_references
- *             Handle join references appearing in an inner indexscan's quals
- *
- * To handle bitmap-scan plan trees, we have to be able to recurse down
- * to the bottom BitmapIndexScan nodes; likewise, appendrel indexscans
- * require recursing through Append nodes.     This is split out as a separate
- * function so that it can recurse.
- */
-static void
-set_inner_join_references(Plan *inner_plan, indexed_tlist *outer_itlist)
-{
-       if (IsA(inner_plan, IndexScan))
-       {
-               /*
-                * An index is being used to reduce the number of tuples scanned in
-                * the inner relation.  If there are join clauses being used with the
-                * index, we must update their outer-rel var nodes to refer to the
-                * outer side of the join.
-                */
-               IndexScan  *innerscan = (IndexScan *) inner_plan;
-               List       *indexqualorig = innerscan->indexqualorig;
+               NestLoop   *nl = (NestLoop *) join;
+               ListCell   *lc;
 
-               /* No work needed if indexqual refers only to its own rel... */
-               if (NumRelids((Node *) indexqualorig) > 1)
+               foreach(lc, nl->nestParams)
                {
-                       Index           innerrel = innerscan->scan.scanrelid;
-
-                       /* only refs to outer vars get changed in the inner qual */
-                       innerscan->indexqualorig = join_references(indexqualorig,
-                                                                                                          outer_itlist,
-                                                                                                          NULL,
-                                                                                                          innerrel);
-                       innerscan->indexqual = join_references(innerscan->indexqual,
-                                                                                                  outer_itlist,
-                                                                                                  NULL,
-                                                                                                  innerrel);
+                       NestLoopParam *nlp = (NestLoopParam *) lfirst(lc);
 
-                       /*
-                        * We must fix the inner qpqual too, if it has join clauses (this
-                        * could happen if special operators are involved: some indexquals
-                        * may get rechecked as qpquals).
-                        */
-                       if (NumRelids((Node *) inner_plan->qual) > 1)
-                               inner_plan->qual = join_references(inner_plan->qual,
+                       nlp->paramval = (Var *) fix_upper_expr(root,
+                                                                                                  (Node *) nlp->paramval,
                                                                                                   outer_itlist,
-                                                                                                  NULL,
-                                                                                                  innerrel);
+                                                                                                  OUTER_VAR,
+                                                                                                  rtoffset);
+                       /* Check we replaced any PlaceHolderVar with simple Var */
+                       if (!(IsA(nlp->paramval, Var) &&
+                                 nlp->paramval->varno == OUTER_VAR))
+                               elog(ERROR, "NestLoopParam was not reduced to a simple Var");
                }
        }
-       else if (IsA(inner_plan, BitmapIndexScan))
+       else if (IsA(join, MergeJoin))
        {
-               /*
-                * Same, but index is being used within a bitmap plan.
-                */
-               BitmapIndexScan *innerscan = (BitmapIndexScan *) inner_plan;
-               List       *indexqualorig = innerscan->indexqualorig;
+               MergeJoin  *mj = (MergeJoin *) join;
 
-               /* No work needed if indexqual refers only to its own rel... */
-               if (NumRelids((Node *) indexqualorig) > 1)
-               {
-                       Index           innerrel = innerscan->scan.scanrelid;
-
-                       /* only refs to outer vars get changed in the inner qual */
-                       innerscan->indexqualorig = join_references(indexqualorig,
-                                                                                                          outer_itlist,
-                                                                                                          NULL,
-                                                                                                          innerrel);
-                       innerscan->indexqual = join_references(innerscan->indexqual,
-                                                                                                  outer_itlist,
-                                                                                                  NULL,
-                                                                                                  innerrel);
-                       /* no need to fix inner qpqual */
-                       Assert(inner_plan->qual == NIL);
-               }
+               mj->mergeclauses = fix_join_expr(root,
+                                                                                mj->mergeclauses,
+                                                                                outer_itlist,
+                                                                                inner_itlist,
+                                                                                (Index) 0,
+                                                                                rtoffset);
        }
-       else if (IsA(inner_plan, BitmapHeapScan))
+       else if (IsA(join, HashJoin))
        {
-               /*
-                * The inner side is a bitmap scan plan.  Fix the top node, and
-                * recurse to get the lower nodes.
-                *
-                * Note: create_bitmap_scan_plan removes clauses from bitmapqualorig
-                * if they are duplicated in qpqual, so must test these independently.
-                */
-               BitmapHeapScan *innerscan = (BitmapHeapScan *) inner_plan;
-               Index           innerrel = innerscan->scan.scanrelid;
-               List       *bitmapqualorig = innerscan->bitmapqualorig;
-
-               /* only refs to outer vars get changed in the inner qual */
-               if (NumRelids((Node *) bitmapqualorig) > 1)
-                       innerscan->bitmapqualorig = join_references(bitmapqualorig,
-                                                                                                               outer_itlist,
-                                                                                                               NULL,
-                                                                                                               innerrel);
+               HashJoin   *hj = (HashJoin *) join;
 
-               /*
-                * We must fix the inner qpqual too, if it has join clauses (this
-                * could happen if special operators are involved: some indexquals may
-                * get rechecked as qpquals).
-                */
-               if (NumRelids((Node *) inner_plan->qual) > 1)
-                       inner_plan->qual = join_references(inner_plan->qual,
-                                                                                          outer_itlist,
-                                                                                          NULL,
-                                                                                          innerrel);
-
-               /* Now recurse */
-               set_inner_join_references(inner_plan->lefttree,
-                                                                 outer_itlist);
+               hj->hashclauses = fix_join_expr(root,
+                                                                               hj->hashclauses,
+                                                                               outer_itlist,
+                                                                               inner_itlist,
+                                                                               (Index) 0,
+                                                                               rtoffset);
        }
-       else if (IsA(inner_plan, BitmapAnd))
-       {
-               /* All we need do here is recurse */
-               BitmapAnd  *innerscan = (BitmapAnd *) inner_plan;
-               ListCell   *l;
 
-               foreach(l, innerscan->bitmapplans)
-               {
-                       set_inner_join_references((Plan *) lfirst(l),
-                                                                         outer_itlist);
-               }
-       }
-       else if (IsA(inner_plan, BitmapOr))
+       /*
+        * Now we need to fix up the targetlist and qpqual, which are logically
+        * above the join.  This means they should not re-use any input expression
+        * that was computed in the nullable side of an outer join.  Vars and
+        * PlaceHolderVars are fine, so we can implement this restriction just by
+        * clearing has_non_vars in the indexed_tlist structs.
+        *
+        * XXX This is a grotty workaround for the fact that we don't clearly
+        * distinguish between a Var appearing below an outer join and the "same"
+        * Var appearing above it.  If we did, we'd not need to hack the matching
+        * rules this way.
+        */
+       switch (join->jointype)
        {
-               /* All we need do here is recurse */
-               BitmapOr   *innerscan = (BitmapOr *) inner_plan;
-               ListCell   *l;
-
-               foreach(l, innerscan->bitmapplans)
-               {
-                       set_inner_join_references((Plan *) lfirst(l),
-                                                                         outer_itlist);
-               }
+               case JOIN_LEFT:
+               case JOIN_SEMI:
+               case JOIN_ANTI:
+                       inner_itlist->has_non_vars = false;
+                       break;
+               case JOIN_RIGHT:
+                       outer_itlist->has_non_vars = false;
+                       break;
+               case JOIN_FULL:
+                       outer_itlist->has_non_vars = false;
+                       inner_itlist->has_non_vars = false;
+                       break;
+               default:
+                       break;
        }
-       else if (IsA(inner_plan, Append))
-       {
-               /*
-                * The inner side is an append plan.  Recurse to see if it contains
-                * indexscans that need to be fixed.
-                */
-               Append     *appendplan = (Append *) inner_plan;
-               ListCell   *l;
 
-               foreach(l, appendplan->appendplans)
-               {
-                       set_inner_join_references((Plan *) lfirst(l),
-                                                                         outer_itlist);
-               }
-       }
-       else if (IsA(inner_plan, TidScan))
-       {
-               TidScan    *innerscan = (TidScan *) inner_plan;
-               Index           innerrel = innerscan->scan.scanrelid;
+       join->plan.targetlist = fix_join_expr(root,
+                                                                                 join->plan.targetlist,
+                                                                                 outer_itlist,
+                                                                                 inner_itlist,
+                                                                                 (Index) 0,
+                                                                                 rtoffset);
+       join->plan.qual = fix_join_expr(root,
+                                                                       join->plan.qual,
+                                                                       outer_itlist,
+                                                                       inner_itlist,
+                                                                       (Index) 0,
+                                                                       rtoffset);
 
-               innerscan->tidquals = join_references(innerscan->tidquals,
-                                                                                         outer_itlist,
-                                                                                         NULL,
-                                                                                         innerrel);
-       }
+       pfree(outer_itlist);
+       pfree(inner_itlist);
 }
 
 /*
- * set_uppernode_references
+ * set_upper_references
  *       Update the targetlist and quals of an upper-level plan node
  *       to refer to the tuples returned by its lefttree subplan.
+ *       Also perform opcode lookup for these expressions, and
+ *       add regclass OIDs to root->glob->relationOids.
  *
  * This is used for single-input plan types like Agg, Group, Result.
  *
@@ -965,17 +1609,14 @@ set_inner_join_references(Plan *inner_plan, indexed_tlist *outer_itlist)
  * the expression.
  */
 static void
-set_uppernode_references(Plan *plan, Index subvarno)
+set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset)
 {
        Plan       *subplan = plan->lefttree;
        indexed_tlist *subplan_itlist;
        List       *output_targetlist;
        ListCell   *l;
 
-       if (subplan != NULL)
-               subplan_itlist = build_tlist_index(subplan->targetlist);
-       else
-               subplan_itlist = build_tlist_index(NIL);
+       subplan_itlist = build_tlist_index(subplan->targetlist);
 
        output_targetlist = NIL;
        foreach(l, plan->targetlist)
@@ -983,9 +1624,27 @@ set_uppernode_references(Plan *plan, Index subvarno)
                TargetEntry *tle = (TargetEntry *) lfirst(l);
                Node       *newexpr;
 
-               newexpr = replace_vars_with_subplan_refs((Node *) tle->expr,
-                                                                                                subplan_itlist,
-                                                                                                subvarno);
+               /* 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_VAR);
+                       if (!newexpr)
+                               newexpr = fix_upper_expr(root,
+                                                                                (Node *) tle->expr,
+                                                                                subplan_itlist,
+                                                                                OUTER_VAR,
+                                                                                rtoffset);
+               }
+               else
+                       newexpr = fix_upper_expr(root,
+                                                                        (Node *) tle->expr,
+                                                                        subplan_itlist,
+                                                                        OUTER_VAR,
+                                                                        rtoffset);
                tle = flatCopyTargetEntry(tle);
                tle->expr = (Expr *) newexpr;
                output_targetlist = lappend(output_targetlist, tle);
@@ -993,19 +1652,74 @@ set_uppernode_references(Plan *plan, Index subvarno)
        plan->targetlist = output_targetlist;
 
        plan->qual = (List *)
-               replace_vars_with_subplan_refs((Node *) plan->qual,
-                                                                          subplan_itlist,
-                                                                          subvarno);
+               fix_upper_expr(root,
+                                          (Node *) plan->qual,
+                                          subplan_itlist,
+                                          OUTER_VAR,
+                                          rtoffset);
 
        pfree(subplan_itlist);
 }
 
+/*
+ * set_dummy_tlist_references
+ *       Replace the targetlist of an upper-level plan node with a simple
+ *       list of OUTER_VAR references to its child.
+ *
+ * This is used for plan types like Sort and Append that don't evaluate
+ * their targetlists.  Although the executor doesn't care at all what's in
+ * the tlist, EXPLAIN needs it to be realistic.
+ *
+ * Note: we could almost use set_upper_references() here, but it fails for
+ * Append for lack of a lefttree subplan.  Single-purpose code is faster
+ * anyway.
+ */
+static void
+set_dummy_tlist_references(Plan *plan, int rtoffset)
+{
+       List       *output_targetlist;
+       ListCell   *l;
+
+       output_targetlist = NIL;
+       foreach(l, plan->targetlist)
+       {
+               TargetEntry *tle = (TargetEntry *) lfirst(l);
+               Var                *oldvar = (Var *) tle->expr;
+               Var                *newvar;
+
+               newvar = makeVar(OUTER_VAR,
+                                                tle->resno,
+                                                exprType((Node *) oldvar),
+                                                exprTypmod((Node *) oldvar),
+                                                exprCollation((Node *) oldvar),
+                                                0);
+               if (IsA(oldvar, Var))
+               {
+                       newvar->varnoold = oldvar->varno + rtoffset;
+                       newvar->varoattno = oldvar->varattno;
+               }
+               else
+               {
+                       newvar->varnoold = 0;           /* wasn't ever a plain Var */
+                       newvar->varoattno = 0;
+               }
+
+               tle = flatCopyTargetEntry(tle);
+               tle->expr = (Expr *) newvar;
+               output_targetlist = lappend(output_targetlist, tle);
+       }
+       plan->targetlist = output_targetlist;
+
+       /* We don't touch plan->qual here */
+}
+
+
 /*
  * build_tlist_index --- build an index data structure for a child tlist
  *
  * In most cases, subplan tlists will be "flat" tlists with only Vars,
  * so we try to optimize that case by extracting information about Vars
- * in advance. Matching a parent tlist to a child is still an O(N^2)
+ * in advance.  Matching a parent tlist to a child is still an O(N^2)
  * operation, but at least with a much smaller constant factor than plain
  * tlist_member() searches.
  *
@@ -1026,6 +1740,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 */
@@ -1043,6 +1758,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;
        }
@@ -1056,7 +1773,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)
@@ -1071,6 +1790,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 */
@@ -1091,6 +1811,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);
@@ -1103,10 +1825,12 @@ build_tlist_index_other_vars(List *tlist, Index ignore_rel)
  *
  * If a match is found, return a copy of the given Var with suitably
  * modified varno/varattno (to wit, newvarno and the resno of the TLE entry).
+ * Also ensure that varnoold is incremented by rtoffset.
  * If no match, return NULL.
  */
 static Var *
-search_indexed_tlist_for_var(Var *var, indexed_tlist *itlist, Index newvarno)
+search_indexed_tlist_for_var(Var *var, indexed_tlist *itlist,
+                                                        Index newvarno, int rtoffset)
 {
        Index           varno = var->varno;
        AttrNumber      varattno = var->varattno;
@@ -1120,10 +1844,12 @@ search_indexed_tlist_for_var(Var *var, indexed_tlist *itlist, Index newvarno)
                if (vinfo->varno == varno && vinfo->varattno == varattno)
                {
                        /* Found a match */
-                       Var                *newvar = (Var *) copyObject(var);
+                       Var                *newvar = copyVar(var);
 
                        newvar->varno = newvarno;
                        newvar->varattno = vinfo->resno;
+                       if (newvar->varnoold > 0)
+                               newvar->varnoold += rtoffset;
                        return newvar;
                }
                vinfo++;
@@ -1137,7 +1863,10 @@ search_indexed_tlist_for_var(Var *var, indexed_tlist *itlist, Index newvarno)
  * 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.  Furthermore, set_join_references() relies on being
+ * able to prevent matching of non-Vars by clearing itlist->has_non_vars,
+ * so there's a correctness reason not to call it unless that's set.
  */
 static Var *
 search_indexed_tlist_for_non_var(Node *node,
@@ -1151,11 +1880,7 @@ search_indexed_tlist_for_non_var(Node *node,
                /* Found a matching subplan output expression */
                Var                *newvar;
 
-               newvar = makeVar(newvarno,
-                                                tle->resno,
-                                                exprType((Node *) tle->expr),
-                                                exprTypmod((Node *) tle->expr),
-                                                0);
+               newvar = makeVarFromTargetEntry(newvarno, tle);
                newvar->varnoold = 0;   /* wasn't ever a plain Var */
                newvar->varoattno = 0;
                return newvar;
@@ -1164,50 +1889,95 @@ search_indexed_tlist_for_non_var(Node *node,
 }
 
 /*
- * join_references
- *        Creates a new set of targetlist entries or join qual clauses by
+ * 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 = makeVarFromTargetEntry(newvarno, tle);
+                       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
  *        changing the varno/varattno values of variables in the clauses
  *        to reference target list values from the outer and inner join
- *        relation target lists.
+ *        relation target lists.  Also perform opcode lookup and add
+ *        regclass OIDs to root->glob->relationOids.
  *
- * This is used in two different scenarios: a normal join clause, where
- * all the Vars in the clause *must* be replaced by OUTER or INNER references;
- * and an indexscan being used on the inner side of a nestloop join.
- * In the latter case we want to replace the outer-relation Vars by OUTER
- * references, but not touch the Vars of the inner relation.  (We also
- * implement RETURNING clause fixup using this second scenario.)
+ * This is used in two different scenarios: a normal join clause, where all
+ * the Vars in the clause *must* be replaced by OUTER_VAR or INNER_VAR
+ * references; and a RETURNING clause, which may contain both Vars of the
+ * target relation and Vars of other relations.  In the latter case we want
+ * to replace the other-relation Vars by OUTER_VAR references, while leaving
+ * target Vars alone.
  *
  * For a normal join, acceptable_rel should be zero so that any failure to
- * match a Var will be reported as an error.  For the indexscan case,
- * pass inner_itlist = NULL and acceptable_rel = the ID of the inner relation.
+ * match a Var will be reported as an error.  For the RETURNING case, pass
+ * inner_itlist = NULL and acceptable_rel = the ID of the target relation.
  *
  * 'clauses' is the targetlist or list of join clauses
- * 'outer_itlist' is the indexed target list of the outer join relation
+ * 'outer_itlist' is the indexed target list of the outer join relation,
+ *             or NULL
  * 'inner_itlist' is the indexed target list of the inner join relation,
  *             or NULL
  * 'acceptable_rel' is either zero or the rangetable index of a relation
- *             whose Vars may appear in the clause without provoking an error.
+ *             whose Vars may appear in the clause without provoking an error
+ * 'rtoffset': how much to increment varnoold by
  *
  * Returns the new expression tree.  The original clause structure is
  * not modified.
  */
 static List *
-join_references(List *clauses,
-                               indexed_tlist *outer_itlist,
-                               indexed_tlist *inner_itlist,
-                               Index acceptable_rel)
+fix_join_expr(PlannerInfo *root,
+                         List *clauses,
+                         indexed_tlist *outer_itlist,
+                         indexed_tlist *inner_itlist,
+                         Index acceptable_rel,
+                         int rtoffset)
 {
-       join_references_context context;
+       fix_join_expr_context context;
 
+       context.root = root;
        context.outer_itlist = outer_itlist;
        context.inner_itlist = inner_itlist;
        context.acceptable_rel = acceptable_rel;
-       return (List *) join_references_mutator((Node *) clauses, &context);
+       context.rtoffset = rtoffset;
+       return (List *) fix_join_expr_mutator((Node *) clauses, &context);
 }
 
 static Node *
-join_references_mutator(Node *node,
-                                               join_references_context *context)
+fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 {
        Var                *newvar;
 
@@ -1218,33 +1988,73 @@ join_references_mutator(Node *node,
                Var                *var = (Var *) node;
 
                /* First look for the var in the input tlists */
-               newvar = search_indexed_tlist_for_var(var,
-                                                                                         context->outer_itlist,
-                                                                                         OUTER);
-               if (newvar)
-                       return (Node *) newvar;
+               if (context->outer_itlist)
+               {
+                       newvar = search_indexed_tlist_for_var(var,
+                                                                                                 context->outer_itlist,
+                                                                                                 OUTER_VAR,
+                                                                                                 context->rtoffset);
+                       if (newvar)
+                               return (Node *) newvar;
+               }
+
+               /* Then in the outer */
                if (context->inner_itlist)
                {
                        newvar = search_indexed_tlist_for_var(var,
                                                                                                  context->inner_itlist,
-                                                                                                 INNER);
+                                                                                                 INNER_VAR,
+                                                                                                 context->rtoffset);
                        if (newvar)
                                return (Node *) newvar;
                }
 
-               /* Return the Var unmodified, if it's for acceptable_rel */
+               /* If it's for acceptable_rel, adjust and return it */
                if (var->varno == context->acceptable_rel)
-                       return (Node *) copyObject(var);
+               {
+                       var = copyVar(var);
+                       var->varno += context->rtoffset;
+                       if (var->varnoold > 0)
+                               var->varnoold += context->rtoffset;
+                       return (Node *) var;
+               }
 
                /* 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 && context->outer_itlist->has_ph_vars)
+               {
+                       newvar = search_indexed_tlist_for_non_var((Node *) phv,
+                                                                                                         context->outer_itlist,
+                                                                                                         OUTER_VAR);
+                       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_VAR);
+                       if (newvar)
+                               return (Node *) newvar;
+               }
+
+               /* If not supplied by input plans, evaluate the contained expr */
+               return fix_join_expr_mutator((Node *) phv->phexpr, context);
+       }
+       if (IsA(node, Param))
+               return fix_param_node(context->root, (Param *) node);
        /* Try matching more complex expressions too, if tlists have any */
-       if (context->outer_itlist->has_non_vars)
+       if (context->outer_itlist && context->outer_itlist->has_non_vars)
        {
                newvar = search_indexed_tlist_for_non_var(node,
                                                                                                  context->outer_itlist,
-                                                                                                 OUTER);
+                                                                                                 OUTER_VAR);
                if (newvar)
                        return (Node *) newvar;
        }
@@ -1252,20 +2062,24 @@ join_references_mutator(Node *node,
        {
                newvar = search_indexed_tlist_for_non_var(node,
                                                                                                  context->inner_itlist,
-                                                                                                 INNER);
+                                                                                                 INNER_VAR);
                if (newvar)
                        return (Node *) newvar;
        }
+       fix_expr_common(context->root, node);
        return expression_tree_mutator(node,
-                                                                  join_references_mutator,
+                                                                  fix_join_expr_mutator,
                                                                   (void *) context);
 }
 
 /*
- * replace_vars_with_subplan_refs
- *             This routine modifies an expression tree so that all Var nodes
- *             reference target nodes of a subplan.  It is used to fix up
- *             target and qual expressions of non-join upper-level plan nodes.
+ * fix_upper_expr
+ *             Modifies an expression tree so that all Var nodes reference outputs
+ *             of a subplan.  Also performs opcode lookup, and adds regclass OIDs to
+ *             root->glob->relationOids.
+ *
+ * This is used to fix up target and qual expressions of non-join upper-level
+ * plan nodes, as well as index-only scan nodes.
  *
  * An error is raised if no matching var can be found in the subplan tlist
  * --- so this routine should only be applied to nodes whose subplans'
@@ -1278,28 +2092,32 @@ join_references_mutator(Node *node,
  * subplan tlist is just a flattened list of Vars.)
  *
  * 'node': the tree to be fixed (a target item or qual)
- * 'subplan_itlist': indexed target list for subplan
- * 'subvarno': varno to be assigned to all Vars
+ * 'subplan_itlist': indexed target list for subplan (or index)
+ * 'newvarno': varno to use for Vars referencing tlist elements
+ * 'rtoffset': how much to increment varnoold by
  *
  * The resulting tree is a copy of the original in which all Var nodes have
- * varno = subvarno, varattno = resno of corresponding subplan target.
+ * varno = newvarno, varattno = resno of corresponding targetlist element.
  * The original tree is not modified.
  */
 static Node *
-replace_vars_with_subplan_refs(Node *node,
-                                                          indexed_tlist *subplan_itlist,
-                                                          Index subvarno)
+fix_upper_expr(PlannerInfo *root,
+                          Node *node,
+                          indexed_tlist *subplan_itlist,
+                          Index newvarno,
+                          int rtoffset)
 {
-       replace_vars_with_subplan_refs_context context;
+       fix_upper_expr_context context;
 
+       context.root = root;
        context.subplan_itlist = subplan_itlist;
-       context.subvarno = subvarno;
-       return replace_vars_with_subplan_refs_mutator(node, &context);
+       context.newvarno = newvarno;
+       context.rtoffset = rtoffset;
+       return fix_upper_expr_mutator(node, &context);
 }
 
 static Node *
-replace_vars_with_subplan_refs_mutator(Node *node,
-                                                        replace_vars_with_subplan_refs_context *context)
+fix_upper_expr_mutator(Node *node, fix_upper_expr_context *context)
 {
        Var                *newvar;
 
@@ -1311,22 +2129,42 @@ replace_vars_with_subplan_refs_mutator(Node *node,
 
                newvar = search_indexed_tlist_for_var(var,
                                                                                          context->subplan_itlist,
-                                                                                         context->subvarno);
+                                                                                         context->newvarno,
+                                                                                         context->rtoffset);
                if (!newvar)
                        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,
+                                                                                                         context->newvarno);
+                       if (newvar)
+                               return (Node *) newvar;
+               }
+               /* If not supplied by input plan, evaluate the contained expr */
+               return fix_upper_expr_mutator((Node *) phv->phexpr, context);
+       }
+       if (IsA(node, Param))
+               return fix_param_node(context->root, (Param *) node);
        /* Try matching more complex expressions too, if tlist has any */
        if (context->subplan_itlist->has_non_vars)
        {
                newvar = search_indexed_tlist_for_non_var(node,
                                                                                                  context->subplan_itlist,
-                                                                                                 context->subvarno);
+                                                                                                 context->newvarno);
                if (newvar)
                        return (Node *) newvar;
        }
+       fix_expr_common(context->root, node);
        return expression_tree_mutator(node,
-                                                                  replace_vars_with_subplan_refs_mutator,
+                                                                  fix_upper_expr_mutator,
                                                                   (void *) context);
 }
 
@@ -1336,47 +2174,66 @@ replace_vars_with_subplan_refs_mutator(Node *node,
  *
  * 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
- * original varno, but Vars for other rels will have varno OUTER.
+ * using the actual heap tuple, after firing triggers if any).  In the
+ * adjusted RETURNING list, result-table Vars will have their original
+ * varno (plus rtoffset), but Vars for other rels will have varno OUTER_VAR.
  *
- * We also must apply fix_expr_references to the list.
+ * We also must perform opcode lookup and add regclass OIDs to
+ * root->glob->relationOids.
  *
  * 'rlist': the RETURNING targetlist to be fixed
- * 'topplan': the top Plan node for the query (not yet passed through
- *             set_plan_references)
- * 'resultRelation': RT index of the query's result relation
+ * 'topplan': the top subplan node that will be just below the ModifyTable
+ *             node (note it's not yet passed through set_plan_refs)
+ * 'resultRelation': RT index of the associated result relation
+ * 'rtoffset': how much to increment varnos by
+ *
+ * Note: the given 'root' is for the parent query level, not the 'topplan'.
+ * This does not matter currently since we only access the dependency-item
+ * lists in root->glob, but it would need some hacking if we wanted a root
+ * that actually matches the subplan.
+ *
+ * Note: resultRelation is not yet adjusted by rtoffset.
  */
-List *
-set_returning_clause_references(List *rlist,
+static List *
+set_returning_clause_references(PlannerInfo *root,
+                                                               List *rlist,
                                                                Plan *topplan,
-                                                               Index resultRelation)
+                                                               Index resultRelation,
+                                                               int rtoffset)
 {
        indexed_tlist *itlist;
 
        /*
-        * We can perform the desired Var fixup by abusing the join_references
-        * machinery that normally handles inner indexscan fixup.  We search the
+        * We can perform the desired Var fixup by abusing the fix_join_expr
+        * machinery that formerly handled inner indexscan fixup.  We search the
         * top plan's targetlist for Vars of non-result relations, and use
-        * join_references to convert RETURNING Vars into references to those
-        * tlist entries, while leaving result-rel Vars as-is.
+        * 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);
 
-       rlist = join_references(rlist,
-                                                       itlist,
-                                                       NULL,
-                                                       resultRelation);
-
-       fix_expr_references(topplan, (Node *) rlist);
+       rlist = fix_join_expr(root,
+                                                 rlist,
+                                                 itlist,
+                                                 NULL,
+                                                 resultRelation,
+                                                 rtoffset);
 
        pfree(itlist);
 
        return rlist;
 }
 
+
 /*****************************************************************************
  *                                     OPERATOR REGPROC LOOKUP
  *****************************************************************************/
@@ -1406,10 +2263,10 @@ fix_opfuncids_walker(Node *node, void *context)
                set_opfuncid((OpExpr *) node);
        else if (IsA(node, DistinctExpr))
                set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
-       else if (IsA(node, ScalarArrayOpExpr))
-               set_sa_opfuncid((ScalarArrayOpExpr *) node);
        else if (IsA(node, NullIfExpr))
                set_opfuncid((OpExpr *) node);  /* rely on struct equivalence */
+       else if (IsA(node, ScalarArrayOpExpr))
+               set_sa_opfuncid((ScalarArrayOpExpr *) node);
        return expression_tree_walker(node, fix_opfuncids_walker, context);
 }
 
@@ -1438,3 +2295,123 @@ 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(PlannerInfo *root, 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)
+       {
+               PlanInvalItem *inval_item = makeNode(PlanInvalItem);
+
+               /*
+                * It would work to use any syscache on pg_proc, but the easiest is
+                * PROCOID since we already have the function's OID at hand.  Note
+                * that plancache.c knows we use PROCOID.
+                */
+               inval_item->cacheId = PROCOID;
+               inval_item->hashValue = GetSysCacheHashValue1(PROCOID,
+                                                                                                  ObjectIdGetDatum(funcid));
+
+               root->glob->invalItems = lappend(root->glob->invalItems, inval_item);
+       }
+}
+
+/*
+ * 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,
+                                                  bool *hasRowSecurity)
+{
+       PlannerGlobal glob;
+       PlannerInfo root;
+
+       /* Make up dummy planner state so we can use this module's machinery */
+       MemSet(&glob, 0, sizeof(glob));
+       glob.type = T_PlannerGlobal;
+       glob.relationOids = NIL;
+       glob.invalItems = NIL;
+       glob.hasRowSecurity = false;
+
+       MemSet(&root, 0, sizeof(root));
+       root.type = T_PlannerInfo;
+       root.glob = &glob;
+
+       (void) extract_query_dependencies_walker(query, &root);
+
+       *relationOids = glob.relationOids;
+       *invalItems = glob.invalItems;
+       *hasRowSecurity = glob.hasRowSecurity;
+}
+
+static bool
+extract_query_dependencies_walker(Node *node, PlannerInfo *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;
+
+               /* Collect row security information */
+               context->glob->hasRowSecurity = query->hasRowSecurity;
+
+               if (query->commandType == CMD_UTILITY)
+               {
+                       /*
+                        * Ignore utility statements, except those (such as EXPLAIN) that
+                        * contain a parsed-but-not-planned query.
+                        */
+                       query = UtilityContainsQuery(query->utilityStmt);
+                       if (query == NULL)
+                               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->glob->relationOids =
+                                       lappend_oid(context->glob->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);
+}