diff --git a/core/breaker/breaker.go b/core/breaker/breaker.go index c6626f79a..27b8d25b6 100644 --- a/core/breaker/breaker.go +++ b/core/breaker/breaker.go @@ -8,7 +8,6 @@ import ( "sync" "time" - "github.com/zeromicro/go-zero/core/mathx" "github.com/zeromicro/go-zero/core/proc" "github.com/zeromicro/go-zero/core/stat" "github.com/zeromicro/go-zero/core/stringx" @@ -264,7 +263,7 @@ func (ew *errorWindow) add(reason string) { ew.lock.Lock() ew.reasons[ew.index] = fmt.Sprintf("%s %s", time.Now().Format(timeFormat), reason) ew.index = (ew.index + 1) % numHistoryReasons - ew.count = mathx.MinInt(ew.count+1, numHistoryReasons) + ew.count = min(ew.count+1, numHistoryReasons) ew.lock.Unlock() } diff --git a/core/mathx/int.go b/core/mathx/int.go index 4c1fe63e9..0156706e3 100644 --- a/core/mathx/int.go +++ b/core/mathx/int.go @@ -1,19 +1,13 @@ package mathx // MaxInt returns the larger one of a and b. +// Deprecated: use builtin max instead. func MaxInt(a, b int) int { - if a > b { - return a - } - - return b + return max(a, b) } // MinInt returns the smaller one of a and b. +// Deprecated: use builtin min instead. func MinInt(a, b int) int { - if a < b { - return a - } - - return b + return min(a, b) } diff --git a/core/utils/version.go b/core/utils/version.go index 2368fa910..b27845184 100644 --- a/core/utils/version.go +++ b/core/utils/version.go @@ -1,10 +1,10 @@ package utils import ( + "cmp" "strconv" "strings" - "github.com/zeromicro/go-zero/core/mathx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -39,7 +39,7 @@ func compare(v1, v2 string) int { fields1, fields2 := strings.Split(v1, "."), strings.Split(v2, ".") ver1, ver2 := strsToInts(fields1), strsToInts(fields2) ver1len, ver2len := len(ver1), len(ver2) - shorter := mathx.MinInt(ver1len, ver2len) + shorter := min(ver1len, ver2len) for i := 0; i < shorter; i++ { if ver1[i] == ver2[i] { @@ -50,14 +50,7 @@ func compare(v1, v2 string) int { return 1 } } - - if ver1len < ver2len { - return -1 - } else if ver1len == ver2len { - return 0 - } else { - return 1 - } + return cmp.Compare(ver1len, ver2len) } func strsToInts(strs []string) []int64 { diff --git a/zrpc/resolver/internal/directbuilder_test.go b/zrpc/resolver/internal/directbuilder_test.go index b602ccdd2..011c53e1c 100644 --- a/zrpc/resolver/internal/directbuilder_test.go +++ b/zrpc/resolver/internal/directbuilder_test.go @@ -10,7 +10,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/zeromicro/go-zero/core/lang" - "github.com/zeromicro/go-zero/core/mathx" "google.golang.org/grpc/resolver" ) @@ -47,7 +46,7 @@ func TestDirectBuilder_Build(t *testing.T) { }, cc, resolver.BuildOptions{}) assert.NoError(t, err) - size := mathx.MinInt(test, subsetSize) + size := min(test, subsetSize) assert.Equal(t, size, len(cc.state.Addresses)) m := make(map[string]lang.PlaceholderType) for _, each := range cc.state.Addresses {