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

filter: replace fmt.Sprint with strconv.parseUint64 #4010

Merged
merged 3 commits into from
Aug 20, 2021
Merged

filter: replace fmt.Sprint with strconv.parseUint64 #4010

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dc15d0
replace fmt.Sprint with strconv.parseUint64
bufferflies Aug 19, 2021
9b366c0
Merge branch 'master' into feature/replaceFmt
ti-chi-bot Aug 20, 2021
3be5173
Merge branch 'master' into feature/replaceFmt
ti-chi-bot Aug 20, 2021
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
13 changes: 7 additions & 6 deletions server/schedule/filter/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package filter

import (
"fmt"
"strconv"

"github.com/golang/protobuf/proto"
"github.com/pingcap/kvproto/pkg/metapb"
Expand All @@ -36,7 +37,7 @@ func SelectSourceStores(stores []*core.StoreInfo, filters []Filter, opt *config.
return filterStoresBy(stores, func(s *core.StoreInfo) bool {
return slice.AllOf(filters, func(i int) bool {
if !filters[i].Source(opt, s) {
sourceID := fmt.Sprintf("%d", s.GetID())
sourceID := strconv.FormatUint(s.GetID(), 10)
targetID := ""
filterCounter.WithLabelValues("filter-source", s.GetAddress(),
sourceID, filters[i].Scope(), filters[i].Type(), sourceID, targetID).Inc()
Expand All @@ -54,10 +55,10 @@ func SelectTargetStores(stores []*core.StoreInfo, filters []Filter, opt *config.
filter := filters[i]
if !filter.Target(opt, s) {
cfilter, ok := filter.(comparingFilter)
targetID := fmt.Sprintf("%d", s.GetID())
targetID := strconv.FormatUint(s.GetID(), 10)
sourceID := ""
if ok {
sourceID = fmt.Sprintf("%d", cfilter.GetSourceStoreID())
sourceID = strconv.FormatUint(cfilter.GetSourceStoreID(), 10)
}
filterCounter.WithLabelValues("filter-target", s.GetAddress(),
targetID, filters[i].Scope(), filters[i].Type(), sourceID, targetID).Inc()
Expand Down Expand Up @@ -98,7 +99,7 @@ type comparingFilter interface {
// Source checks if store can pass all Filters as source store.
func Source(opt *config.PersistOptions, store *core.StoreInfo, filters []Filter) bool {
storeAddress := store.GetAddress()
storeID := fmt.Sprintf("%d", store.GetID())
storeID := strconv.FormatUint(store.GetID(), 10)
for _, filter := range filters {
if !filter.Source(opt, store) {
sourceID := storeID
Expand All @@ -114,14 +115,14 @@ func Source(opt *config.PersistOptions, store *core.StoreInfo, filters []Filter)
// Target checks if store can pass all Filters as target store.
func Target(opt *config.PersistOptions, store *core.StoreInfo, filters []Filter) bool {
storeAddress := store.GetAddress()
storeID := fmt.Sprintf("%d", store.GetID())
storeID := strconv.FormatUint(store.GetID(), 10)
for _, filter := range filters {
if !filter.Target(opt, store) {
cfilter, ok := filter.(comparingFilter)
targetID := storeID
sourceID := ""
if ok {
sourceID = fmt.Sprintf("%d", cfilter.GetSourceStoreID())
sourceID = strconv.FormatUint(cfilter.GetSourceStoreID(), 10)
}
filterCounter.WithLabelValues("filter-target", storeAddress,
targetID, filter.Scope(), filter.Type(), sourceID, targetID).Inc()
Expand Down