Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stats: fix panic when updating empty histogram #7640

Merged
merged 2 commits into from
Sep 9, 2018
Merged

stats: fix panic when updating empty histogram #7640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b76cbc5
stats: fix panic when updating by feedback
Sep 7, 2018
2f84774
Merge branch 'master' into panic
ngaut Sep 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions domain/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,10 @@ func (do *Domain) updateStatsWorker(ctx sessionctx.Context, owner owner.Manager)
} else {
log.Info("[stats] init stats info takes ", time.Now().Sub(t))
}
defer recoverInDomain("updateStatsWorker", false)
defer func() {
recoverInDomain("updateStatsWorker", false)
do.wg.Done()
}()
for {
select {
case <-loadTicker.C:
Expand All @@ -678,7 +681,6 @@ func (do *Domain) updateStatsWorker(ctx sessionctx.Context, owner owner.Manager)
}
case <-do.exit:
statsHandle.FlushStats()
do.wg.Done()
return
// This channel is sent only by ddl owner.
case t := <-statsHandle.DDLEventCh():
Expand Down Expand Up @@ -727,7 +729,10 @@ func (do *Domain) autoAnalyzeWorker(owner owner.Manager) {
statsHandle := do.StatsHandle()
analyzeTicker := time.NewTicker(do.statsLease)
defer analyzeTicker.Stop()
defer recoverInDomain("autoAnalyzeWorker", false)
defer func() {
recoverInDomain("autoAnalyzeWorker", false)
do.wg.Done()
}()
for {
select {
case <-analyzeTicker.C:
Expand All @@ -738,7 +743,6 @@ func (do *Domain) autoAnalyzeWorker(owner owner.Manager) {
}
}
case <-do.exit:
do.wg.Done()
return
}
}
Expand Down
4 changes: 2 additions & 2 deletions statistics/feedback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,13 +880,13 @@ func (q *QueryFeedback) logDetailedInfo(h *Handle) {
logPrefix := fmt.Sprintf("[stats-feedback] %s,", t.name)
if isIndex {
idx := t.Indices[q.hist.ID]
if idx == nil {
if idx == nil || idx.Histogram.Len() == 0 {
return
}
logForIndex(logPrefix, t, idx, ranges, actual, idx.getIncreaseFactor(t.Count))
} else {
c := t.Columns[q.hist.ID]
if c == nil {
if c == nil || c.Histogram.Len() == 0 {
return
}
logForPK(logPrefix, c, ranges, actual, c.getIncreaseFactor(t.Count))
Expand Down
8 changes: 4 additions & 4 deletions statistics/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ func (h *Handle) UpdateStatsByLocalFeedback(is infoschema.InfoSchema) {
newTblStats := tblStats.copy()
if fb.hist.isIndexHist() {
idx, ok := tblStats.Indices[fb.hist.ID]
if !ok {
if !ok || idx.Histogram.Len() == 0 {
continue
}
newIdx := *idx
Expand All @@ -428,7 +428,7 @@ func (h *Handle) UpdateStatsByLocalFeedback(is infoschema.InfoSchema) {
newTblStats.Indices[fb.hist.ID] = &newIdx
} else {
col, ok := tblStats.Columns[fb.hist.ID]
if !ok {
if !ok || col.Histogram.Len() == 0 {
continue
}
newCol := *col
Expand Down Expand Up @@ -528,14 +528,14 @@ func (h *Handle) handleSingleHistogramUpdate(is infoschema.InfoSchema, rows []ch
var hist *Histogram
if isIndex == 1 {
idx, ok := tbl.Indices[histID]
if ok {
if ok && idx.Histogram.Len() > 0 {
idxHist := idx.Histogram
hist = &idxHist
cms = idx.CMSketch.copy()
}
} else {
col, ok := tbl.Columns[histID]
if ok {
if ok && col.Histogram.Len() > 0 {
colHist := col.Histogram
hist = &colHist
}
Expand Down
16 changes: 15 additions & 1 deletion statistics/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,13 +660,23 @@ func (s *testStatsUpdateSuite) TestQueryFeedback(c *C) {
c.Assert(len(feedback), Equals, 0)
}

// Test that the outdated feedback won't cause panic.
// Test that after drop stats, the feedback won't cause panic.
statistics.FeedbackProbability = 1
for _, t := range tests {
testKit.MustQuery(t.sql)
}
c.Assert(h.DumpStatsDeltaToKV(statistics.DumpAll), IsNil)
c.Assert(h.DumpStatsFeedbackToKV(), IsNil)
testKit.MustExec("drop stats t")
c.Assert(h.HandleUpdateStats(s.do.InfoSchema()), IsNil)

// Test that the outdated feedback won't cause panic.
testKit.MustExec("analyze table t")
for _, t := range tests {
testKit.MustQuery(t.sql)
}
c.Assert(h.DumpStatsDeltaToKV(statistics.DumpAll), IsNil)
c.Assert(h.DumpStatsFeedbackToKV(), IsNil)
testKit.MustExec("drop table t")
c.Assert(h.HandleUpdateStats(s.do.InfoSchema()), IsNil)
}
Expand Down Expand Up @@ -844,6 +854,10 @@ func (s *testStatsUpdateSuite) TestUpdateStatsByLocalFeedback(c *C) {

// Test that it won't cause panic after update.
testKit.MustQuery("select * from t use index(idx) where b > 0")

// Test that after drop stats, it won't cause panic.
testKit.MustExec("drop stats t")
h.UpdateStatsByLocalFeedback(s.do.InfoSchema())
}

type logHook struct {
Expand Down