*: avoid sort

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
pingcap · Aug 19, 2023 · 22c7f07 · 22c7f07
1 parent 4c69ebb
commit 22c7f07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/statistics/cmsketch.go b/statistics/cmsketch.go
@@ -934,12 +934,7 @@ func GetMergedTopNFromSortedSlice(sorted []TopNMeta, n uint32) (*TopN, []TopNMet
 }
 
 func getMergedTopNFromSortedSlice(sorted []TopNMeta, n uint32) (*TopN, []TopNMeta) {
-	slices.SortFunc(sorted, func(i, j TopNMeta) int {
-		if i.Count != j.Count {
-			return cmp.Compare(j.Count, i.Count)
-		}
-		return bytes.Compare(i.Encoded, j.Encoded)
-	})
+	SortTopnMeta(sorted)
 	n = mathutil.Min(uint32(len(sorted)), n)
 
 	var finalTopN TopN

diff --git a/statistics/cmsketch_test.go b/statistics/cmsketch_test.go
@@ -347,7 +347,7 @@ func TestSortTopnMeta(t *testing.T) {
 		Encoded: []byte("b"),
 		Count:   2,
 	}}
-	SortTopnMeta(&data)
+	SortTopnMeta(data)
 	require.Equal(t, uint64(2), data[0].Count)
 }
 

diff --git a/statistics/handle/handle.go b/statistics/handle/handle.go
@@ -972,7 +972,7 @@ func MergeGlobalStatsTopNByConcurrency(mergeConcurrency, mergeBatchSize int, wra
 	globalTopN, popedTopn := statistics.GetMergedTopNFromSortedSlice(sorted, n)
 
 	result := append(leftTopn, popedTopn...)
-	statistics.SortTopnMeta(&result)
+	statistics.SortTopnMeta(result)
 	return globalTopN, result, wrapper.AllHg, nil
 }