database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ddl: fix inconsistent rule cache (#22051)

Browse Source 
Signed-off-by: xhe <xw897002528@gmail.com>
This commit is contained in:
xhe
2020-12-30 11:13:14 +08:00
committed by GitHub
parent 0217a00191
commit 5756bf8146
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
infoschema/infoschema.go
View File

@ -428,17 +428,20 @@ func GetBundle(h InfoSchema, ids []int64) *placement.Bundle {
}
}
newRules := []*placement.Rule{}
b, ok := h.BundleByName(placement.PDBundleID)
if ok {
newRules := b.Rules[:0]
for _, rule := range b.Rules {
if rule.StartKeyHex == "" && rule.EndKeyHex == "" {
newRules = append(newRules, rule.Clone())
}
}
b.Rules = newRules
return b
}
return &placement.Bundle{ID: placement.GroupID(ids[0])}
id := int64(-1)
if len(ids) > 0 {
id = ids[0]
}
return &placement.Bundle{ID: placement.GroupID(id), Rules: newRules}
}

14
infoschema/infoschema_test.go
View File

@ -369,7 +369,11 @@ func (*testSuite) TestGetBundle(c *C) {
bundles[placement.PDBundleID] = bundle
b := infoschema.GetBundle(is, []int64{})
c.Assert(b, DeepEquals, bundle)
c.Assert(b.Rules, DeepEquals, bundle.Rules)
// bundle itself is cloned
b.ID = "test"
c.Assert(bundle.ID, Equals, placement.PDBundleID)
ptID := placement.GroupID(3)
bundle = &placement.Bundle{
@ -388,6 +392,10 @@ func (*testSuite) TestGetBundle(c *C) {
b = infoschema.GetBundle(is, []int64{2, 3})
c.Assert(b, DeepEquals, bundle)
// bundle itself is cloned
b.ID = "test"
c.Assert(bundle.ID, Equals, ptID)
ptID = placement.GroupID(1)
bundle = &placement.Bundle{
ID: ptID,
@ -404,4 +412,8 @@ func (*testSuite) TestGetBundle(c *C) {
b = infoschema.GetBundle(is, []int64{1, 2, 3})
c.Assert(b, DeepEquals, bundle)
// bundle itself is cloned
b.ID = "test"
c.Assert(bundle.ID, Equals, ptID)
}