Rename another "hash_mem" local variable.
authorPeter Geoghegan
Wed, 29 Jul 2020 00:59:16 +0000 (17:59 -0700)
committerPeter Geoghegan
Wed, 29 Jul 2020 00:59:16 +0000 (17:59 -0700)
Missed by my commit 564ce621.

Backpatch: 13-, where disk-based hash aggregation was introduced.

src/backend/executor/nodeAgg.c

index 7d7bfa945605be57e0dd89cd2c3f5f1d9c37e1aa..586509c50b27e9bc76af4a8a295b9ef9189c6be6 100644 (file)
@@ -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);