executor: fix wrong statistic from memory tracker in hash agg (#60653) (#61228)

ti-chi-bot · web-flow · commit d109bf043a80 · 2025-06-23T09:43:54.000Z
close #58822
diff --git a/pkg/executor/aggregate/agg_hash_executor.go b/pkg/executor/aggregate/agg_hash_executor.go
@@ -480,6 +480,7 @@ func (e *HashAggExec) fetchChildData(ctx context.Context, waitGroup *sync.WaitGr
 		}
 		waitGroup.Done()
 	}()
+
 	for {
 		select {
 		case <-e.finishCh:
diff --git a/pkg/executor/aggregate/agg_hash_partial_worker.go b/pkg/executor/aggregate/agg_hash_partial_worker.go
@@ -100,10 +100,7 @@ func (w *HashAggPartialWorker) fetchChunkAndProcess(ctx sessionctx.Context, hasE
 
 	w.intestDuringPartialWorkerRun()
 
-	sizeBefore := w.chk.MemoryUsage()
 	w.chk.SwapColumns(chk)
-	w.memTracker.Consume(w.chk.MemoryUsage() - sizeBefore)
-
 	w.giveBackCh <- &HashAggInput{
 		chk:        chk,
 		giveBackCh: w.inputCh,

Original file line number	Diff line number	Diff line change
`@@ -480,6 +480,7 @@ func (e HashAggExec) fetchChildData(ctx context.Context, waitGroup sync.WaitGr`
`480`	`480`	`}`
`481`	`481`	`waitGroup.Done()`
`482`	`482`	`}()`
	`483`	`+`
`483`	`484`	`for {`
`484`	`485`	`select {`
`485`	`486`	`case <-e.finishCh:`