postgres
diff --git a/‎contrib/postgres_fdw/postgres_fdw.c
+2-10 b/‎contrib/postgres_fdw/postgres_fdw.c
+2-10
diff --git a/‎src/backend/executor/execExpr.c
+3-7 b/‎src/backend/executor/execExpr.c
+3-7
diff --git a/‎src/backend/executor/execExprInterp.c
+3-3 b/‎src/backend/executor/execExprInterp.c
+3-3
@@ -32,6 +32,7 @@
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/planmain.h"
+#include "optimizer/prep.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/tlist.h"
 #include "parser/parsetree.h"
@@ -2944,16 +2945,7 @@ estimate_path_cost_size(PlannerInfo *root,
 			MemSet(&aggcosts, 0, sizeof(AggClauseCosts));
 			if (root->parse->hasAggs)
 			{
-				get_agg_clause_costs(root, (Node *) fpinfo->grouped_tlist,
-									 AGGSPLIT_SIMPLE, &aggcosts);
-
-				/*
-				 * The cost of aggregates in the HAVING qual will be the same
-				 * for each child as it is for the parent, so there's no need
-				 * to use a translated version of havingQual.
-				 */
-				get_agg_clause_costs(root, (Node *) root->parse->havingQual,
-									 AGGSPLIT_SIMPLE, &aggcosts);
+				get_agg_clause_costs(root, AGGSPLIT_SIMPLE, &aggcosts);
 			}
 
 			/* Get number of grouping columns and possible number of groups */
 
@@ -99,8 +99,7 @@ static void ExecBuildAggTransCall(ExprState *state, AggState *aggstate,
  * the same as the per-query context of the associated ExprContext.
  *
  * Any Aggref, WindowFunc, or SubPlan nodes found in the tree are added to
- * the lists of such nodes held by the parent PlanState (or more accurately,
- * the AggrefExprState etc. nodes created for them are added).
+ * the lists of such nodes held by the parent PlanState.
  *
  * Note: there is no ExecEndExpr function; we assume that any resource
  * cleanup needed will be handled by just releasing the memory context
@@ -779,18 +778,15 @@ ExecInitExprRec(Expr *node, ExprState *state,
 		case T_Aggref:
 			{
 				Aggref	   *aggref = (Aggref *) node;
-				AggrefExprState *astate = makeNode(AggrefExprState);
 
 				scratch.opcode = EEOP_AGGREF;
-				scratch.d.aggref.astate = astate;
-				astate->aggref = aggref;
+				scratch.d.aggref.aggno = aggref->aggno;
 
 				if (state->parent && IsA(state->parent, AggState))
 				{
 					AggState   *aggstate = (AggState *) state->parent;
 
-					aggstate->aggs = lappend(aggstate->aggs, astate);
-					aggstate->numaggs++;
+					aggstate->aggs = lappend(aggstate->aggs, aggref);
 				}
 				else
 				{
 
@@ -1494,12 +1494,12 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			 * Returns a Datum whose value is the precomputed aggregate value
 			 * found in the given expression context.
 			 */
-			AggrefExprState *aggref = op->d.aggref.astate;
+			int			aggno = op->d.aggref.aggno;
 
 			Assert(econtext->ecxt_aggvalues != NULL);
 
-			*op->resvalue = econtext->ecxt_aggvalues[aggref->aggno];
-			*op->resnull = econtext->ecxt_aggnulls[aggref->aggno];
+			*op->resvalue = econtext->ecxt_aggvalues[aggno];
+			*op->resnull = econtext->ecxt_aggnulls[aggno];
 
 			EEO_NEXT();
 		}
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,7 @@ static void ExecBuildAggTransCall(ExprState state, AggState aggstate,`
`99`	`99`	`* the same as the per-query context of the associated ExprContext.`
`100`	`100`	`*`
`101`	`101`	`* Any Aggref, WindowFunc, or SubPlan nodes found in the tree are added to`
`102`		`- * the lists of such nodes held by the parent PlanState (or more accurately,`
`103`		`- * the AggrefExprState etc. nodes created for them are added).`
	`102`	`+ * the lists of such nodes held by the parent PlanState.`
`104`	`103`	`*`
`105`	`104`	`* Note: there is no ExecEndExpr function; we assume that any resource`
`106`	`105`	`* cleanup needed will be handled by just releasing the memory context`
`@@ -779,18 +778,15 @@ ExecInitExprRec(Expr node, ExprState state,`
`779`	`778`	`case T_Aggref:`
`780`	`779`	`{`
`781`	`780`	`Aggref aggref = (Aggref ) node;`
`782`		`- AggrefExprState *astate = makeNode(AggrefExprState);`
`783`	`781`
`784`	`782`	`scratch.opcode = EEOP_AGGREF;`
`785`		`- scratch.d.aggref.astate = astate;`
`786`		`- astate->aggref = aggref;`
	`783`	`+ scratch.d.aggref.aggno = aggref->aggno;`
`787`	`784`
`788`	`785`	`if (state->parent && IsA(state->parent, AggState))`
`789`	`786`	`{`
`790`	`787`	`AggState aggstate = (AggState ) state->parent;`
`791`	`788`
`792`		`- aggstate->aggs = lappend(aggstate->aggs, astate);`
`793`		`- aggstate->numaggs++;`
	`789`	`+ aggstate->aggs = lappend(aggstate->aggs, aggref);`
`794`	`790`	`}`
`795`	`791`	`else`
`796`	`792`	`{`