stats: fix merge cm sketch panic (#13391) (#13395)

pingcap · Nov 12, 2019 · 1f720ab · 1f720ab
1 parent a9ef955
commit 1f720ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/executor/analyze_test.go b/executor/analyze_test.go
@@ -285,6 +285,8 @@ func (s *testSuite1) TestFastAnalyze(c *C) {
 
 	// Test CM Sketch built from fast analyze.
 	tk.MustExec("create table t1(a int, b int, index idx(a, b))")
+	// Should not panic.
+	tk.MustExec("analyze table t1")
 	tk.MustExec("insert into t1 values (1,1),(1,1),(1,2),(1,2)")
 	tk.MustExec("analyze table t1")
 	tk.MustQuery("explain select a from t1 where a = 1").Check(testkit.Rows(

diff --git a/statistics/cmsketch.go b/statistics/cmsketch.go
@@ -325,6 +325,9 @@ func (c *CMSketch) mergeTopN(lTopN map[uint64][]*TopNMeta, rTopN map[uint64][]*T
 
 // MergeCMSketch merges two CM Sketch.
 func (c *CMSketch) MergeCMSketch(rc *CMSketch, numTopN uint32) error {
+	if c == nil || rc == nil {
+		return nil
+	}
 	if c.depth != rc.depth || c.width != rc.width {
 		return errors.New("Dimensions of Count-Min Sketch should be the same")
 	}