Commit3f48294

committed

ExecInitAgg: update aggstate->numaggs and ->numtrans earlier.

Functions hash_agg_entry_size() and build_hash_tables() make use ofthose values for memory size estimates.Because this change only affects memory estimates, don't backpatch.Discussion:https://postgr.es/m/7530bd8783b1a78d53a3c70383e38d8da0a5ffe5.camel%40j-davis.com

1 parent32ddfaf commit3f48294Copy full SHA for 3f48294

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -3379,8 +3379,8 @@ ExecInitAgg(Agg node, EState estate, int eflags)`
`3379`	`3379`	`max_aggno=Max(max_aggno,aggref->aggno);`
`3380`	`3380`	`max_transno=Max(max_transno,aggref->aggtransno);`
`3381`	`3381`	`}`
`3382`		`-numaggs=max_aggno+1;`
`3383`		`-numtrans=max_transno+1;`
	`3382`	`+aggstate->numaggs=numaggs=max_aggno+1;`
	`3383`	`+aggstate->numtrans=numtrans=max_transno+1;`
`3384`	`3384`
`3385`	`3385`	`/*`
`3386`	`3386`	`* For each phase, prepare grouping set data and fmgr lookup data for`
`@@ -3943,13 +3943,6 @@ ExecInitAgg(Agg node, EState estate, int eflags)`
`3943`	`3943`	`ReleaseSysCache(aggTuple);`
`3944`	`3944`	`}`
`3945`	`3945`
`3946`		`-/*`
`3947`		`- * Update aggstate->numaggs to be the number of unique aggregates found.`
`3948`		`- * Also set numstates to the number of unique transition states found.`
`3949`		`- */`
`3950`		`-aggstate->numaggs=numaggs;`
`3951`		`-aggstate->numtrans=numtrans;`
`3952`		`-`
`3953`	`3946`	`/*`
`3954`	`3947`	`* Last, check whether any more aggregates got added onto the node while`
`3955`	`3948`	`* we processed the expressions for the aggregate arguments (including not`

Comments

(0)