Commit c49c74d1 authored by Peter Geoghegan's avatar Peter Geoghegan

Rename another "hash_mem" local variable.

Missed by my commit 564ce621.

Backpatch: 13-, where disk-based hash aggregation was introduced.
parent b1d79127
...@@ -1839,15 +1839,15 @@ hash_agg_check_limits(AggState *aggstate) ...@@ -1839,15 +1839,15 @@ hash_agg_check_limits(AggState *aggstate)
uint64 ngroups = aggstate->hash_ngroups_current; uint64 ngroups = aggstate->hash_ngroups_current;
Size meta_mem = MemoryContextMemAllocated(aggstate->hash_metacxt, Size meta_mem = MemoryContextMemAllocated(aggstate->hash_metacxt,
true); true);
Size hash_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory, Size hashkey_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory,
true); true);
/* /*
* Don't spill unless there's at least one group in the hash table so we * Don't spill unless there's at least one group in the hash table so we
* can be sure to make progress even in edge cases. * can be sure to make progress even in edge cases.
*/ */
if (aggstate->hash_ngroups_current > 0 && if (aggstate->hash_ngroups_current > 0 &&
(meta_mem + hash_mem > aggstate->hash_mem_limit || (meta_mem + hashkey_mem > aggstate->hash_mem_limit ||
ngroups > aggstate->hash_ngroups_limit)) ngroups > aggstate->hash_ngroups_limit))
{ {
hash_agg_enter_spill_mode(aggstate); hash_agg_enter_spill_mode(aggstate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment