Commit7d4395d

committed

Refactor hash_agg_entry_size().

Consolidate the calculations for hash table size estimation. This willhelp with upcoming Hash Aggregation work that will add additional callsites.

1 parentc02fdc9 commit7d4395dCopy full SHA for 7d4395d

File tree

+14

-33

lines changed

+14

-33

lines changed

Lines changed: 8 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1422,24 +1422,17 @@ find_hash_columns(AggState *aggstate)`
`1422`	`1422`	`}`
`1423`	`1423`
`1424`	`1424`	`/*`
`1425`		`- * Estimate per-hash-table-entry overhead for the planner.`
`1426`		`- *`
`1427`		`- * Note that the estimate does not include space for pass-by-reference`
`1428`		`- * transition data values, nor for the representative tuple of each group.`
`1429`		`- * Nor does this account of the target fill-factor and growth policy of the`
`1430`		`- * hash table.`
	`1425`	`+ * Estimate per-hash-table-entry overhead.`
`1431`	`1426`	`*/`
`1432`	`1427`	`Size`
`1433`		`-hash_agg_entry_size(intnumAggs)`
	`1428`	`+hash_agg_entry_size(intnumAggs,SizetupleWidth,SizetransitionSpace)`
`1434`	`1429`	`{`
`1435`		`-Sizeentrysize;`
`1436`		`-`
`1437`		`-/* This must match build_hash_table */`
`1438`		`-entrysize=sizeof(TupleHashEntryData)+`
`1439`		`-numAggs*sizeof(AggStatePerGroupData);`
`1440`		`-entrysize=MAXALIGN(entrysize);`
`1441`		`-`
`1442`		`-returnentrysize;`
	`1430`	`+return`
	`1431`	`+MAXALIGN(SizeofMinimalTupleHeader)+`
	`1432`	`+MAXALIGN(tupleWidth)+`
	`1433`	`+MAXALIGN(sizeof(TupleHashEntryData)+`
	`1434`	`+numAggs*sizeof(AggStatePerGroupData))+`
	`1435`	`+transitionSpace;`
`1443`	`1436`	`}`
`1444`	`1437`
`1445`	`1438`	`/*`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -4867,13 +4867,8 @@ create_distinct_paths(PlannerInfo *root,`
`4867`	`4867`	`allow_hash= false;/* policy-based decision not to hash */`
`4868`	`4868`	`else`
`4869`	`4869`	`{`
`4870`		`-Sizehashentrysize;`
`4871`		`-`
`4872`		`-/* Estimate per-hash-entry space at tuple width... */`
`4873`		`-hashentrysize=MAXALIGN(cheapest_input_path->pathtarget->width)+`
`4874`		`-MAXALIGN(SizeofMinimalTupleHeader);`
`4875`		`-/* plus the per-hash-entry overhead */`
`4876`		`-hashentrysize+=hash_agg_entry_size(0);`
	`4870`	`+Sizehashentrysize=hash_agg_entry_size(`
	`4871`	`+0,cheapest_input_path->pathtarget->width,0);`
`4877`	`4872`
`4878`	`4873`	`/* Allow hashing only if hashtable is predicted to fit in work_mem */`
`4879`	`4874`	`allow_hash= (hashentrysizenumDistinctRows <=work_mem1024L);`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -3526,16 +3526,8 @@ double`
`3526`	`3526`	`estimate_hashagg_tablesize(Pathpath,constAggClauseCostsagg_costs,`
`3527`	`3527`	`doubledNumGroups)`
`3528`	`3528`	`{`
`3529`		`-Sizehashentrysize;`
`3530`		`-`
`3531`		`-/* Estimate per-hash-entry space at tuple width... */`
`3532`		`-hashentrysize=MAXALIGN(path->pathtarget->width)+`
`3533`		`-MAXALIGN(SizeofMinimalTupleHeader);`
`3534`		`-`
`3535`		`-/* plus space for pass-by-ref transition values... */`
`3536`		`-hashentrysize+=agg_costs->transitionSpace;`
`3537`		`-/* plus the per-hash-entry overhead */`
`3538`		`-hashentrysize+=hash_agg_entry_size(agg_costs->numAggs);`
	`3529`	`+Sizehashentrysize=hash_agg_entry_size(`
	`3530`	`+agg_costs->numAggs,path->pathtarget->width,agg_costs->transitionSpace);`
`3539`	`3531`
`3540`	`3532`	`/*`
`3541`	`3533`	`* Note that this disregards the effect of fill-factor and growth policy`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,7 @@ extern AggState ExecInitAgg(Agg node, EState *estate, int eflags);`
`309`	`309`	`externvoidExecEndAgg(AggState*node);`
`310`	`310`	`externvoidExecReScanAgg(AggState*node);`
`311`	`311`
`312`		`-externSizehash_agg_entry_size(intnumAggs);`
	`312`	`+externSizehash_agg_entry_size(intnumAggs,SizetupleWidth,`
	`313`	`+SizetransitionSpace);`
`313`	`314`
`314`	`315`	`#endif/* NODEAGG_H */`

Comments

(0)