statistics: kill in time when to mergeGlobalTopN with partition (#45707…

…) (#45708) close #45706
pingcap · Aug 1, 2023 · 40cfe57 · 40cfe57
1 parent 3fe36d8
commit 40cfe57
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/statistics/cmsketch.go b/statistics/cmsketch.go
@@ -778,6 +778,9 @@ func MergePartTopN2GlobalTopN(loc *time.Location, version int, topNs []*TopN, n
 			// 1. Check the topN first.
 			// 2. If the topN doesn't contain the value corresponding to encodedVal. We should check the histogram.
 			for j := 0; j < partNum; j++ {
+				if atomic.LoadUint32(kiiled) == 1 {
+					return nil, nil, nil, errors.Trace(ErrQueryInterrupted)
+				}
 				if (j == i && version >= 2) || topNs[j].findTopN(val.Encoded) != -1 {
 					continue
 				}