From d54e0b7b6db018bb1e2dfb8f30957c83ed8c599c Mon Sep 17 00:00:00 2001
From: TatsuyaKawata <kawatatatsuya0913@gmail.com>
Date: Mon, 16 Nov 2026 21:57:24 +0900
Subject: [PATCH v1] Accumulate Agg parallel worker stats across rescans

When a Gather or Gather Merge node is rescanned, it starts a new set of
workers, which write their Agg stats into the same shared memory slots
as the previous workers.  ExecEndAgg() overwrote those values, so
EXPLAIN ANALYZE showed only the stats for the final scan.

Here we adjust ExecEndAgg() to accumulate the values over all rescans.
The in-memory batch is counted only once, so that the number of batches
stays at 1 when nothing spilled.
---
 src/backend/executor/nodeAgg.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 16c0692ed5e..cb3e8e01e03 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -4437,9 +4437,16 @@ ExecEndAgg(AggState *node)
 
 		Assert(ParallelWorkerNumber < node->shared_info->num_workers);
 		si = &node->shared_info->sinstrument[ParallelWorkerNumber];
-		si->hash_batches_used = node->hash_batches_used;
-		si->hash_disk_used = node->hash_disk_used;
-		si->hash_mem_peak = node->hash_mem_peak;
+
+		/*
+		 * Gather and GatherMerge spin up new workers on rescan, so accumulate
+		 * the values over all scans.  hash_batches_used is 1 if nothing
+		 * spilled, so count the in-memory batch only once.
+		 */
+		si->hash_batches_used = Max(si->hash_batches_used, 1) +
+			node->hash_batches_used - 1;
+		si->hash_disk_used = Max(si->hash_disk_used, node->hash_disk_used);
+		si->hash_mem_peak = Max(si->hash_mem_peak, node->hash_mem_peak);
 	}
 
 	/* Make sure we have closed any open tuplesorts */
-- 
2.34.1

