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.

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

fix: enable int-conversion rule of perfsprint #18859

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions client/pkg/fileutil/fileutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
package fileutil

import (
"fmt"
"io"
"math/rand"
"os"
"os/user"
"path/filepath"
"runtime"
"strconv"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -64,7 +64,7 @@ func TestCreateDirAll(t *testing.T) {
}

func TestExist(t *testing.T) {
fdir := filepath.Join(os.TempDir(), fmt.Sprint(time.Now().UnixNano()+rand.Int63n(1000)))
fdir := filepath.Join(os.TempDir(), strconv.FormatInt(time.Now().UnixNano()+rand.Int63n(1000), 10))
os.RemoveAll(fdir)
if err := os.Mkdir(fdir, 0o666); err != nil {
t.Skip(err)
Expand Down
7 changes: 4 additions & 3 deletions client/pkg/srv/srv.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"fmt"
"net"
"net/url"
"strconv"
"strings"

"go.etcd.io/etcd/client/pkg/v3/types"
Expand Down Expand Up @@ -54,7 +55,7 @@ func GetCluster(serviceScheme, service, name, dns string, apurls types.URLs) ([]
return err
}
for _, srv := range addrs {
port := fmt.Sprintf("%d", srv.Port)
port := strconv.FormatUint(uint64(srv.Port), 10)
host := net.JoinHostPort(srv.Target, port)
tcpAddr, terr := resolveTCPAddr("tcp", host)
if terr != nil {
Expand All @@ -67,7 +68,7 @@ func GetCluster(serviceScheme, service, name, dns string, apurls types.URLs) ([]
n = name
}
if n == "" {
n = fmt.Sprintf("%d", tempName)
n = strconv.Itoa(tempName)
tempName++
}
// SRV records have a trailing dot but URL shouldn't.
Expand Down Expand Up @@ -112,7 +113,7 @@ func GetClient(service, domain string, serviceName string) (*SRVClients, error)
for _, srv := range addrs {
urls = append(urls, &url.URL{
Scheme: scheme,
Host: net.JoinHostPort(srv.Target, fmt.Sprintf("%d", srv.Port)),
Host: net.JoinHostPort(srv.Target, strconv.FormatUint(uint64(srv.Port), 10)),
})
}
srvs = append(srvs, addrs...)
Expand Down
23 changes: 12 additions & 11 deletions etcdctl/ctlv3/command/printer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import (
"errors"
"fmt"
"strconv"
"strings"

"github.com/dustin/go-humanize"
Expand Down Expand Up @@ -193,7 +194,7 @@
isLearner = "true"
}
rows = append(rows, []string{
fmt.Sprintf("%x", m.ID),
strconv.FormatUint(m.ID, 16),

Check warning on line 197 in etcdctl/ctlv3/command/printer.go

View check run for this annotation

Codecov / codecov/patch

etcdctl/ctlv3/command/printer.go#L197

Added line #L197 was not covered by tests
status,
m.Name,
strings.Join(m.PeerURLs, ","),
Expand All @@ -209,7 +210,7 @@
for _, h := range healthList {
rows = append(rows, []string{
h.Ep,
fmt.Sprintf("%v", h.Health),
strconv.FormatBool(h.Health),

Check warning on line 213 in etcdctl/ctlv3/command/printer.go

View check run for this annotation

Codecov / codecov/patch

etcdctl/ctlv3/command/printer.go#L213

Added line #L213 was not covered by tests
h.Took,
h.Error,
})
Expand All @@ -225,19 +226,19 @@
for _, status := range statusList {
rows = append(rows, []string{
status.Ep,
fmt.Sprintf("%x", status.Resp.Header.MemberId),
strconv.FormatUint(status.Resp.Header.MemberId, 16),

Check warning on line 229 in etcdctl/ctlv3/command/printer.go

View check run for this annotation

Codecov / codecov/patch

etcdctl/ctlv3/command/printer.go#L229

Added line #L229 was not covered by tests
status.Resp.Version,
status.Resp.StorageVersion,
humanize.Bytes(uint64(status.Resp.DbSize)),
humanize.Bytes(uint64(status.Resp.DbSizeInUse)),
fmt.Sprintf("%d%%", int(float64(100-(status.Resp.DbSizeInUse*100/status.Resp.DbSize)))),
humanize.Bytes(uint64(status.Resp.DbSizeQuota)),
fmt.Sprint(status.Resp.Leader == status.Resp.Header.MemberId),
fmt.Sprint(status.Resp.IsLearner),
fmt.Sprint(status.Resp.RaftTerm),
fmt.Sprint(status.Resp.RaftIndex),
fmt.Sprint(status.Resp.RaftAppliedIndex),
fmt.Sprint(strings.Join(status.Resp.Errors, ", ")),
strconv.FormatBool(status.Resp.Leader == status.Resp.Header.MemberId),
strconv.FormatBool(status.Resp.IsLearner),
strconv.FormatUint(status.Resp.RaftTerm, 10),
strconv.FormatUint(status.Resp.RaftIndex, 10),
strconv.FormatUint(status.Resp.RaftAppliedIndex, 10),
strings.Join(status.Resp.Errors, ", "),

Check warning on line 241 in etcdctl/ctlv3/command/printer.go

View check run for this annotation

Codecov / codecov/patch

etcdctl/ctlv3/command/printer.go#L236-L241

Added lines #L236 - L241 were not covered by tests
})
}
return hdr, rows
Expand All @@ -248,8 +249,8 @@
for _, h := range hashList {
rows = append(rows, []string{
h.Ep,
fmt.Sprint(h.Resp.Hash),
fmt.Sprint(h.Resp.HashRevision),
strconv.FormatUint(uint64(h.Resp.Hash), 10),
strconv.FormatInt(h.Resp.HashRevision, 10),

Check warning on line 253 in etcdctl/ctlv3/command/printer.go

View check run for this annotation

Codecov / codecov/patch

etcdctl/ctlv3/command/printer.go#L252-L253

Added lines #L252 - L253 were not covered by tests
})
}
return hdr, rows
Expand Down
14 changes: 7 additions & 7 deletions etcdutl/etcdutl/printer.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import (
"errors"
"fmt"
"strconv"

"github.com/dustin/go-humanize"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -68,9 +68,9 @@
func makeDBStatusTable(ds snapshot.Status) (hdr []string, rows [][]string) {
hdr = []string{"hash", "revision", "total keys", "total size", "version"}
rows = append(rows, []string{
fmt.Sprintf("%x", ds.Hash),
fmt.Sprint(ds.Revision),
fmt.Sprint(ds.TotalKey),
strconv.FormatUint(uint64(ds.Hash), 16),
strconv.FormatInt(ds.Revision, 10),
strconv.Itoa(ds.TotalKey),

Check warning on line 73 in etcdutl/etcdutl/printer.go

View check run for this annotation

Codecov / codecov/patch

etcdutl/etcdutl/printer.go#L71-L73

Added lines #L71 - L73 were not covered by tests
humanize.Bytes(uint64(ds.TotalSize)),
ds.Version,
})
Expand All @@ -80,9 +80,9 @@
func makeDBHashKVTable(ds HashKV) (hdr []string, rows [][]string) {
hdr = []string{"hash", "hash revision", "compact revision"}
rows = append(rows, []string{
fmt.Sprint(ds.Hash),
fmt.Sprint(ds.HashRevision),
fmt.Sprint(ds.CompactRevision),
strconv.FormatUint(uint64(ds.Hash), 10),
strconv.FormatInt(ds.HashRevision, 10),
strconv.FormatInt(ds.CompactRevision, 10),

Check warning on line 85 in etcdutl/etcdutl/printer.go

View check run for this annotation

Codecov / codecov/patch

etcdutl/etcdutl/printer.go#L83-L85

Added lines #L83 - L85 were not covered by tests
})
return hdr, rows
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/report/timeseries.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"log"
"math"
"sort"
"strconv"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -127,11 +128,11 @@ func (t TimeSeries) String() string {
var rows [][]string
for i := range t {
row := []string{
fmt.Sprintf("%d", t[i].Timestamp),
strconv.FormatInt(t[i].Timestamp, 10),
t[i].MinLatency.String(),
t[i].AvgLatency.String(),
t[i].MaxLatency.String(),
fmt.Sprintf("%d", t[i].ThroughPut),
strconv.FormatInt(t[i].ThroughPut, 10),
}
rows = append(rows, row)
}
Expand Down
3 changes: 2 additions & 1 deletion tools/benchmark/cmd/watch_get.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package cmd
import (
"context"
"fmt"
"strconv"
"sync"
"time"

Expand Down Expand Up @@ -56,7 +57,7 @@ func watchGetFunc(_ *cobra.Command, _ []string) {
// setup keys for watchers
watchRev := int64(0)
for i := 0; i < watchEvents; i++ {
v := fmt.Sprintf("%d", i)
v := strconv.Itoa(i)
resp, err := clients[0].Put(context.TODO(), "watchkey", v)
if err != nil {
panic(err)
Expand Down