diff --git a/executor/analyze.go b/executor/analyze.go index 4eb25ba9c7526..7a2b61b2b4bfe 100755 --- a/executor/analyze.go +++ b/executor/analyze.go @@ -841,7 +841,7 @@ func (e *AnalyzeFastExec) updateCollectorSamples(sValue []byte, sKey kv.Key, sam for j, idxInfo := range e.idxsInfo { idxVals := make([]types.Datum, 0, len(idxInfo.Columns)) for _, idxCol := range idxInfo.Columns { - for _, colInfo := range e.colsInfo { + for _, colInfo := range e.tblInfo.Columns { if colInfo.Name == idxCol.Name { v, err := e.getValueByInfo(colInfo, values) if err != nil { diff --git a/executor/analyze_test.go b/executor/analyze_test.go index b83c677237a91..d469f44d9516d 100644 --- a/executor/analyze_test.go +++ b/executor/analyze_test.go @@ -298,6 +298,30 @@ func (s *testSuite1) TestFastAnalyze(c *C) { "test t2 a 0 1 2 1 18446744073709551615 18446744073709551615")) } +<<<<<<< HEAD +======= +func (s *testSuite1) TestIssue15751(c *C) { + tk := testkit.NewTestKit(c, s.store) + tk.MustExec("use test") + tk.MustExec("drop table if exists t0") + tk.MustExec("CREATE TABLE t0(c0 INT, c1 INT, PRIMARY KEY(c0, c1))") + tk.MustExec("INSERT INTO t0 VALUES (0, 0)") + tk.MustExec("set @@tidb_enable_fast_analyze=1") + tk.MustExec("ANALYZE TABLE t0") +} + +func (s *testSuite1) TestIssue15752(c *C) { + tk := testkit.NewTestKit(c, s.store) + tk.MustExec("use test") + tk.MustExec("drop table if exists t0") + tk.MustExec("CREATE TABLE t0(c0 INT)") + tk.MustExec("INSERT INTO t0 VALUES (0)") + tk.MustExec("CREATE INDEX i0 ON t0(c0)") + tk.MustExec("set @@tidb_enable_fast_analyze=1") + tk.MustExec("ANALYZE TABLE t0 INDEX i0") +} + +>>>>>>> 5d846cf... statistic: fix error when fast analyze on only indexes (#15889) func (s *testSuite1) TestAnalyzeIncremental(c *C) { tk := testkit.NewTestKit(c, s.store) tk.MustExec("use test")