executor: fix an issue that index_lookup_hash_join incorrectly estimate memory usage. (pingcap#47795) (pingcap#47921)

ti-chi-bot · web-flow · commit 7eb094beaab0 · 2023-10-23T10:09:36.000Z
close pingcap#47788
diff --git a/executor/builder.go b/executor/builder.go
@@ -4228,7 +4228,7 @@ func buildKvRangesForIndexJoin(ctx sessionctx.Context, tableID, indexID int64, l
 		memTracker.Consume(int64(2 * cap(kvRanges[0].StartKey) * len(kvRanges)))
 	}
 	if len(tmpDatumRanges) != 0 && memTracker != nil {
-		memTracker.Consume(2 * int64(len(tmpDatumRanges)) * types.EstimatedMemUsage(tmpDatumRanges[0].LowVal, len(tmpDatumRanges)))
+		memTracker.Consume(2 * types.EstimatedMemUsage(tmpDatumRanges[0].LowVal, len(tmpDatumRanges)))
 	}
 	if cwc == nil {
 		sort.Slice(kvRanges, func(i, j int) bool {

Original file line number	Diff line number	Diff line change
`@@ -4228,7 +4228,7 @@ func buildKvRangesForIndexJoin(ctx sessionctx.Context, tableID, indexID int64, l`
`4228`	`4228`	`memTracker.Consume(int64(2 * cap(kvRanges[0].StartKey) * len(kvRanges)))`
`4229`	`4229`	`}`
`4230`	`4230`	`if len(tmpDatumRanges) != 0 && memTracker != nil {`
`4231`		`- memTracker.Consume(2 * int64(len(tmpDatumRanges)) * types.EstimatedMemUsage(tmpDatumRanges[0].LowVal, len(tmpDatumRanges)))`
	`4231`	`+ memTracker.Consume(2 * types.EstimatedMemUsage(tmpDatumRanges[0].LowVal, len(tmpDatumRanges)))`
`4232`	`4232`	`}`
`4233`	`4233`	`if cwc == nil {`
`4234`	`4234`	`sort.Slice(kvRanges, func(i, j int) bool {`