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

tikv: pre-index stores in region-cache for different access pattern (#18040) #18105

Merged
merged 2 commits into from
Jun 18, 2020
Merged

tikv: pre-index stores in region-cache for different access pattern (#18040) #18105

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
3a8622c
cherry pick #18040 to release-4.0
lysu Jun 18, 2020
0cfd2f2
Merge branch 'release-4.0' into release-4.0-ad68349bd2bf
lysu Jun 18, 2020
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
2 changes: 1 addition & 1 deletion executor/split.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ func getRegionMeta(tikvStore tikv.Storage, regionMetas []*tikv.Region, uniqueReg
uniqueRegionMap[r.GetID()] = struct{}{}
regions = append(regions, regionMeta{
region: r.GetMeta(),
leaderID: r.GetLeaderID(),
leaderID: r.GetLeaderPeerID(),
storeID: r.GetLeaderStoreID(),
})
}
Expand Down
7 changes: 4 additions & 3 deletions store/mockstore/mocktikv/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ func (c *Cluster) RemoveStore(storeID uint64) {
}

// UpdateStoreAddr updates store address for cluster.
func (c *Cluster) UpdateStoreAddr(storeID uint64, addr string) {
func (c *Cluster) UpdateStoreAddr(storeID uint64, addr string, labels ...*metapb.StoreLabel) {
c.Lock()
defer c.Unlock()
c.stores[storeID] = newStore(storeID, addr)
c.stores[storeID] = newStore(storeID, addr, labels...)
}

// GetRegion returns a Region's meta and leader ID.
Expand Down Expand Up @@ -645,11 +645,12 @@ type Store struct {
tokenCount atomic.Int64
}

func newStore(storeID uint64, addr string) *Store {
func newStore(storeID uint64, addr string, labels ...*metapb.StoreLabel) *Store {
return &Store{
meta: &metapb.Store{
Id: storeID,
Address: addr,
Labels: labels,
},
}
}
Loading