Rename "hash_mem" local variable.

The term "hash_mem" will take on new significance when pending work to
add a new hash_mem_multiplier GUC is committed.  Rename a local variable
that happens to have been called hash_mem now to avoid confusion.

diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 8eb1732ca884984f877f8334512288609559692e..b79c845a6b739d606c63d1bc9b24a39c8155949f 100644 (file)
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -1896,7 +1896,7 @@ static void
 hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
 {
    Size        meta_mem;
-   Size        hash_mem;
+   Size        hashkey_mem;
    Size        buffer_mem;
    Size        total_mem;
 
@@ -1908,7 +1908,7 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
    meta_mem = MemoryContextMemAllocated(aggstate->hash_metacxt, true);
 
    /* memory for the group keys and transition states */
-   hash_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory, true);
+   hashkey_mem = MemoryContextMemAllocated(aggstate->hashcontext->ecxt_per_tuple_memory, true);
 
    /* memory for read/write tape buffers, if spilled */
    buffer_mem = npartitions * HASHAGG_WRITE_BUFFER_SIZE;
@@ -1916,7 +1916,7 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
        buffer_mem += HASHAGG_READ_BUFFER_SIZE;
 
    /* update peak mem */
-   total_mem = meta_mem + hash_mem + buffer_mem;
+   total_mem = meta_mem + hashkey_mem + buffer_mem;
    if (total_mem > aggstate->hash_mem_peak)
        aggstate->hash_mem_peak = total_mem;
 
@@ -1934,7 +1934,7 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
    {
        aggstate->hashentrysize =
            sizeof(TupleHashEntryData) +
-           (hash_mem / (double) aggstate->hash_ngroups_current);
+           (hashkey_mem / (double) aggstate->hash_ngroups_current);
    }
 }