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

bindinfo: fix bindinfo bugs when update cache #13875

Merged
merged 2 commits into from
Dec 4, 2019
Merged

bindinfo: fix bindinfo bugs when update cache #13875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7117b67
bindinfo: fix bindinfo bugs when update cache
alivxxx Dec 3, 2019
446f66f
Merge branch 'master' into bindinfo
sre-bot Dec 4, 2019
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
22 changes: 22 additions & 0 deletions bindinfo/bind_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,3 +528,25 @@ func (s *testSuite) TestAddEvolveTasks(c *C) {
status := rows[1][3].(string)
c.Assert(status == "using" || status == "rejected", IsTrue)
}

func (s *testSuite) TestBindingCache(c *C) {
tk := testkit.NewTestKit(c, s.store)
s.cleanBindingEnv(tk)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")
tk.MustExec("create table t(a int, b int, index idx(a))")
tk.MustExec("create global binding for select * from t using select * from t use index(idx)")
tk.MustExec("create database tmp")
tk.MustExec("use tmp")
tk.MustExec("create table t(a int, b int, index idx(a))")
tk.MustExec("create global binding for select * from t using select * from t use index(idx)")

c.Assert(s.domain.BindHandle().Update(false), IsNil)
c.Assert(s.domain.BindHandle().Update(false), IsNil)
res := tk.MustQuery("show global bindings")
c.Assert(len(res.Rows()), Equals, 2)

tk.MustExec("drop global binding for select * from t")
c.Assert(s.domain.BindHandle().Update(false), IsNil)
c.Assert(len(s.domain.BindHandle().GetAllBindRecord()), Equals, 1)
}
7 changes: 4 additions & 3 deletions bindinfo/handle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (h *BindHandle) Update(fullLoad bool) (err error) {

sql := "select original_sql, bind_sql, default_db, status, create_time, update_time, charset, collation from mysql.bind_info"
if !fullLoad {
sql += " where update_time >= \"" + lastUpdateTime.String() + "\""
sql += " where update_time > \"" + lastUpdateTime.String() + "\""
}
// We need to apply the updates by order, wrong apply order of same original sql may cause inconsistent state.
sql += " order by update_time"
Expand Down Expand Up @@ -154,7 +154,7 @@ func (h *BindHandle) Update(fullLoad bool) (err error) {
lastUpdateTime = meta.Bindings[0].UpdateTime
}
if err != nil {
lzmhhh123 marked this conversation as resolved.
Show resolved Hide resolved
logutil.BgLogger().Error("update bindinfo failed", zap.Error(err))
logutil.BgLogger().Info("update bindinfo failed", zap.Error(err))
continue
}

Expand All @@ -163,7 +163,7 @@ func (h *BindHandle) Update(fullLoad bool) (err error) {
if len(newRecord.Bindings) > 0 {
newCache.setBindRecord(hash, newRecord)
} else {
newCache.removeDeletedBindRecord(hash, oldRecord)
newCache.removeDeletedBindRecord(hash, newRecord)
}
updateMetrics(metrics.ScopeGlobal, oldRecord, newCache.getBindRecord(hash, meta.OriginalSQL, meta.Db), true)
}
Expand Down Expand Up @@ -459,6 +459,7 @@ func (c cache) removeDeletedBindRecord(hash string, meta *BindRecord) {
}
}
}
c[hash] = metas
}

func (c cache) setBindRecord(hash string, meta *BindRecord) {
Expand Down