@@ -1839,15 +1839,15 @@ hash_agg_check_limits(AggState *aggstate)
18391839uint64 ngroups = aggstate -> hash_ngroups_current ;
18401840Size meta_mem = MemoryContextMemAllocated (aggstate -> hash_metacxt ,
18411841 true);
1842- Size hash_mem = MemoryContextMemAllocated (aggstate -> hashcontext -> ecxt_per_tuple_memory ,
1843-
1842+ Size hashkey_mem = MemoryContextMemAllocated (aggstate -> hashcontext -> ecxt_per_tuple_memory ,
1843+
18441844
18451845/*
18461846 * Don't spill unless there's at least one group in the hash table so we
18471847 * can be sure to make progress even in edge cases.
18481848 */
18491849if (aggstate -> hash_ngroups_current > 0 &&
1850- (meta_mem + hash_mem > aggstate -> hash_mem_limit ||
1850+ (meta_mem + hashkey_mem > aggstate -> hash_mem_limit ||
18511851ngroups > aggstate -> hash_ngroups_limit ))
18521852{
18531853hash_agg_enter_spill_mode (aggstate );
@@ -1898,7 +1898,7 @@ static void
18981898hash_agg_update_metrics (AggState * aggstate ,bool from_tape ,int npartitions )
18991899{
19001900Size meta_mem ;
1901- Size hash_mem ;
1901+ Size hashkey_mem ;
19021902Size buffer_mem ;
19031903Size total_mem ;
19041904
@@ -1910,15 +1910,15 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
19101910meta_mem = MemoryContextMemAllocated (aggstate -> hash_metacxt , true);
19111911
19121912/* memory for the group keys and transition states */
1913- hash_mem = MemoryContextMemAllocated (aggstate -> hashcontext -> ecxt_per_tuple_memory , true);
1913+ hashkey_mem = MemoryContextMemAllocated (aggstate -> hashcontext -> ecxt_per_tuple_memory , true);
19141914
19151915/* memory for read/write tape buffers, if spilled */
19161916buffer_mem = npartitions * HASHAGG_WRITE_BUFFER_SIZE ;
19171917if (from_tape )
19181918buffer_mem += HASHAGG_READ_BUFFER_SIZE ;
19191919
19201920/* update peak mem */
1921- total_mem = meta_mem + hash_mem + buffer_mem ;
1921+ total_mem = meta_mem + hashkey_mem + buffer_mem ;
19221922if (total_mem > aggstate -> hash_mem_peak )
19231923aggstate -> hash_mem_peak = total_mem ;
19241924
@@ -1936,7 +1936,7 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
19361936{
19371937aggstate -> hashentrysize =
19381938sizeof (TupleHashEntryData )+
1939- (hash_mem / (double )aggstate -> hash_ngroups_current );
1939+ (hashkey_mem / (double )aggstate -> hash_ngroups_current );
19401940}
19411941}
19421942