planner: a better way to round scale factor when collecting TopN stats (

#49808) close #49801
pingcap · Dec 27, 2023 · 1fb5a9a · 1fb5a9a
1 parent a7ef915
commit 1fb5a9a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/pkg/statistics/BUILD.bazel b/pkg/statistics/BUILD.bazel
@@ -78,7 +78,7 @@ go_test(
     data = glob(["testdata/**"]),
     embed = [":statistics"],
     flaky = True,
-    shard_count = 34,
+    shard_count = 35,
     deps = [
         "//pkg/config",
         "//pkg/parser/ast",

diff --git a/pkg/statistics/builder.go b/pkg/statistics/builder.go
@@ -429,12 +429,10 @@ func BuildHistAndTopN(
 				}
 			}
 		}
-		for i := 0; i < len(topNList); i++ {
-			topNList[i].Count *= uint64(sampleFactor)
-		}
 	}
 
 	topn := &TopN{TopN: topNList}
+	topn.Scale(sampleFactor)
 
 	if uint64(count) <= topn.TotalCount() || int(hg.NDV) <= len(topn.TopN) {
 		// TopN includes all sample data

diff --git a/pkg/statistics/cmsketch.go b/pkg/statistics/cmsketch.go
@@ -536,6 +536,13 @@ type TopN struct {
 	TopN []TopNMeta
 }
 
+// Scale scales the TopN by the given factor.
+func (c *TopN) Scale(scaleFactor float64) {
+	for i := range c.TopN {
+		c.TopN[i].Count = uint64(float64(c.TopN[i].Count) * scaleFactor)
+	}
+}
+
 // AppendTopN appends a topn into the TopN struct.
 func (c *TopN) AppendTopN(data []byte, count uint64) {
 	if c == nil {

diff --git a/pkg/statistics/cmsketch_test.go b/pkg/statistics/cmsketch_test.go
@@ -266,3 +266,23 @@ func TestSortTopnMeta(t *testing.T) {
 	SortTopnMeta(data)
 	require.Equal(t, uint64(2), data[0].Count)
 }
+
+func TestTopNScale(t *testing.T) {
+	for _, scaleFactor := range []float64{0.9999, 1.00001, 1.9999, 4.9999, 5.001, 9.99} {
+		var data []TopNMeta
+		sumCount := uint64(0)
+		for i := 0; i < 20; i++ {
+			cnt := uint64(rand.Intn(100000))
+			data = append(data, TopNMeta{
+				Count: cnt,
+			})
+			sumCount += cnt
+		}
+		topN := TopN{TopN: data}
+		topN.Scale(scaleFactor)
+		scaleCount := float64(sumCount) * scaleFactor
+		delta := math.Abs(float64(topN.TotalCount()) - scaleCount)
+		roundErrorRatio := delta / scaleCount
+		require.Less(t, roundErrorRatio, 0.0001)
+	}
+}