Commit0a2bc5d

committed

Move per-agg and per-trans duplicate finding to the planner.

This has the advantage that the cost estimates for aggregates can countthe number of calls to transition and final functions correctly.Bump catalog version, because views can contain Aggrefs.Reviewed-by: Andres FreundDiscussion:https://www.postgresql.org/message-id/b2e3536b-1dbc-8303-c97e-89cb0b4a9a48%40iki.fi

1 parente522024 commit0a2bc5dCopy full SHA for 0a2bc5d

File tree

+954

-746

lines changed

+954

-746

lines changed

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`#include"optimizer/pathnode.h"`
`33`	`33`	`#include"optimizer/paths.h"`
`34`	`34`	`#include"optimizer/planmain.h"`
	`35`	`+#include"optimizer/prep.h"`
`35`	`36`	`#include"optimizer/restrictinfo.h"`
`36`	`37`	`#include"optimizer/tlist.h"`
`37`	`38`	`#include"parser/parsetree.h"`
`@@ -2944,16 +2945,7 @@ estimate_path_cost_size(PlannerInfo *root,`
`2944`	`2945`	`MemSet(&aggcosts,0,sizeof(AggClauseCosts));`
`2945`	`2946`	`if (root->parse->hasAggs)`
`2946`	`2947`	`{`
`2947`		`-get_agg_clause_costs(root, (Node*)fpinfo->grouped_tlist,`
`2948`		`-AGGSPLIT_SIMPLE,&aggcosts);`
`2949`		`-`
`2950`		`-/*`
`2951`		`- * The cost of aggregates in the HAVING qual will be the same`
`2952`		`- * for each child as it is for the parent, so there's no need`
`2953`		`- * to use a translated version of havingQual.`
`2954`		`- */`
`2955`		`-get_agg_clause_costs(root, (Node*)root->parse->havingQual,`
`2956`		`-AGGSPLIT_SIMPLE,&aggcosts);`
	`2948`	`+get_agg_clause_costs(root,AGGSPLIT_SIMPLE,&aggcosts);`
`2957`	`2949`	`}`
`2958`	`2950`
`2959`	`2951`	`/* Get number of grouping columns and possible number of groups */`

Lines changed: 3 additions & 7 deletions

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`	`caseT_Aggref:`
`780`	`779`	`{`
`781`	`780`	`Aggrefaggref= (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`	`AggStateaggstate= (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`	`{`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1494,12 +1494,12 @@ ExecInterpExpr(ExprState state, ExprContext econtext, bool *isnull)`
`1494`	`1494`	`* Returns a Datum whose value is the precomputed aggregate value`
`1495`	`1495`	`* found in the given expression context.`
`1496`	`1496`	`*/`
`1497`		`-AggrefExprState*aggref=op->d.aggref.astate;`
	`1497`	`+intaggno=op->d.aggref.aggno;`
`1498`	`1498`
`1499`	`1499`	`Assert(econtext->ecxt_aggvalues!=NULL);`
`1500`	`1500`
`1501`		`-*op->resvalue=econtext->ecxt_aggvalues[aggref->aggno];`
`1502`		`-*op->resnull=econtext->ecxt_aggnulls[aggref->aggno];`
	`1501`	`+*op->resvalue=econtext->ecxt_aggvalues[aggno];`
	`1502`	`+*op->resnull=econtext->ecxt_aggnulls[aggno];`
`1503`	`1503`
`1504`	`1504`	`EEO_NEXT();`
`1505`	`1505`	`}`

Comments

(0)