]> granicus.if.org Git - postgresql/blobdiff - src/backend/optimizer/plan/planner.c
When using extended-query protocol, postpone planning of unnamed statements
[postgresql] / src / backend / optimizer / plan / planner.c
index 5d845e9842a6a44a23df384ac04304753dedfa64..2fc82556c3283f3c9e860b6b78186553dbb7f5f9 100644 (file)
@@ -3,21 +3,31 @@
  * planner.c
  *       The query optimizer external interface.
  *
- * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.98 2000/12/14 22:30:43 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.172 2004/06/11 01:08:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include <limits.h>
+
+#include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
+#include "executor/executor.h"
+#include "miscadmin.h"
 #include "nodes/makefuncs.h"
+#ifdef OPTIMIZER_DEBUG
+#include "nodes/print.h"
+#endif
 #include "optimizer/clauses.h"
+#include "optimizer/cost.h"
+#include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/planmain.h"
 #include "optimizer/planner.h"
 #include "parser/analyze.h"
 #include "parser/parsetree.h"
 #include "parser/parse_expr.h"
-#include "rewrite/rewriteManip.h"
-#include "utils/lsyscache.h"
+#include "parser/parse_oper.h"
+#include "utils/selfuncs.h"
+#include "utils/syscache.h"
+
+
+ParamListInfo PlannerBoundParamList = NULL;    /* current boundParams */
 
 
 /* Expression kind codes for preprocess_expression */
-#define EXPRKIND_TARGET        0
-#define EXPRKIND_WHERE 1
-#define EXPRKIND_HAVING        2
+#define EXPRKIND_QUAL  0
+#define EXPRKIND_TARGET 1
+#define EXPRKIND_RTFUNC 2
+#define EXPRKIND_LIMIT 3
+#define EXPRKIND_ININFO 4
 
 
-static Node *pull_up_subqueries(Query *parse, Node *jtnode);
-static bool is_simple_subquery(Query *subquery);
-static void resolvenew_in_jointree(Node *jtnode, int varno, List *subtlist);
-static Node *preprocess_jointree(Query *parse, Node *jtnode);
 static Node *preprocess_expression(Query *parse, Node *expr, int kind);
 static void preprocess_qual_conditions(Query *parse, Node *jtnode);
 static Plan *inheritance_planner(Query *parse, List *inheritlist);
 static Plan *grouping_planner(Query *parse, double tuple_fraction);
+static bool hash_safe_grouping(Query *parse);
 static List *make_subplanTargetList(Query *parse, List *tlist,
-                                          AttrNumber **groupColIdx);
-static Plan *make_groupplan(List *group_tlist, bool tuplePerGroup,
-                          List *groupClause, AttrNumber *grpColIdx,
-                          bool is_presorted, Plan *subplan);
+                                          AttrNumber **groupColIdx, bool *need_tlist_eval);
+static void locate_grouping_columns(Query *parse,
+                                               List *tlist,
+                                               List *sub_tlist,
+                                               AttrNumber *groupColIdx);
 static List *postprocess_setop_tlist(List *new_tlist, List *orig_tlist);
 
 
@@ -60,46 +74,81 @@ static List *postprocess_setop_tlist(List *new_tlist, List *orig_tlist);
  *
  *****************************************************************************/
 Plan *
-planner(Query *parse)
+planner(Query *parse, bool isCursor, int cursorOptions,
+               ParamListInfo boundParams)
 {
+       double          tuple_fraction;
        Plan       *result_plan;
        Index           save_PlannerQueryLevel;
-       List       *save_PlannerParamVar;
+       List       *save_PlannerParamList;
+       ParamListInfo save_PlannerBoundParamList;
 
        /*
         * The planner can be called recursively (an example is when
-        * eval_const_expressions tries to pre-evaluate an SQL function).
-        * So, these global state variables must be saved and restored.
+        * eval_const_expressions tries to pre-evaluate an SQL function). So,
+        * these global state variables must be saved and restored.
         *
-        * These vars cannot be moved into the Query structure since their
-        * whole purpose is communication across multiple sub-Queries.
+        * Query level and the param list cannot be moved into the Query structure
+        * since their whole purpose is communication across multiple sub-Queries.
+        * Also, boundParams is explicitly info from outside the Query, and so
+        * is likewise better handled as a global variable.
         *
         * Note we do NOT save and restore PlannerPlanId: it exists to assign
-        * unique IDs to SubPlan nodes, and we want those IDs to be unique
-        * for the life of a backend.  Also, PlannerInitPlan is saved/restored
-        * in subquery_planner, not here.
+        * unique IDs to SubPlan nodes, and we want those IDs to be unique for
+        * the life of a backend.  Also, PlannerInitPlan is saved/restored in
+        * subquery_planner, not here.
         */
        save_PlannerQueryLevel = PlannerQueryLevel;
-       save_PlannerParamVar = PlannerParamVar;
+       save_PlannerParamList = PlannerParamList;
+       save_PlannerBoundParamList = PlannerBoundParamList;
 
        /* Initialize state for handling outer-level references and params */
        PlannerQueryLevel = 0;          /* will be 1 in top-level subquery_planner */
-       PlannerParamVar = NIL;
+       PlannerParamList = NIL;
+       PlannerBoundParamList = boundParams;
+
+       /* Determine what fraction of the plan is likely to be scanned */
+       if (isCursor)
+       {
+               /*
+                * We have no real idea how many tuples the user will ultimately
+                * FETCH from a cursor, but it seems a good bet that he doesn't
+                * want 'em all.  Optimize for 10% retrieval (you gotta better
+                * number?      Should this be a SETtable parameter?)
+                */
+               tuple_fraction = 0.10;
+       }
+       else
+       {
+               /* Default assumption is we need all the tuples */
+               tuple_fraction = 0.0;
+       }
 
        /* primary planning entry point (may recurse for subqueries) */
-       result_plan = subquery_planner(parse, -1.0 /* default case */ );
+       result_plan = subquery_planner(parse, tuple_fraction);
 
        Assert(PlannerQueryLevel == 0);
 
+       /*
+        * If creating a plan for a scrollable cursor, make sure it can run
+        * backwards on demand.  Add a Material node at the top at need.
+        */
+       if (isCursor && (cursorOptions & CURSOR_OPT_SCROLL))
+       {
+               if (!ExecSupportsBackwardScan(result_plan))
+                       result_plan = materialize_finished_plan(result_plan);
+       }
+
        /* executor wants to know total number of Params used overall */
-       result_plan->nParamExec = length(PlannerParamVar);
+       result_plan->nParamExec = list_length(PlannerParamList);
 
        /* final cleanup of the plan */
-       set_plan_references(result_plan);
+       set_plan_references(result_plan, parse->rtable);
 
        /* restore state for outer planner, if any */
        PlannerQueryLevel = save_PlannerQueryLevel;
-       PlannerParamVar = save_PlannerParamVar;
+       PlannerParamList = save_PlannerParamList;
+       PlannerBoundParamList = save_PlannerBoundParamList;
 
        return result_plan;
 }
@@ -131,42 +180,57 @@ subquery_planner(Query *parse, double tuple_fraction)
 {
        List       *saved_initplan = PlannerInitPlan;
        int                     saved_planid = PlannerPlanId;
+       bool            hasOuterJoins;
        Plan       *plan;
+       List       *newHaving;
        List       *lst;
+       ListCell   *l;
 
        /* Set up for a new level of subquery */
        PlannerQueryLevel++;
        PlannerInitPlan = NIL;
 
-#ifdef ENABLE_KEY_SET_QUERY
-       /* this should go away sometime soon */
-       transformKeySetQuery(parse);
-#endif
+       /*
+        * Look for IN clauses at the top level of WHERE, and transform them
+        * into joins.  Note that this step only handles IN clauses originally
+        * at top level of WHERE; if we pull up any subqueries in the next
+        * step, their INs are processed just before pulling them up.
+        */
+       parse->in_info_list = NIL;
+       if (parse->hasSubLinks)
+               parse->jointree->quals = pull_up_IN_clauses(parse,
+                                                                                                parse->jointree->quals);
 
        /*
         * Check to see if any subqueries in the rangetable can be merged into
         * this query.
         */
        parse->jointree = (FromExpr *)
-               pull_up_subqueries(parse, (Node *) parse->jointree);
-       /*
-        * If so, we may have created opportunities to simplify the jointree.
-        */
-       parse->jointree = (FromExpr *)
-               preprocess_jointree(parse, (Node *) parse->jointree);
+               pull_up_subqueries(parse, (Node *) parse->jointree, false);
 
        /*
-        * A HAVING clause without aggregates is equivalent to a WHERE clause
-        * (except it can only refer to grouped fields).  If there are no aggs
-        * anywhere in the query, then we don't want to create an Agg plan
-        * node, so merge the HAVING condition into WHERE.      (We used to
-        * consider this an error condition, but it seems to be legal SQL.)
+        * Detect whether any rangetable entries are RTE_JOIN kind; if not, we
+        * can avoid the expense of doing flatten_join_alias_vars().  Also
+        * check for outer joins --- if none, we can skip
+        * reduce_outer_joins(). This must be done after we have done
+        * pull_up_subqueries, of course.
         */
-       if (parse->havingQual != NULL && !parse->hasAggs)
+       parse->hasJoinRTEs = false;
+       hasOuterJoins = false;
+       foreach(l, parse->rtable)
        {
-               parse->jointree->quals = make_and_qual(parse->jointree->quals,
-                                                                                          parse->havingQual);
-               parse->havingQual = NULL;
+               RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
+
+               if (rte->rtekind == RTE_JOIN)
+               {
+                       parse->hasJoinRTEs = true;
+                       if (IS_OUTER_JOIN(rte->jointype))
+                       {
+                               hasOuterJoins = true;
+                               /* Can quit scanning once we find an outer join */
+                               break;
+                       }
+               }
        }
 
        /*
@@ -179,331 +243,133 @@ subquery_planner(Query *parse, double tuple_fraction)
        preprocess_qual_conditions(parse, (Node *) parse->jointree);
 
        parse->havingQual = preprocess_expression(parse, parse->havingQual,
-                                                                                         EXPRKIND_HAVING);
-
-       /*
-        * Do the main planning.  If we have an inherited target relation,
-        * that needs special processing, else go straight to grouping_planner.
-        */
-       if (parse->resultRelation &&
-               (lst = expand_inherted_rtentry(parse, parse->resultRelation)) != NIL)
-               plan = inheritance_planner(parse, lst);
-       else
-               plan = grouping_planner(parse, tuple_fraction);
-
-       /*
-        * If any subplans were generated, or if we're inside a subplan,
-        * build subPlan, extParam and locParam lists for plan nodes.
-        */
-       if (PlannerPlanId != saved_planid || PlannerQueryLevel > 1)
-       {
-               (void) SS_finalize_plan(plan);
-               /*
-                * At the moment, SS_finalize_plan doesn't handle initPlans
-                * and so we assign them to the topmost plan node.
-                */
-               plan->initPlan = PlannerInitPlan;
-               /* Must add the initPlans' extParams to the topmost node's, too */
-               foreach(lst, plan->initPlan)
-               {
-                       SubPlan *subplan = (SubPlan *) lfirst(lst);
+                                                                                         EXPRKIND_QUAL);
 
-                       plan->extParam = set_unioni(plan->extParam,
-                                                                               subplan->plan->extParam);
-               }
-       }
+       parse->limitOffset = preprocess_expression(parse, parse->limitOffset,
+                                                                                          EXPRKIND_LIMIT);
+       parse->limitCount = preprocess_expression(parse, parse->limitCount,
+                                                                                         EXPRKIND_LIMIT);
 
-       /* Return to outer subquery context */
-       PlannerQueryLevel--;
-       PlannerInitPlan = saved_initplan;
-       /* we do NOT restore PlannerPlanId; that's not an oversight! */
+       parse->in_info_list = (List *)
+               preprocess_expression(parse, (Node *) parse->in_info_list,
+                                                         EXPRKIND_ININFO);
 
-       return plan;
-}
-
-/*
- * pull_up_subqueries
- *             Look for subqueries in the rangetable that can be pulled up into
- *             the parent query.  If the subquery has no special features like
- *             grouping/aggregation then we can merge it into the parent's jointree.
- *
- * A tricky aspect of this code is that if we pull up a subquery we have
- * to replace Vars that reference the subquery's outputs throughout the
- * parent query, including quals attached to jointree nodes above the one
- * we are currently processing!  We handle this by being careful not to
- * change the jointree structure while recursing: no nodes other than
- * subquery RangeTblRef entries will be replaced.  Also, we can't turn
- * ResolveNew loose on the whole jointree, because it'll return a mutated
- * copy of the tree; we have to invoke it just on the quals, instead.
- */
-static Node *
-pull_up_subqueries(Query *parse, Node *jtnode)
-{
-       if (jtnode == NULL)
-               return NULL;
-       if (IsA(jtnode, RangeTblRef))
+       /* Also need to preprocess expressions for function RTEs */
+       foreach(l, parse->rtable)
        {
-               int                     varno = ((RangeTblRef *) jtnode)->rtindex;
-               RangeTblEntry *rte = rt_fetch(varno, parse->rtable);
-               Query      *subquery = rte->subquery;
-
-               /*
-                * Is this a subquery RTE, and if so, is the subquery simple enough
-                * to pull up?  (If not, do nothing at this node.)
-                */
-               if (subquery && is_simple_subquery(subquery))
-               {
-                       int             rtoffset;
-                       Node   *subjointree;
-                       List   *subtlist;
-                       List   *l;
-
-                       /*
-                        * First, recursively pull up the subquery's subqueries,
-                        * so that this routine's processing is complete for its
-                        * jointree and rangetable.
-                        */
-                       subquery->jointree = (FromExpr *)
-                               pull_up_subqueries(subquery, (Node *) subquery->jointree);
-                       /*
-                        * Append the subquery's rangetable to mine (currently,
-                        * no adjustments will be needed in the subquery's rtable).
-                        */
-                       rtoffset = length(parse->rtable);
-                       parse->rtable = nconc(parse->rtable, subquery->rtable);
-                       /*
-                        * Make copies of the subquery's jointree and targetlist
-                        * with varnos adjusted to match the merged rangetable.
-                        */
-                       subjointree = copyObject(subquery->jointree);
-                       OffsetVarNodes(subjointree, rtoffset, 0);
-                       subtlist = copyObject(subquery->targetList);
-                       OffsetVarNodes((Node *) subtlist, rtoffset, 0);
-                       /*
-                        * Replace all of the top query's references to the subquery's
-                        * outputs with copies of the adjusted subtlist items, being
-                        * careful not to replace any of the jointree structure.
-                        */
-                       parse->targetList = (List *)
-                               ResolveNew((Node *) parse->targetList,
-                                                  varno, 0, subtlist, CMD_SELECT, 0);
-                       resolvenew_in_jointree((Node *) parse->jointree, varno, subtlist);
-                       parse->havingQual =
-                               ResolveNew(parse->havingQual,
-                                                  varno, 0, subtlist, CMD_SELECT, 0);
-                       /*
-                        * Pull up any FOR UPDATE markers, too.
-                        */
-                       foreach(l, subquery->rowMarks)
-                       {
-                               int             submark = lfirsti(l);
-
-                               parse->rowMarks = lappendi(parse->rowMarks,
-                                                                                  submark + rtoffset);
-                       }
-                       /*
-                        * Miscellaneous housekeeping.
-                        */
-                       parse->hasSubLinks |= subquery->hasSubLinks;
-                       /* subquery won't be pulled up if it hasAggs, so no work there */
+               RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
 
-                       /*
-                        * Return the adjusted subquery jointree to replace the
-                        * RangeTblRef entry in my jointree.
-                        */
-                       return subjointree;
-               }
+               if (rte->rtekind == RTE_FUNCTION)
+                       rte->funcexpr = preprocess_expression(parse, rte->funcexpr,
+                                                                                                 EXPRKIND_RTFUNC);
        }
-       else if (IsA(jtnode, FromExpr))
-       {
-               FromExpr   *f = (FromExpr *) jtnode;
-               List       *l;
 
-               foreach(l, f->fromlist)
-               {
-                       lfirst(l) = pull_up_subqueries(parse, lfirst(l));
-               }
-       }
-       else if (IsA(jtnode, JoinExpr))
+       /*
+        * A HAVING clause without aggregates is equivalent to a WHERE clause
+        * (except it can only refer to grouped fields).  Transfer any
+        * agg-free clauses of the HAVING qual into WHERE.      This may seem like
+        * wasting cycles to cater to stupidly-written queries, but there are
+        * other reasons for doing it.  Firstly, if the query contains no aggs
+        * at all, then we aren't going to generate an Agg plan node, and so
+        * there'll be no place to execute HAVING conditions; without this
+        * transfer, we'd lose the HAVING condition entirely, which is wrong.
+        * Secondly, when we push down a qual condition into a sub-query, it's
+        * easiest to push the qual into HAVING always, in case it contains
+        * aggs, and then let this code sort it out.
+        *
+        * Note that both havingQual and parse->jointree->quals are in
+        * implicitly-ANDed-list form at this point, even though they are
+        * declared as Node *.
+        */
+       newHaving = NIL;
+       foreach(l, (List *) parse->havingQual)
        {
-               JoinExpr   *j = (JoinExpr *) jtnode;
+               Node       *havingclause = (Node *) lfirst(l);
 
-               j->larg = pull_up_subqueries(parse, j->larg);
-               j->rarg = pull_up_subqueries(parse, j->rarg);
+               if (contain_agg_clause(havingclause))
+                       newHaving = lappend(newHaving, havingclause);
+               else
+                       parse->jointree->quals = (Node *)
+                               lappend((List *) parse->jointree->quals, havingclause);
        }
-       else
-               elog(ERROR, "pull_up_subqueries: unexpected node type %d",
-                        nodeTag(jtnode));
-       return jtnode;
-}
+       parse->havingQual = (Node *) newHaving;
 
-/*
- * is_simple_subquery
- *       Check a subquery in the range table to see if it's simple enough
- *       to pull up into the parent query.
- */
-static bool
-is_simple_subquery(Query *subquery)
-{
        /*
-        * Let's just make sure it's a valid subselect ...
+        * If we have any outer joins, try to reduce them to plain inner
+        * joins. This step is most easily done after we've done expression
+        * preprocessing.
         */
-       if (!IsA(subquery, Query) ||
-               subquery->commandType != CMD_SELECT ||
-               subquery->resultRelation != 0 ||
-               subquery->into != NULL ||
-               subquery->isPortal)
-               elog(ERROR, "is_simple_subquery: subquery is bogus");
+       if (hasOuterJoins)
+               reduce_outer_joins(parse);
+
        /*
-        * Can't currently pull up a query with setops.
-        * Maybe after querytree redesign...
+        * See if we can simplify the jointree; opportunities for this may
+        * come from having pulled up subqueries, or from flattening explicit
+        * JOIN syntax.  We must do this after flattening JOIN alias
+        * variables, since eliminating explicit JOIN nodes from the jointree
+        * will cause get_relids_for_join() to fail.  But it should happen
+        * after reduce_outer_joins, anyway.
         */
-       if (subquery->setOperations)
-               return false;
+       parse->jointree = (FromExpr *)
+               simplify_jointree(parse, (Node *) parse->jointree);
+
        /*
-        * Can't pull up a subquery involving grouping, aggregation, sorting,
-        * or limiting.
+        * Do the main planning.  If we have an inherited target relation,
+        * that needs special processing, else go straight to
+        * grouping_planner.
         */
-       if (subquery->hasAggs ||
-               subquery->groupClause ||
-               subquery->havingQual ||
-               subquery->sortClause ||
-               subquery->distinctClause ||
-               subquery->limitOffset ||
-               subquery->limitCount)
-               return false;
+       if (parse->resultRelation &&
+               (lst = expand_inherited_rtentry(parse, parse->resultRelation,
+                                                                               false)) != NIL)
+               plan = inheritance_planner(parse, lst);
+       else
+               plan = grouping_planner(parse, tuple_fraction);
+
        /*
-        * Hack: don't try to pull up a subquery with an empty jointree.
-        * query_planner() will correctly generate a Result plan for a
-        * jointree that's totally empty, but I don't think the right things
-        * happen if an empty FromExpr appears lower down in a jointree.
-        * Not worth working hard on this, just to collapse SubqueryScan/Result
-        * into Result...
+        * If any subplans were generated, or if we're inside a subplan, build
+        * initPlan list and extParam/allParam sets for plan nodes.
         */
-       if (subquery->jointree->fromlist == NIL)
-               return false;
-
-       return true;
-}
-
-/*
- * Helper routine for pull_up_subqueries: do ResolveNew on every expression
- * in the jointree, without changing the jointree structure itself.  Ugly,
- * but there's no other way...
- */
-static void
-resolvenew_in_jointree(Node *jtnode, int varno, List *subtlist)
-{
-       if (jtnode == NULL)
-               return;
-       if (IsA(jtnode, RangeTblRef))
-       {
-               /* nothing to do here */
-       }
-       else if (IsA(jtnode, FromExpr))
+       if (PlannerPlanId != saved_planid || PlannerQueryLevel > 1)
        {
-               FromExpr   *f = (FromExpr *) jtnode;
-               List       *l;
+               Cost            initplan_cost = 0;
 
-               foreach(l, f->fromlist)
-                       resolvenew_in_jointree(lfirst(l), varno, subtlist);
-               f->quals = ResolveNew(f->quals,
-                                                         varno, 0, subtlist, CMD_SELECT, 0);
-       }
-       else if (IsA(jtnode, JoinExpr))
-       {
-               JoinExpr   *j = (JoinExpr *) jtnode;
+               /* Prepare extParam/allParam sets for all nodes in tree */
+               SS_finalize_plan(plan, parse->rtable);
 
-               resolvenew_in_jointree(j->larg, varno, subtlist);
-               resolvenew_in_jointree(j->rarg, varno, subtlist);
-               j->quals = ResolveNew(j->quals,
-                                                         varno, 0, subtlist, CMD_SELECT, 0);
-               /* We don't bother to update the colvars list, since it won't be
-                * used again ...
+               /*
+                * SS_finalize_plan doesn't handle initPlans, so we have to
+                * manually attach them to the topmost plan node, and add their
+                * extParams to the topmost node's, too.
+                *
+                * We also add the total_cost of each initPlan to the startup cost of
+                * the top node.  This is a conservative overestimate, since in
+                * fact each initPlan might be executed later than plan startup,
+                * or even not at all.
                 */
-       }
-       else
-               elog(ERROR, "resolvenew_in_jointree: unexpected node type %d",
-                        nodeTag(jtnode));
-}
-
-/*
- * preprocess_jointree
- *             Attempt to simplify a query's jointree.
- *
- * If we succeed in pulling up a subquery then we might form a jointree
- * in which a FromExpr is a direct child of another FromExpr.  In that
- * case we can consider collapsing the two FromExprs into one.  This is
- * an optional conversion, since the planner will work correctly either
- * way.  But we may find a better plan (at the cost of more planning time)
- * if we merge the two nodes.
- *
- * NOTE: don't try to do this in the same jointree scan that does subquery
- * pullup!  Since we're changing the jointree structure here, that wouldn't
- * work reliably --- see comments for pull_up_subqueries().
- */
-static Node *
-preprocess_jointree(Query *parse, Node *jtnode)
-{
-       if (jtnode == NULL)
-               return NULL;
-       if (IsA(jtnode, RangeTblRef))
-       {
-               /* nothing to do here... */
-       }
-       else if (IsA(jtnode, FromExpr))
-       {
-               FromExpr   *f = (FromExpr *) jtnode;
-               List       *newlist = NIL;
-               List       *l;
+               plan->initPlan = PlannerInitPlan;
 
-               foreach(l, f->fromlist)
+               foreach(l, plan->initPlan)
                {
-                       Node   *child = (Node *) lfirst(l);
-
-                       /* Recursively simplify the child... */
-                       child = preprocess_jointree(parse, child);
-                       /* Now, is it a FromExpr? */
-                       if (child && IsA(child, FromExpr))
-                       {
-                               /*
-                                * Yes, so do we want to merge it into parent?  Always do so
-                                * if child has just one element (since that doesn't make the
-                                * parent's list any longer).  Otherwise we have to be careful
-                                * about the increase in planning time caused by combining the
-                                * two join search spaces into one.  Our heuristic is to merge
-                                * if the merge will produce a join list no longer than
-                                * GEQO_RELS/2.  (Perhaps need an additional user parameter?)
-                                */
-                               FromExpr   *subf = (FromExpr *) child;
-                               int                     childlen = length(subf->fromlist);
-                               int                     myothers = length(newlist) + length(lnext(l));
-
-                               if (childlen <= 1 || (childlen+myothers) <= geqo_rels/2)
-                               {
-                                       newlist = nconc(newlist, subf->fromlist);
-                                       f->quals = make_and_qual(f->quals, subf->quals);
-                               }
-                               else
-                                       newlist = lappend(newlist, child);
-                       }
-                       else
-                               newlist = lappend(newlist, child);
+                       SubPlan    *initplan = (SubPlan *) lfirst(l);
+
+                       plan->extParam = bms_add_members(plan->extParam,
+                                                                                        initplan->plan->extParam);
+                       /* allParam must include all members of extParam */
+                       plan->allParam = bms_add_members(plan->allParam,
+                                                                                        plan->extParam);
+                       initplan_cost += initplan->plan->total_cost;
                }
-               f->fromlist = newlist;
-       }
-       else if (IsA(jtnode, JoinExpr))
-       {
-               JoinExpr   *j = (JoinExpr *) jtnode;
 
-               /* Can't usefully change the JoinExpr, but recurse on children */
-               j->larg = preprocess_jointree(parse, j->larg);
-               j->rarg = preprocess_jointree(parse, j->rarg);
+               plan->startup_cost += initplan_cost;
+               plan->total_cost += initplan_cost;
        }
-       else
-               elog(ERROR, "preprocess_jointree: unexpected node type %d",
-                        nodeTag(jtnode));
-       return jtnode;
+
+       /* Return to outer subquery context */
+       PlannerQueryLevel--;
+       PlannerInitPlan = saved_initplan;
+       /* we do NOT restore PlannerPlanId; that's not an oversight! */
+
+       return plan;
 }
 
 /*
@@ -516,25 +382,26 @@ static Node *
 preprocess_expression(Query *parse, Node *expr, int kind)
 {
        /*
-        * Simplify constant expressions.
-        *
-        * Note that at this point quals have not yet been converted to
-        * implicit-AND form, so we can apply eval_const_expressions directly.
-        * Also note that we need to do this before SS_process_sublinks,
-        * because that routine inserts bogus "Const" nodes.
+        * If the query has any join RTEs, replace join alias variables with
+        * base-relation variables. We must do this before sublink processing,
+        * else sublinks expanded out from join aliases wouldn't get
+        * processed.
         */
-       expr = eval_const_expressions(expr);
+       if (parse->hasJoinRTEs)
+               expr = flatten_join_alias_vars(parse, expr);
 
        /*
-        * If it's a qual or havingQual, canonicalize it, and convert it
-        * to implicit-AND format.
+        * If it's a qual or havingQual, canonicalize it.  It seems most useful
+        * to do this before applying eval_const_expressions, since the latter
+        * can optimize flattened AND/ORs better than unflattened ones.
         *
-        * XXX Is there any value in re-applying eval_const_expressions after
-        * canonicalize_qual?
+        * Note: all processing of a qual expression after this point must be
+        * careful to maintain AND/OR flatness --- that is, do not generate a
+        * tree with AND directly under AND, nor OR directly under OR.
         */
-       if (kind != EXPRKIND_TARGET)
+       if (kind == EXPRKIND_QUAL)
        {
-               expr = (Node *) canonicalize_qual((Expr *) expr, true);
+               expr = (Node *) canonicalize_qual((Expr *) expr);
 
 #ifdef OPTIMIZER_DEBUG
                printf("After canonicalize_qual()\n");
@@ -542,33 +409,33 @@ preprocess_expression(Query *parse, Node *expr, int kind)
 #endif
        }
 
+       /*
+        * Simplify constant expressions.
+        */
+       expr = eval_const_expressions(expr);
+
+       /* Expand SubLinks to SubPlans */
        if (parse->hasSubLinks)
-       {
-               /* Expand SubLinks to SubPlans */
-               expr = SS_process_sublinks(expr);
+               expr = SS_process_sublinks(expr, (kind == EXPRKIND_QUAL));
 
-               if (kind != EXPRKIND_WHERE &&
-                       (parse->groupClause != NIL || parse->hasAggs))
-               {
-                       /*
-                        * Check for ungrouped variables passed to subplans.  Note we
-                        * do NOT do this for subplans in WHERE (or JOIN/ON); it's legal
-                        * there because WHERE is evaluated pre-GROUP.
-                        *
-                        * An interesting fine point: if subquery_planner reassigned a
-                        * HAVING qual into WHERE, then we will accept references to
-                        * ungrouped vars from subplans in the HAVING qual.  This is not
-                        * entirely consistent, but it doesn't seem particularly
-                        * harmful...
-                        */
-                       check_subplans_for_ungrouped_vars(expr, parse);
-               }
-       }
+       /*
+        * XXX do not insert anything here unless you have grokked the
+        * comments in SS_replace_correlation_vars ...
+        */
 
        /* Replace uplevel vars with Param nodes */
        if (PlannerQueryLevel > 1)
                expr = SS_replace_correlation_vars(expr);
 
+       /*
+        * If it's a qual or havingQual, convert it to implicit-AND format.
+        * (We don't want to do this before eval_const_expressions, since the
+        * latter would be unable to simplify a top-level AND correctly.  Also,
+        * SS_process_sublinks expects explicit-AND format.)
+        */
+       if (kind == EXPRKIND_QUAL)
+               expr = (Node *) make_ands_implicit((Expr *) expr);
+
        return expr;
 }
 
@@ -589,12 +456,12 @@ preprocess_qual_conditions(Query *parse, Node *jtnode)
        else if (IsA(jtnode, FromExpr))
        {
                FromExpr   *f = (FromExpr *) jtnode;
-               List       *l;
+               ListCell   *l;
 
                foreach(l, f->fromlist)
                        preprocess_qual_conditions(parse, lfirst(l));
 
-               f->quals = preprocess_expression(parse, f->quals, EXPRKIND_WHERE);
+               f->quals = preprocess_expression(parse, f->quals, EXPRKIND_QUAL);
        }
        else if (IsA(jtnode, JoinExpr))
        {
@@ -603,11 +470,11 @@ preprocess_qual_conditions(Query *parse, Node *jtnode)
                preprocess_qual_conditions(parse, j->larg);
                preprocess_qual_conditions(parse, j->rarg);
 
-               j->quals = preprocess_expression(parse, j->quals, EXPRKIND_WHERE);
+               j->quals = preprocess_expression(parse, j->quals, EXPRKIND_QUAL);
        }
        else
-               elog(ERROR, "preprocess_qual_conditions: unexpected node type %d",
-                        nodeTag(jtnode));
+               elog(ERROR, "unrecognized node type: %d",
+                        (int) nodeTag(jtnode));
 }
 
 /*--------------------
@@ -616,12 +483,12 @@ preprocess_qual_conditions(Query *parse, Node *jtnode)
  *       inheritance set.
  *
  * We have to handle this case differently from cases where a source
- * relation is an inheritance set.  Source inheritance is expanded at
+ * relation is an inheritance set.     Source inheritance is expanded at
  * the bottom of the plan tree (see allpaths.c), but target inheritance
  * has to be expanded at the top.  The reason is that for UPDATE, each
  * target relation needs a different targetlist matching its own column
  * set.  (This is not so critical for DELETE, but for simplicity we treat
- * inherited DELETE the same way.)  Fortunately, the UPDATE/DELETE target
+ * inherited DELETE the same way.)     Fortunately, the UPDATE/DELETE target
  * can never be the nullable side of an outer join, so it's OK to generate
  * the plan this way.
  *
@@ -636,24 +503,44 @@ inheritance_planner(Query *parse, List *inheritlist)
 {
        int                     parentRTindex = parse->resultRelation;
        Oid                     parentOID = getrelid(parentRTindex, parse->rtable);
+       int                     mainrtlength = list_length(parse->rtable);
        List       *subplans = NIL;
        List       *tlist = NIL;
-       List       *l;
+       ListCell   *l;
 
        foreach(l, inheritlist)
        {
-               int             childRTindex = lfirsti(l);
-               Oid             childOID = getrelid(childRTindex, parse->rtable);
-               Query  *subquery;
-               Plan   *subplan;
+               int                     childRTindex = lfirst_int(l);
+               Oid                     childOID = getrelid(childRTindex, parse->rtable);
+               int                     subrtlength;
+               Query      *subquery;
+               Plan       *subplan;
 
                /* Generate modified query with this rel as target */
                subquery = (Query *) adjust_inherited_attrs((Node *) parse,
-                                                                                                       parentRTindex, parentOID,
-                                                                                                       childRTindex, childOID);
+                                                                                               parentRTindex, parentOID,
+                                                                                                childRTindex, childOID);
                /* Generate plan */
-               subplan = grouping_planner(subquery, 0.0 /* retrieve all tuples */);
+               subplan = grouping_planner(subquery, 0.0 /* retrieve all tuples */ );
                subplans = lappend(subplans, subplan);
+
+               /*
+                * It's possible that additional RTEs got added to the rangetable
+                * due to expansion of inherited source tables (see allpaths.c).
+                * If so, we must copy 'em back to the main parse tree's rtable.
+                *
+                * XXX my goodness this is ugly.  Really need to think about ways to
+                * rein in planner's habit of scribbling on its input.
+                */
+               subrtlength = list_length(subquery->rtable);
+               if (subrtlength > mainrtlength)
+               {
+                       List       *subrt;
+
+                       subrt = list_copy_tail(subquery->rtable, mainrtlength);
+                       parse->rtable = list_concat(parse->rtable, subrt);
+                       mainrtlength = subrtlength;
+               }
                /* Save preprocessed tlist from first rel for use in Append */
                if (tlist == NIL)
                        tlist = subplan->targetlist;
@@ -662,6 +549,9 @@ inheritance_planner(Query *parse, List *inheritlist)
        /* Save the target-relations list for the executor, too */
        parse->resultRelations = inheritlist;
 
+       /* Mark result as unordered (probably unnecessary) */
+       parse->query_pathkeys = NIL;
+
        return (Plan *) make_append(subplans, true, tlist);
 }
 
@@ -675,16 +565,14 @@ inheritance_planner(Query *parse, List *inheritlist)
  * tuple_fraction is the fraction of tuples we expect will be retrieved
  *
  * tuple_fraction is interpreted as follows:
- *       < 0: determine fraction by inspection of query (normal case)
- *       0: expect all tuples to be retrieved
+ *       0: expect all tuples to be retrieved (normal case)
  *       0 < tuple_fraction < 1: expect the given fraction of tuples available
  *             from the plan to be retrieved
  *       tuple_fraction >= 1: tuple_fraction is the absolute number of tuples
  *             expected to be retrieved (ie, a LIMIT specification)
- * The normal case is to pass -1, but some callers pass values >= 0 to
- * override this routine's determination of the appropriate fraction.
  *
- * Returns a query plan.
+ * Returns a query plan.  Also, parse->query_pathkeys is returned as the
+ * actual output ordering of the plan (in pathkey format).
  *--------------------
  */
 static Plan *
@@ -693,17 +581,27 @@ grouping_planner(Query *parse, double tuple_fraction)
        List       *tlist = parse->targetList;
        Plan       *result_plan;
        List       *current_pathkeys;
-       List       *group_pathkeys;
        List       *sort_pathkeys;
-       AttrNumber *groupColIdx = NULL;
 
        if (parse->setOperations)
        {
+               List   *set_sortclauses;
+
                /*
                 * Construct the plan for set operations.  The result will not
                 * need any work except perhaps a top-level sort and/or LIMIT.
                 */
-               result_plan = plan_set_operations(parse);
+               result_plan = plan_set_operations(parse,
+                                                                                 &set_sortclauses);
+
+               /*
+                * Calculate pathkeys representing the sort order (if any) of the
+                * set operation's result.  We have to do this before overwriting
+                * the sort key information...
+                */
+               current_pathkeys = make_pathkeys_for_sortclauses(set_sortclauses,
+                                                                                                       result_plan->targetlist);
+               current_pathkeys = canonicalize_pathkeys(parse, current_pathkeys);
 
                /*
                 * We should not need to call preprocess_targetlist, since we must
@@ -717,33 +615,37 @@ grouping_planner(Query *parse, double tuple_fraction)
                tlist = postprocess_setop_tlist(result_plan->targetlist, tlist);
 
                /*
-                * Can't handle FOR UPDATE here (parser should have checked already,
-                * but let's make sure).
+                * Can't handle FOR UPDATE here (parser should have checked
+                * already, but let's make sure).
                 */
                if (parse->rowMarks)
-                       elog(ERROR, "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT");
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                        errmsg("SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT")));
 
                /*
-                * We set current_pathkeys NIL indicating we do not know sort
-                * order.  This is correct when the top set operation is UNION ALL,
-                * since the appended-together results are unsorted even if the
-                * subplans were sorted.  For other set operations we could be
-                * smarter --- room for future improvement!
+                * Calculate pathkeys that represent result ordering requirements
                 */
-               current_pathkeys = NIL;
-
-               /*
-                * Calculate pathkeys that represent grouping/ordering
-                * requirements (grouping should always be null, but...)
-                */
-               group_pathkeys = make_pathkeys_for_sortclauses(parse->groupClause,
-                                                                                                          tlist);
                sort_pathkeys = make_pathkeys_for_sortclauses(parse->sortClause,
                                                                                                          tlist);
+               sort_pathkeys = canonicalize_pathkeys(parse, sort_pathkeys);
        }
        else
        {
+               /* No set operations, do regular planning */
                List       *sub_tlist;
+               List       *group_pathkeys;
+               AttrNumber *groupColIdx = NULL;
+               bool            need_tlist_eval = true;
+               QualCost        tlist_cost;
+               double          sub_tuple_fraction;
+               Path       *cheapest_path;
+               Path       *sorted_path;
+               double          dNumGroups = 0;
+               long            numGroups = 0;
+               int                     numAggs = 0;
+               int                     numGroupCols = list_length(parse->groupClause);
+               bool            use_hashed_grouping = false;
 
                /* Preprocess targetlist in case we are inside an INSERT/UPDATE. */
                tlist = preprocess_targetlist(tlist,
@@ -753,36 +655,42 @@ grouping_planner(Query *parse, double tuple_fraction)
 
                /*
                 * Add TID targets for rels selected FOR UPDATE (should this be
-                * done in preprocess_targetlist?).  The executor uses the TID
-                * to know which rows to lock, much as for UPDATE or DELETE.
+                * done in preprocess_targetlist?).  The executor uses the TID to
+                * know which rows to lock, much as for UPDATE or DELETE.
                 */
                if (parse->rowMarks)
                {
-                       List       *l;
+                       ListCell   *l;
 
                        /*
-                        * We've got trouble if the FOR UPDATE appears inside grouping,
-                        * since grouping renders a reference to individual tuple CTIDs
-                        * invalid.  This is also checked at parse time, but that's
-                        * insufficient because of rule substitution, query pullup, etc.
+                        * We've got trouble if the FOR UPDATE appears inside
+                        * grouping, since grouping renders a reference to individual
+                        * tuple CTIDs invalid.  This is also checked at parse time,
+                        * but that's insufficient because of rule substitution, query
+                        * pullup, etc.
                         */
                        CheckSelectForUpdate(parse);
 
-                       /* Currently the executor only supports FOR UPDATE at top level */
+                       /*
+                        * Currently the executor only supports FOR UPDATE at top
+                        * level
+                        */
                        if (PlannerQueryLevel > 1)
-                               elog(ERROR, "SELECT FOR UPDATE is not allowed in subselects");
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                                errmsg("SELECT FOR UPDATE is not allowed in subqueries")));
 
                        foreach(l, parse->rowMarks)
                        {
-                               Index           rti = lfirsti(l);
+                               Index           rti = lfirst_int(l);
                                char       *resname;
                                Resdom     *resdom;
                                Var                *var;
                                TargetEntry *ctid;
 
                                resname = (char *) palloc(32);
-                               sprintf(resname, "ctid%u", rti);
-                               resdom = makeResdom(length(tlist) + 1,
+                               snprintf(resname, 32, "ctid%u", rti);
+                               resdom = makeResdom(list_length(tlist) + 1,
                                                                        TIDOID,
                                                                        -1,
                                                                        resname,
@@ -794,7 +702,7 @@ grouping_planner(Query *parse, double tuple_fraction)
                                                          -1,
                                                          0);
 
-                               ctid = makeTargetEntry(resdom, (Node *) var);
+                               ctid = makeTargetEntry(resdom, (Expr *) var);
                                tlist = lappend(tlist, ctid);
                        }
                }
@@ -803,7 +711,8 @@ grouping_planner(Query *parse, double tuple_fraction)
                 * Generate appropriate target list for subplan; may be different
                 * from tlist if grouping or aggregation is needed.
                 */
-               sub_tlist = make_subplanTargetList(parse, tlist, &groupColIdx);
+               sub_tlist = make_subplanTargetList(parse, tlist,
+                                                                                &groupColIdx, &need_tlist_eval);
 
                /*
                 * Calculate pathkeys that represent grouping/ordering
@@ -814,6 +723,21 @@ grouping_planner(Query *parse, double tuple_fraction)
                sort_pathkeys = make_pathkeys_for_sortclauses(parse->sortClause,
                                                                                                          tlist);
 
+               /*
+                * Will need actual number of aggregates for estimating costs.
+                *
+                * Note: we do not attempt to detect duplicate aggregates here; a
+                * somewhat-overestimated count is okay for our present purposes.
+                *
+                * Note: think not that we can turn off hasAggs if we find no aggs.
+                * It is possible for constant-expression simplification to remove
+                * all explicit references to aggs, but we still have to follow the
+                * aggregate semantics (eg, producing only one output row).
+                */
+               if (parse->hasAggs)
+                       numAggs = count_agg_clause((Node *) tlist) +
+                               count_agg_clause(parse->havingQual);
+
                /*
                 * Figure out whether we need a sorted result from query_planner.
                 *
@@ -833,86 +757,115 @@ grouping_planner(Query *parse, double tuple_fraction)
                        parse->query_pathkeys = NIL;
 
                /*
-                * Figure out whether we expect to retrieve all the tuples that
-                * the plan can generate, or to stop early due to a LIMIT or other
-                * factors.  If the caller passed a value >= 0, believe that
-                * value, else do our own examination of the query context.
+                * Adjust tuple_fraction if we see that we are going to apply
+                * limiting/grouping/aggregation/etc.  This is not overridable by
+                * the caller, since it reflects plan actions that this routine
+                * will certainly take, not assumptions about context.
                 */
-               if (tuple_fraction < 0.0)
+               if (parse->limitCount != NULL)
                {
-                       /* Initial assumption is we need all the tuples */
-                       tuple_fraction = 0.0;
-
                        /*
-                        * Check for a LIMIT clause.
+                        * A LIMIT clause limits the absolute number of tuples
+                        * returned. However, if it's not a constant LIMIT then we
+                        * have to punt; for lack of a better idea, assume 10% of the
+                        * plan's result is wanted.
                         */
-                       if (parse->limitCount != NULL)
+                       double          limit_fraction = 0.0;
+
+                       if (IsA(parse->limitCount, Const))
                        {
-                               if (IsA(parse->limitCount, Const))
-                               {
-                                       Const      *limitc = (Const *) parse->limitCount;
-                                       int32           count = DatumGetInt32(limitc->constvalue);
+                               Const      *limitc = (Const *) parse->limitCount;
+                               int32           count = DatumGetInt32(limitc->constvalue);
 
-                                       /*
-                                        * A NULL-constant LIMIT represents "LIMIT ALL",
-                                        * which we treat the same as no limit (ie,
-                                        * expect to retrieve all the tuples).
-                                        */
-                                       if (!limitc->constisnull && count > 0)
+                               /*
+                                * A NULL-constant LIMIT represents "LIMIT ALL", which we
+                                * treat the same as no limit (ie, expect to retrieve all
+                                * the tuples).
+                                */
+                               if (!limitc->constisnull && count > 0)
+                               {
+                                       limit_fraction = (double) count;
+                                       /* We must also consider the OFFSET, if present */
+                                       if (parse->limitOffset != NULL)
                                        {
-                                               tuple_fraction = (double) count;
-                                               /* We must also consider the OFFSET, if present */
-                                               if (parse->limitOffset != NULL)
+                                               if (IsA(parse->limitOffset, Const))
                                                {
-                                                       if (IsA(parse->limitOffset, Const))
-                                                       {
-                                                               int32           offset;
-
-                                                               limitc = (Const *) parse->limitOffset;
-                                                               offset = DatumGetInt32(limitc->constvalue);
-                                                               if (!limitc->constisnull && offset > 0)
-                                                                       tuple_fraction += (double) offset;
-                                                       }
-                                                       else
-                                                       {
-                                                               /* It's an expression ... punt ... */
-                                                               tuple_fraction = 0.10;
-                                                       }
+                                                       int32           offset;
+
+                                                       limitc = (Const *) parse->limitOffset;
+                                                       offset = DatumGetInt32(limitc->constvalue);
+                                                       if (!limitc->constisnull && offset > 0)
+                                                               limit_fraction += (double) offset;
                                                }
+                                               else
+                                               {
+                                                       /* OFFSET is an expression ... punt ... */
+                                                       limit_fraction = 0.10;
+                                               }
+                                       }
+                               }
+                       }
+                       else
+                       {
+                               /* LIMIT is an expression ... punt ... */
+                               limit_fraction = 0.10;
+                       }
+
+                       if (limit_fraction > 0.0)
+                       {
+                               /*
+                                * If we have absolute limits from both caller and LIMIT,
+                                * use the smaller value; if one is fractional and the
+                                * other absolute, treat the fraction as a fraction of the
+                                * absolute value; else we can multiply the two fractions
+                                * together.
+                                */
+                               if (tuple_fraction >= 1.0)
+                               {
+                                       if (limit_fraction >= 1.0)
+                                       {
+                                               /* both absolute */
+                                               tuple_fraction = Min(tuple_fraction, limit_fraction);
+                                       }
+                                       else
+                                       {
+                                               /* caller absolute, limit fractional */
+                                               tuple_fraction *= limit_fraction;
+                                               if (tuple_fraction < 1.0)
+                                                       tuple_fraction = 1.0;
+                                       }
+                               }
+                               else if (tuple_fraction > 0.0)
+                               {
+                                       if (limit_fraction >= 1.0)
+                                       {
+                                               /* caller fractional, limit absolute */
+                                               tuple_fraction *= limit_fraction;
+                                               if (tuple_fraction < 1.0)
+                                                       tuple_fraction = 1.0;
+                                       }
+                                       else
+                                       {
+                                               /* both fractional */
+                                               tuple_fraction *= limit_fraction;
                                        }
                                }
                                else
                                {
-                                       /*
-                                        * COUNT is an expression ... don't know exactly what the
-                                        * limit will be, but for lack of a better idea assume
-                                        * 10% of the plan's result is wanted.
-                                        */
-                                       tuple_fraction = 0.10;
+                                       /* no info from caller, just use limit */
+                                       tuple_fraction = limit_fraction;
                                }
                        }
-
-                       /*
-                        * If no LIMIT, check for retrieve-into-portal, ie DECLARE CURSOR.
-                        *
-                        * We have no real idea how many tuples the user will ultimately
-                        * FETCH from a cursor, but it seems a good bet that he
-                        * doesn't want 'em all.  Optimize for 10% retrieval (you
-                        * gotta better number?)
-                        */
-                       else if (parse->isPortal)
-                               tuple_fraction = 0.10;
                }
 
                /*
-                * Adjust tuple_fraction if we see that we are going to apply
-                * grouping/aggregation/etc.  This is not overridable by the
-                * caller, since it reflects plan actions that this routine will
-                * certainly take, not assumptions about context.
+                * With grouping or aggregation, the tuple fraction to pass to
+                * query_planner() may be different from what it is at top level.
                 */
+               sub_tuple_fraction = tuple_fraction;
+
                if (parse->groupClause)
                {
-
                        /*
                         * In GROUP BY mode, we have the little problem that we don't
                         * really know how many input tuples will be needed to make a
@@ -924,8 +877,8 @@ grouping_planner(Query *parse, double tuple_fraction)
                         * amounts to assuming that all the groups are about the same
                         * size).
                         */
-                       if (tuple_fraction >= 1.0)
-                               tuple_fraction = 0.25;
+                       if (sub_tuple_fraction >= 1.0)
+                               sub_tuple_fraction = 0.25;
 
                        /*
                         * If both GROUP BY and ORDER BY are specified, we will need
@@ -937,118 +890,384 @@ grouping_planner(Query *parse, double tuple_fraction)
                        if (parse->groupClause && parse->sortClause &&
                                !noncanonical_pathkeys_contained_in(sort_pathkeys,
                                                                                                        group_pathkeys))
-                               tuple_fraction = 0.0;
+                               sub_tuple_fraction = 0.0;
                }
                else if (parse->hasAggs)
                {
-
                        /*
                         * Ungrouped aggregate will certainly want all the input
                         * tuples.
                         */
-                       tuple_fraction = 0.0;
+                       sub_tuple_fraction = 0.0;
                }
                else if (parse->distinctClause)
                {
-
                        /*
                         * SELECT DISTINCT, like GROUP, will absorb an unpredictable
                         * number of input tuples per output tuple.  Handle the same
                         * way.
                         */
-                       if (tuple_fraction >= 1.0)
-                               tuple_fraction = 0.25;
+                       if (sub_tuple_fraction >= 1.0)
+                               sub_tuple_fraction = 0.25;
                }
 
-               /* Generate the basic plan for this Query */
-               result_plan = query_planner(parse,
-                                                                       sub_tlist,
-                                                                       tuple_fraction);
+               /*
+                * Generate the best unsorted and presorted paths for this Query
+                * (but note there may not be any presorted path).
+                */
+               query_planner(parse, sub_tlist, sub_tuple_fraction,
+                                         &cheapest_path, &sorted_path);
 
                /*
-                * query_planner returns actual sort order (which is not
-                * necessarily what we requested) in query_pathkeys.
+                * We couldn't canonicalize group_pathkeys and sort_pathkeys
+                * before running query_planner(), so do it now.
                 */
-               current_pathkeys = parse->query_pathkeys;
-       }
+               group_pathkeys = canonicalize_pathkeys(parse, group_pathkeys);
+               sort_pathkeys = canonicalize_pathkeys(parse, sort_pathkeys);
 
-       /*
-        * We couldn't canonicalize group_pathkeys and sort_pathkeys before
-        * running query_planner(), so do it now.
-        */
-       group_pathkeys = canonicalize_pathkeys(parse, group_pathkeys);
-       sort_pathkeys = canonicalize_pathkeys(parse, sort_pathkeys);
+               /*
+                * Consider whether we might want to use hashed grouping.
+                */
+               if (parse->groupClause)
+               {
+                       List       *groupExprs;
+                       double          cheapest_path_rows;
+                       int                     cheapest_path_width;
 
-       /*
-        * If we have a GROUP BY clause, insert a group node (plus the
-        * appropriate sort node, if necessary).
-        */
-       if (parse->groupClause)
-       {
-               bool            tuplePerGroup;
-               List       *group_tlist;
-               bool            is_sorted;
+                       /*
+                        * Beware in this section of the possibility that
+                        * cheapest_path->parent is NULL.  This could happen if user
+                        * does something silly like SELECT 'foo' GROUP BY 1;
+                        */
+                       if (cheapest_path->parent)
+                       {
+                               cheapest_path_rows = cheapest_path->parent->rows;
+                               cheapest_path_width = cheapest_path->parent->width;
+                       }
+                       else
+                       {
+                               cheapest_path_rows = 1; /* assume non-set result */
+                               cheapest_path_width = 100;              /* arbitrary */
+                       }
+
+                       /*
+                        * Always estimate the number of groups.  We can't do this
+                        * until after running query_planner(), either.
+                        */
+                       groupExprs = get_sortgrouplist_exprs(parse->groupClause,
+                                                                                                parse->targetList);
+                       dNumGroups = estimate_num_groups(parse,
+                                                                                        groupExprs,
+                                                                                        cheapest_path_rows);
+                       /* Also want it as a long int --- but 'ware overflow! */
+                       numGroups = (long) Min(dNumGroups, (double) LONG_MAX);
+
+                       /*
+                        * Check can't-do-it conditions, including whether the
+                        * grouping operators are hashjoinable.
+                        *
+                        * Executor doesn't support hashed aggregation with DISTINCT
+                        * aggregates.  (Doing so would imply storing *all* the input
+                        * values in the hash table, which seems like a certain
+                        * loser.)
+                        */
+                       if (!enable_hashagg || !hash_safe_grouping(parse))
+                               use_hashed_grouping = false;
+                       else if (parse->hasAggs &&
+                                        (contain_distinct_agg_clause((Node *) tlist) ||
+                                         contain_distinct_agg_clause(parse->havingQual)))
+                               use_hashed_grouping = false;
+                       else
+                       {
+                               /*
+                                * Use hashed grouping if (a) we think we can fit the
+                                * hashtable into work_mem, *and* (b) the estimated cost is
+                                * no more than doing it the other way.  While avoiding
+                                * the need for sorted input is usually a win, the fact
+                                * that the output won't be sorted may be a loss; so we
+                                * need to do an actual cost comparison.
+                                *
+                                * In most cases we have no good way to estimate the size of
+                                * the transition value needed by an aggregate;
+                                * arbitrarily assume it is 100 bytes.  Also set the
+                                * overhead per hashtable entry at 64 bytes.
+                                */
+                               int                     hashentrysize = cheapest_path_width + 64 + numAggs * 100;
+
+                               if (hashentrysize * dNumGroups <= work_mem * 1024L)
+                               {
+                                       /*
+                                        * Okay, do the cost comparison.  We need to consider
+                                        * cheapest_path + hashagg [+ final sort] versus
+                                        * either cheapest_path [+ sort] + group or agg [+
+                                        * final sort] or presorted_path + group or agg [+
+                                        * final sort] where brackets indicate a step that may
+                                        * not be needed. We assume query_planner() will have
+                                        * returned a presorted path only if it's a winner
+                                        * compared to cheapest_path for this purpose.
+                                        *
+                                        * These path variables are dummies that just hold cost
+                                        * fields; we don't make actual Paths for these steps.
+                                        */
+                                       Path            hashed_p;
+                                       Path            sorted_p;
+
+                                       cost_agg(&hashed_p, parse,
+                                                        AGG_HASHED, numAggs,
+                                                        numGroupCols, dNumGroups,
+                                                        cheapest_path->startup_cost,
+                                                        cheapest_path->total_cost,
+                                                        cheapest_path_rows);
+                                       /* Result of hashed agg is always unsorted */
+                                       if (sort_pathkeys)
+                                               cost_sort(&hashed_p, parse, sort_pathkeys,
+                                                                 hashed_p.total_cost,
+                                                                 dNumGroups,
+                                                                 cheapest_path_width);
+
+                                       if (sorted_path)
+                                       {
+                                               sorted_p.startup_cost = sorted_path->startup_cost;
+                                               sorted_p.total_cost = sorted_path->total_cost;
+                                               current_pathkeys = sorted_path->pathkeys;
+                                       }
+                                       else
+                                       {
+                                               sorted_p.startup_cost = cheapest_path->startup_cost;
+                                               sorted_p.total_cost = cheapest_path->total_cost;
+                                               current_pathkeys = cheapest_path->pathkeys;
+                                       }
+                                       if (!pathkeys_contained_in(group_pathkeys,
+                                                                                          current_pathkeys))
+                                       {
+                                               cost_sort(&sorted_p, parse, group_pathkeys,
+                                                                 sorted_p.total_cost,
+                                                                 cheapest_path_rows,
+                                                                 cheapest_path_width);
+                                               current_pathkeys = group_pathkeys;
+                                       }
+                                       if (parse->hasAggs)
+                                               cost_agg(&sorted_p, parse,
+                                                                AGG_SORTED, numAggs,
+                                                                numGroupCols, dNumGroups,
+                                                                sorted_p.startup_cost,
+                                                                sorted_p.total_cost,
+                                                                cheapest_path_rows);
+                                       else
+                                               cost_group(&sorted_p, parse,
+                                                                  numGroupCols, dNumGroups,
+                                                                  sorted_p.startup_cost,
+                                                                  sorted_p.total_cost,
+                                                                  cheapest_path_rows);
+                                       /* The Agg or Group node will preserve ordering */
+                                       if (sort_pathkeys &&
+                                               !pathkeys_contained_in(sort_pathkeys,
+                                                                                          current_pathkeys))
+                                       {
+                                               cost_sort(&sorted_p, parse, sort_pathkeys,
+                                                                 sorted_p.total_cost,
+                                                                 dNumGroups,
+                                                                 cheapest_path_width);
+                                       }
+
+                                       /*
+                                        * Now make the decision using the top-level tuple
+                                        * fraction.  First we have to convert an absolute
+                                        * count (LIMIT) into fractional form.
+                                        */
+                                       if (tuple_fraction >= 1.0)
+                                               tuple_fraction /= dNumGroups;
+
+                                       if (compare_fractional_path_costs(&hashed_p, &sorted_p,
+                                                                                                         tuple_fraction) < 0)
+                                       {
+                                               /* Hashed is cheaper, so use it */
+                                               use_hashed_grouping = true;
+                                       }
+                               }
+                       }
+               }
 
                /*
-                * Decide whether how many tuples per group the Group node needs
-                * to return. (Needs only one tuple per group if no aggregate is
-                * present. Otherwise, need every tuple from the group to do the
-                * aggregation.)  Note tuplePerGroup is named backwards :-(
+                * Select the best path and create a plan to execute it.
+                *
+                * If we are doing hashed grouping, we will always read all the input
+                * tuples, so use the cheapest-total path.      Otherwise, trust
+                * query_planner's decision about which to use.
                 */
-               tuplePerGroup = parse->hasAggs;
+               if (sorted_path && !use_hashed_grouping)
+               {
+                       result_plan = create_plan(parse, sorted_path);
+                       current_pathkeys = sorted_path->pathkeys;
+               }
+               else
+               {
+                       result_plan = create_plan(parse, cheapest_path);
+                       current_pathkeys = cheapest_path->pathkeys;
+               }
 
                /*
-                * If there are aggregates then the Group node should just return
-                * the same set of vars as the subplan did (but we can exclude any
-                * GROUP BY expressions).  If there are no aggregates then the
-                * Group node had better compute the final tlist.
+                * create_plan() returns a plan with just a "flat" tlist of
+                * required Vars.  Usually we need to insert the sub_tlist as the
+                * tlist of the top plan node.  However, we can skip that if we
+                * determined that whatever query_planner chose to return will be
+                * good enough.
                 */
-               if (parse->hasAggs)
-                       group_tlist = flatten_tlist(result_plan->targetlist);
+               if (need_tlist_eval)
+               {
+                       /*
+                        * If the top-level plan node is one that cannot do expression
+                        * evaluation, we must insert a Result node to project the
+                        * desired tlist.
+                        */
+                       if (!is_projection_capable_plan(result_plan))
+                       {
+                               result_plan = (Plan *) make_result(sub_tlist, NULL,
+                                                                                                  result_plan);
+                       }
+                       else
+                       {
+                               /*
+                                * Otherwise, just replace the subplan's flat tlist with
+                                * the desired tlist.
+                                */
+                               result_plan->targetlist = sub_tlist;
+                       }
+
+                       /*
+                        * Also, account for the cost of evaluation of the sub_tlist.
+                        *
+                        * Up to now, we have only been dealing with "flat" tlists,
+                        * containing just Vars.  So their evaluation cost is zero
+                        * according to the model used by cost_qual_eval() (or if you
+                        * prefer, the cost is factored into cpu_tuple_cost).  Thus we
+                        * can avoid accounting for tlist cost throughout
+                        * query_planner() and subroutines.  But now we've inserted a
+                        * tlist that might contain actual operators, sub-selects, etc
+                        * --- so we'd better account for its cost.
+                        *
+                        * Below this point, any tlist eval cost for added-on nodes
+                        * should be accounted for as we create those nodes.
+                        * Presently, of the node types we can add on, only Agg and
+                        * Group project new tlists (the rest just copy their input
+                        * tuples) --- so make_agg() and make_group() are responsible
+                        * for computing the added cost.
+                        */
+                       cost_qual_eval(&tlist_cost, sub_tlist);
+                       result_plan->startup_cost += tlist_cost.startup;
+                       result_plan->total_cost += tlist_cost.startup +
+                               tlist_cost.per_tuple * result_plan->plan_rows;
+               }
                else
-                       group_tlist = tlist;
+               {
+                       /*
+                        * Since we're using query_planner's tlist and not the one
+                        * make_subplanTargetList calculated, we have to refigure any
+                        * grouping-column indexes make_subplanTargetList computed.
+                        */
+                       locate_grouping_columns(parse, tlist, result_plan->targetlist,
+                                                                       groupColIdx);
+               }
 
                /*
-                * Figure out whether the path result is already ordered the way
-                * we need it --- if so, no need for an explicit sort step.
+                * Insert AGG or GROUP node if needed, plus an explicit sort step
+                * if necessary.
+                *
+                * HAVING clause, if any, becomes qual of the Agg node
                 */
-               if (pathkeys_contained_in(group_pathkeys, current_pathkeys))
+               if (use_hashed_grouping)
                {
-                       is_sorted = true;       /* no sort needed now */
-                       /* current_pathkeys remains unchanged */
+                       /* Hashed aggregate plan --- no sort needed */
+                       result_plan = (Plan *) make_agg(parse,
+                                                                                       tlist,
+                                                                                       (List *) parse->havingQual,
+                                                                                       AGG_HASHED,
+                                                                                       numGroupCols,
+                                                                                       groupColIdx,
+                                                                                       numGroups,
+                                                                                       numAggs,
+                                                                                       result_plan);
+                       /* Hashed aggregation produces randomly-ordered results */
+                       current_pathkeys = NIL;
                }
-               else
+               else if (parse->hasAggs)
                {
+                       /* Plain aggregate plan --- sort if needed */
+                       AggStrategy aggstrategy;
+
+                       if (parse->groupClause)
+                       {
+                               if (!pathkeys_contained_in(group_pathkeys, current_pathkeys))
+                               {
+                                       result_plan = (Plan *)
+                                               make_sort_from_groupcols(parse,
+                                                                                                parse->groupClause,
+                                                                                                groupColIdx,
+                                                                                                result_plan);
+                                       current_pathkeys = group_pathkeys;
+                               }
+                               aggstrategy = AGG_SORTED;
 
+                               /*
+                                * The AGG node will not change the sort ordering of its
+                                * groups, so current_pathkeys describes the result too.
+                                */
+                       }
+                       else
+                       {
+                               aggstrategy = AGG_PLAIN;
+                               /* Result will be only one row anyway; no sort order */
+                               current_pathkeys = NIL;
+                       }
+
+                       result_plan = (Plan *) make_agg(parse,
+                                                                                       tlist,
+                                                                                       (List *) parse->havingQual,
+                                                                                       aggstrategy,
+                                                                                       numGroupCols,
+                                                                                       groupColIdx,
+                                                                                       numGroups,
+                                                                                       numAggs,
+                                                                                       result_plan);
+               }
+               else
+               {
                        /*
-                        * We will need to do an explicit sort by the GROUP BY clause.
-                        * make_groupplan will do the work, but set current_pathkeys
-                        * to indicate the resulting order.
+                        * If there are no Aggs, we shouldn't have any HAVING qual
+                        * anymore
                         */
-                       is_sorted = false;
-                       current_pathkeys = group_pathkeys;
-               }
+                       Assert(parse->havingQual == NULL);
 
-               result_plan = make_groupplan(group_tlist,
-                                                                        tuplePerGroup,
-                                                                        parse->groupClause,
-                                                                        groupColIdx,
-                                                                        is_sorted,
-                                                                        result_plan);
-       }
+                       /*
+                        * If we have a GROUP BY clause, insert a group node (plus the
+                        * appropriate sort node, if necessary).
+                        */
+                       if (parse->groupClause)
+                       {
+                               /*
+                                * Add an explicit sort if we couldn't make the path come
+                                * out the way the GROUP node needs it.
+                                */
+                               if (!pathkeys_contained_in(group_pathkeys, current_pathkeys))
+                               {
+                                       result_plan = (Plan *)
+                                               make_sort_from_groupcols(parse,
+                                                                                                parse->groupClause,
+                                                                                                groupColIdx,
+                                                                                                result_plan);
+                                       current_pathkeys = group_pathkeys;
+                               }
 
-       /*
-        * If aggregate is present, insert the Agg node
-        *
-        * HAVING clause, if any, becomes qual of the Agg node
-        */
-       if (parse->hasAggs)
-       {
-               result_plan = (Plan *) make_agg(tlist,
-                                                                               (List *) parse->havingQual,
-                                                                               result_plan);
-               /* Note: Agg does not affect any existing sort order of the tuples */
-       }
+                               result_plan = (Plan *) make_group(parse,
+                                                                                                 tlist,
+                                                                                                 numGroupCols,
+                                                                                                 groupColIdx,
+                                                                                                 dNumGroups,
+                                                                                                 result_plan);
+                               /* The Group node won't change sort ordering */
+                       }
+               }
+       }                                                       /* end of if (setOperations) */
 
        /*
         * If we were not able to make the plan come out in the right order,
@@ -1057,8 +1276,13 @@ grouping_planner(Query *parse, double tuple_fraction)
        if (parse->sortClause)
        {
                if (!pathkeys_contained_in(sort_pathkeys, current_pathkeys))
-                       result_plan = make_sortplan(tlist, result_plan,
-                                                                               parse->sortClause);
+               {
+                       result_plan = (Plan *)
+                               make_sort_from_sortclauses(parse,
+                                                                                  parse->sortClause,
+                                                                                  result_plan);
+                       current_pathkeys = sort_pathkeys;
+               }
        }
 
        /*
@@ -1066,8 +1290,24 @@ grouping_planner(Query *parse, double tuple_fraction)
         */
        if (parse->distinctClause)
        {
-               result_plan = (Plan *) make_unique(tlist, result_plan,
-                                                                                  parse->distinctClause);
+               result_plan = (Plan *) make_unique(result_plan, parse->distinctClause);
+
+               /*
+                * If there was grouping or aggregation, leave plan_rows as-is
+                * (ie, assume the result was already mostly unique).  If not,
+                * it's reasonable to assume the UNIQUE filter has effects
+                * comparable to GROUP BY.
+                */
+               if (!parse->groupClause && !parse->hasAggs)
+               {
+                       List       *distinctExprs;
+
+                       distinctExprs = get_sortgrouplist_exprs(parse->distinctClause,
+                                                                                                       parse->targetList);
+                       result_plan->plan_rows = estimate_num_groups(parse,
+                                                                                                                distinctExprs,
+                                                                                                result_plan->plan_rows);
+               }
        }
 
        /*
@@ -1075,19 +1315,54 @@ grouping_planner(Query *parse, double tuple_fraction)
         */
        if (parse->limitOffset || parse->limitCount)
        {
-               result_plan = (Plan *) make_limit(tlist, result_plan,
+               result_plan = (Plan *) make_limit(result_plan,
                                                                                  parse->limitOffset,
                                                                                  parse->limitCount);
        }
 
+       /*
+        * Return the actual output ordering in query_pathkeys for possible
+        * use by an outer query level.
+        */
+       parse->query_pathkeys = current_pathkeys;
+
        return result_plan;
 }
 
+/*
+ * hash_safe_grouping - are grouping operators hashable?
+ *
+ * We assume hashed aggregation will work if the datatype's equality operator
+ * is marked hashjoinable.
+ */
+static bool
+hash_safe_grouping(Query *parse)
+{
+       ListCell   *gl;
+
+       foreach(gl, parse->groupClause)
+       {
+               GroupClause *grpcl = (GroupClause *) lfirst(gl);
+               TargetEntry *tle = get_sortgroupclause_tle(grpcl, parse->targetList);
+               Operator        optup;
+               bool            oprcanhash;
+
+               optup = equality_oper(tle->resdom->restype, true);
+               if (!optup)
+                       return false;
+               oprcanhash = ((Form_pg_operator) GETSTRUCT(optup))->oprcanhash;
+               ReleaseSysCache(optup);
+               if (!oprcanhash)
+                       return false;
+       }
+       return true;
+}
+
 /*---------------
  * make_subplanTargetList
  *       Generate appropriate target list when grouping is required.
  *
- * When grouping_planner inserts Aggregate and/or Group plan nodes above
+ * When grouping_planner inserts Aggregate or Group plan nodes above
  * the result of query_planner, we typically want to pass a different
  * target list to query_planner than the outer plan nodes should have.
  * This routine generates the correct target list for the subplan.
@@ -1106,12 +1381,22 @@ grouping_planner(Query *parse, double tuple_fraction)
  * where the a+b target will be used by the Sort/Group steps, and the
  * other targets will be used for computing the final results. (In the
  * above example we could theoretically suppress the a and b targets and
- * use only a+b, but it's not really worth the trouble.)
+ * pass down only c,d,a+b, but it's not really worth the trouble to
+ * eliminate simple var references from the subplan.  We will avoid doing
+ * the extra computation to recompute a+b at the outer level; see
+ * replace_vars_with_subplan_refs() in setrefs.c.)
+ *
+ * If we are grouping or aggregating, *and* there are no non-Var grouping
+ * expressions, then the returned tlist is effectively dummy; we do not
+ * need to force it to be evaluated, because all the Vars it contains
+ * should be present in the output of query_planner anyway.
  *
  * 'parse' is the query being processed.
  * 'tlist' is the query's target list.
  * 'groupColIdx' receives an array of column numbers for the GROUP BY
- * expressions (if there are any) in the subplan's target list.
+ *                     expressions (if there are any) in the subplan's target list.
+ * 'need_tlist_eval' is set true if we really need to evaluate the
+ *                     result tlist.
  *
  * The result is the targetlist to be passed to the subplan.
  *---------------
@@ -1119,7 +1404,8 @@ grouping_planner(Query *parse, double tuple_fraction)
 static List *
 make_subplanTargetList(Query *parse,
                                           List *tlist,
-                                          AttrNumber **groupColIdx)
+                                          AttrNumber **groupColIdx,
+                                          bool *need_tlist_eval)
 {
        List       *sub_tlist;
        List       *extravars;
@@ -1131,8 +1417,11 @@ make_subplanTargetList(Query *parse,
         * If we're not grouping or aggregating, nothing to do here;
         * query_planner should receive the unmodified target list.
         */
-       if (!parse->hasAggs && !parse->groupClause && !parse->havingQual)
+       if (!parse->hasAggs && !parse->groupClause)
+       {
+               *need_tlist_eval = true;
                return tlist;
+       }
 
        /*
         * Otherwise, start with a "flattened" tlist (having just the vars
@@ -1142,7 +1431,8 @@ make_subplanTargetList(Query *parse,
        sub_tlist = flatten_tlist(tlist);
        extravars = pull_var_clause(parse->havingQual, false);
        sub_tlist = add_to_flat_tlist(sub_tlist, extravars);
-       freeList(extravars);
+       list_free(extravars);
+       *need_tlist_eval = false;       /* only eval if not flat tlist */
 
        /*
         * If grouping, create sub_tlist entries for all GROUP BY expressions
@@ -1150,22 +1440,22 @@ make_subplanTargetList(Query *parse,
         * already), and make an array showing where the group columns are in
         * the sub_tlist.
         */
-       numCols = length(parse->groupClause);
+       numCols = list_length(parse->groupClause);
        if (numCols > 0)
        {
                int                     keyno = 0;
                AttrNumber *grpColIdx;
-               List       *gl;
+               ListCell   *gl;
 
                grpColIdx = (AttrNumber *) palloc(sizeof(AttrNumber) * numCols);
                *groupColIdx = grpColIdx;
 
                foreach(gl, parse->groupClause)
                {
-                       GroupClause *grpcl = (GroupClause *) lfirst(gl);
-                       Node       *groupexpr = get_sortgroupclause_expr(grpcl, tlist);
-                       TargetEntry *te = NULL;
-                       List       *sl;
+                       GroupClause             *grpcl = (GroupClause *) lfirst(gl);
+                       Node                    *groupexpr = get_sortgroupclause_expr(grpcl, tlist);
+                       TargetEntry             *te = NULL;
+                       ListCell                *sl;
 
                        /* Find or make a matching sub_tlist entry */
                        foreach(sl, sub_tlist)
@@ -1176,13 +1466,14 @@ make_subplanTargetList(Query *parse,
                        }
                        if (!sl)
                        {
-                               te = makeTargetEntry(makeResdom(length(sub_tlist) + 1,
+                               te = makeTargetEntry(makeResdom(list_length(sub_tlist) + 1,
                                                                                                exprType(groupexpr),
                                                                                                exprTypmod(groupexpr),
                                                                                                NULL,
                                                                                                false),
-                                                                        groupexpr);
+                                                                        (Expr *) groupexpr);
                                sub_tlist = lappend(sub_tlist, te);
+                               *need_tlist_eval = true;                /* it's not flat anymore */
                        }
 
                        /* and save its resno */
@@ -1194,103 +1485,50 @@ make_subplanTargetList(Query *parse,
 }
 
 /*
- * make_groupplan
- *             Add a Group node for GROUP BY processing.
- *             If we couldn't make the subplan produce presorted output for grouping,
- *             first add an explicit Sort node.
- */
-static Plan *
-make_groupplan(List *group_tlist,
-                          bool tuplePerGroup,
-                          List *groupClause,
-                          AttrNumber *grpColIdx,
-                          bool is_presorted,
-                          Plan *subplan)
-{
-       int                     numCols = length(groupClause);
-
-       if (!is_presorted)
-       {
-
-               /*
-                * The Sort node always just takes a copy of the subplan's tlist
-                * plus ordering information.  (This might seem inefficient if the
-                * subplan contains complex GROUP BY expressions, but in fact Sort
-                * does not evaluate its targetlist --- it only outputs the same
-                * tuples in a new order.  So the expressions we might be copying
-                * are just dummies with no extra execution cost.)
-                */
-               List       *sort_tlist = new_unsorted_tlist(subplan->targetlist);
-               int                     keyno = 0;
-               List       *gl;
-
-               foreach(gl, groupClause)
-               {
-                       GroupClause *grpcl = (GroupClause *) lfirst(gl);
-                       TargetEntry *te = nth(grpColIdx[keyno] - 1, sort_tlist);
-                       Resdom     *resdom = te->resdom;
-
-                       /*
-                        * Check for the possibility of duplicate group-by clauses ---
-                        * the parser should have removed 'em, but the Sort executor
-                        * will get terribly confused if any get through!
-                        */
-                       if (resdom->reskey == 0)
-                       {
-                               /* OK, insert the ordering info needed by the executor. */
-                               resdom->reskey = ++keyno;
-                               resdom->reskeyop = get_opcode(grpcl->sortop);
-                       }
-               }
-
-               Assert(keyno > 0);
-
-               subplan = (Plan *) make_sort(sort_tlist, subplan, keyno);
-       }
-
-       return (Plan *) make_group(group_tlist, tuplePerGroup, numCols,
-                                                          grpColIdx, subplan);
-}
-
-/*
- * make_sortplan
- *       Add a Sort node to implement an explicit ORDER BY clause.
+ * locate_grouping_columns
+ *             Locate grouping columns in the tlist chosen by query_planner.
+ *
+ * This is only needed if we don't use the sub_tlist chosen by
+ * make_subplanTargetList.     We have to forget the column indexes found
+ * by that routine and re-locate the grouping vars in the real sub_tlist.
  */
-Plan *
-make_sortplan(List *tlist, Plan *plannode, List *sortcls)
+static void
+locate_grouping_columns(Query *parse,
+                                               List *tlist,
+                                               List *sub_tlist,
+                                               AttrNumber *groupColIdx)
 {
-       List       *sort_tlist;
-       List       *i;
        int                     keyno = 0;
+       ListCell   *gl;
 
        /*
-        * First make a copy of the tlist so that we don't corrupt the
-        * original.
+        * No work unless grouping.
         */
-       sort_tlist = new_unsorted_tlist(tlist);
+       if (!parse->groupClause)
+       {
+               Assert(groupColIdx == NULL);
+               return;
+       }
+       Assert(groupColIdx != NULL);
 
-       foreach(i, sortcls)
+       foreach(gl, parse->groupClause)
        {
-               SortClause *sortcl = (SortClause *) lfirst(i);
-               TargetEntry *tle = get_sortgroupclause_tle(sortcl, sort_tlist);
-               Resdom     *resdom = tle->resdom;
+               GroupClause             *grpcl = (GroupClause *) lfirst(gl);
+               Node                    *groupexpr = get_sortgroupclause_expr(grpcl, tlist);
+               TargetEntry             *te = NULL;
+               ListCell                *sl;
 
-               /*
-                * Check for the possibility of duplicate order-by clauses --- the
-                * parser should have removed 'em, but the executor will get
-                * terribly confused if any get through!
-                */
-               if (resdom->reskey == 0)
+               foreach(sl, sub_tlist)
                {
-                       /* OK, insert the ordering info needed by the executor. */
-                       resdom->reskey = ++keyno;
-                       resdom->reskeyop = get_opcode(sortcl->sortop);
+                       te = (TargetEntry *) lfirst(sl);
+                       if (equal(groupexpr, te->expr))
+                               break;
                }
-       }
-
-       Assert(keyno > 0);
+               if (!sl)
+                       elog(ERROR, "failed to locate grouping columns");
 
-       return (Plan *) make_sort(sort_tlist, plannode, keyno);
+               groupColIdx[keyno++] = te->resdom->resno;
+       }
 }
 
 /*
@@ -1300,13 +1538,14 @@ make_sortplan(List *tlist, Plan *plannode, List *sortcls)
  * We need to transpose sort key info from the orig_tlist into new_tlist.
  * NOTE: this would not be good enough if we supported resjunk sort keys
  * for results of set operations --- then, we'd need to project a whole
- * new tlist to evaluate the resjunk columns.  For now, just elog if we
+ * new tlist to evaluate the resjunk columns.  For now, just ereport if we
  * find any resjunk columns in orig_tlist.
  */
 static List *
 postprocess_setop_tlist(List *new_tlist, List *orig_tlist)
 {
-       List       *l;
+       ListCell   *l;
+       ListCell   *orig_tlist_item = list_head(orig_tlist);
 
        foreach(l, new_tlist)
        {
@@ -1317,16 +1556,16 @@ postprocess_setop_tlist(List *new_tlist, List *orig_tlist)
                if (new_tle->resdom->resjunk)
                        continue;
 
-               Assert(orig_tlist != NIL);
-               orig_tle = (TargetEntry *) lfirst(orig_tlist);
-               orig_tlist = lnext(orig_tlist);
-               if (orig_tle->resdom->resjunk)
-                       elog(ERROR, "postprocess_setop_tlist: resjunk output columns not implemented");
+               Assert(orig_tlist_item != NULL);
+               orig_tle = (TargetEntry *) lfirst(orig_tlist_item);
+               orig_tlist_item = lnext(orig_tlist_item);
+               if (orig_tle->resdom->resjunk)  /* should not happen */
+                       elog(ERROR, "resjunk output columns are not implemented");
                Assert(new_tle->resdom->resno == orig_tle->resdom->resno);
                Assert(new_tle->resdom->restype == orig_tle->resdom->restype);
                new_tle->resdom->ressortgroupref = orig_tle->resdom->ressortgroupref;
        }
-       if (orig_tlist != NIL)
-               elog(ERROR, "postprocess_setop_tlist: resjunk output columns not implemented");
+       if (orig_tlist_item != NULL)
+               elog(ERROR, "resjunk output columns are not implemented");
        return new_tlist;
 }