Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cdd7bd6

Browse files
Rename another "hash_mem" local variable.
Missed by my commit 564ce621. Backpatch: 13-, where disk-based hash aggregation was introduced.
1 parent b6c15e7 commit cdd7bd6

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/backend/executor/nodeAgg.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,15 +1839,15 @@ hash_agg_check_limits(AggState *aggstate)
18391839
uint64 ngroups = aggstate->hash_ngroups_current;
18401840
Size meta_mem = MemoryContextMemAllocated(aggstate->hash_metacxt,
18411841
true);
1842-
Size hash_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory,
1843-
true);
1842+
Size hashkey_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory,
1843+
true);
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
*/
18491849
if (aggstate->hash_ngroups_current > 0 &&
1850-
(meta_mem + hash_mem > aggstate->hash_mem_limit ||
1850+
(meta_mem + hashkey_mem > aggstate->hash_mem_limit ||
18511851
ngroups > aggstate->hash_ngroups_limit))
18521852
{
18531853
hash_agg_enter_spill_mode(aggstate);
@@ -1898,7 +1898,7 @@ static void
18981898
hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
18991899
{
19001900
Size meta_mem;
1901-
Size hash_mem;
1901+
Size hashkey_mem;
19021902
Size buffer_mem;
19031903
Size total_mem;
19041904

@@ -1910,15 +1910,15 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
19101910
meta_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 */
19161916
buffer_mem = npartitions * HASHAGG_WRITE_BUFFER_SIZE;
19171917
if (from_tape)
19181918
buffer_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;
19221922
if (total_mem > aggstate->hash_mem_peak)
19231923
aggstate->hash_mem_peak = total_mem;
19241924

@@ -1936,7 +1936,7 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
19361936
{
19371937
aggstate->hashentrysize =
19381938
sizeof(TupleHashEntryData) +
1939-
(hash_mem / (double) aggstate->hash_ngroups_current);
1939+
(hashkey_mem / (double) aggstate->hash_ngroups_current);
19401940
}
19411941
}
19421942

0 commit comments

Comments
 (0)