aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeAgg.c
diff options
context:
space:
mode:
authorPeter Geoghegan <pg@bowt.ie>2020-07-28 17:59:16 -0700
committerPeter Geoghegan <pg@bowt.ie>2020-07-28 17:59:16 -0700
commitc49c74d19241b1fc8da6c215ebb40fd6b71c1bff (patch)
treed57d3ca55e4f9b744e0bad34f229dbefcc936345 /src/backend/executor/nodeAgg.c
parentb1d79127ed875f04720d2c4677a75f43528bfe08 (diff)
downloadpostgresql-c49c74d19241b1fc8da6c215ebb40fd6b71c1bff.tar.gz
postgresql-c49c74d19241b1fc8da6c215ebb40fd6b71c1bff.zip
Rename another "hash_mem" local variable.
Missed by my commit 564ce621. Backpatch: 13-, where disk-based hash aggregation was introduced.
Diffstat (limited to 'src/backend/executor/nodeAgg.c')
-rw-r--r--src/backend/executor/nodeAgg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 7d7bfa94560..586509c50b2 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -1839,15 +1839,15 @@ hash_agg_check_limits(AggState *aggstate)
uint64 ngroups = aggstate->hash_ngroups_current;
Size meta_mem = MemoryContextMemAllocated(aggstate->hash_metacxt,
true);
- Size hash_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory,
- true);
+ Size hashkey_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory,
+ true);
/*
* 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.
*/
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))
{
hash_agg_enter_spill_mode(aggstate);