From 4d9544a0fd44b5c1da96d3f6c703f4a349580439 Mon Sep 17 00:00:00 2001 From: Karsten Weiss Date: Sun, 15 Apr 2018 13:02:09 +0200 Subject: [PATCH] Simplify make() (gosimple) This fixes: benchmark/worker/benchmark_client.go:151:36: should use make([]*grpc.ClientConn, connCount) instead (S1019) benchmark/worker/benchmark_client.go:231:47: should use make([]lockingHistogram, rpcCountPerConn * len(conns)) instead (S1019) benchmark/worker/benchmark_client.go:343:39: should use make([]*stats.Histogram, len(bc.lockingHistograms)) instead (S1019) benchmark/worker/benchmark_client.go:369:22: should use make([]uint32, len(mergedHistogram.Buckets)) instead (S1019) encoding/encoding.go:85:47: should use make(map[string]Codec) instead (S1019) proxy_test.go:116:26: should use make([]byte, len(msg)) instead (S1019) --- benchmark/worker/benchmark_client.go | 8 ++++---- encoding/encoding.go | 2 +- proxy_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/benchmark/worker/benchmark_client.go b/benchmark/worker/benchmark_client.go index d0e8f05b..00adfa1d 100644 --- a/benchmark/worker/benchmark_client.go +++ b/benchmark/worker/benchmark_client.go @@ -148,7 +148,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error // Create connections. connCount := int(config.ClientChannels) - conns := make([]*grpc.ClientConn, connCount, connCount) + conns := make([]*grpc.ClientConn, connCount) for connIndex := 0; connIndex < connCount; connIndex++ { conns[connIndex] = benchmark.NewClientConn(config.ServerTargets[connIndex%len(config.ServerTargets)], opts...) } @@ -228,7 +228,7 @@ func startBenchmarkClient(config *testpb.ClientConfig) (*benchmarkClient, error) BaseBucketSize: (1 + config.HistogramParams.Resolution), MinValue: 0, }, - lockingHistograms: make([]lockingHistogram, rpcCountPerConn*len(conns), rpcCountPerConn*len(conns)), + lockingHistograms: make([]lockingHistogram, rpcCountPerConn*len(conns)), stop: make(chan bool), lastResetTime: time.Now(), @@ -340,7 +340,7 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats { if reset { // Merging histogram may take some time. // Put all histograms aside and merge later. - toMerge := make([]*stats.Histogram, len(bc.lockingHistograms), len(bc.lockingHistograms)) + toMerge := make([]*stats.Histogram, len(bc.lockingHistograms)) for i := range bc.lockingHistograms { toMerge[i] = bc.lockingHistograms[i].swap(stats.NewHistogram(bc.histogramOptions)) } @@ -366,7 +366,7 @@ func (bc *benchmarkClient) getStats(reset bool) *testpb.ClientStats { uTimeElapsed, sTimeElapsed = cpuTimeDiff(bc.rusageLastReset, latestRusage) } - b := make([]uint32, len(mergedHistogram.Buckets), len(mergedHistogram.Buckets)) + b := make([]uint32, len(mergedHistogram.Buckets)) for i, v := range mergedHistogram.Buckets { b[i] = uint32(v.Count) } diff --git a/encoding/encoding.go b/encoding/encoding.go index 8e26c194..ade8b7ce 100644 --- a/encoding/encoding.go +++ b/encoding/encoding.go @@ -82,7 +82,7 @@ type Codec interface { Name() string } -var registeredCodecs = make(map[string]Codec, 0) +var registeredCodecs = make(map[string]Codec) // RegisterCodec registers the provided Codec for use with all gRPC clients and // servers. diff --git a/proxy_test.go b/proxy_test.go index 39ee123c..8466676c 100644 --- a/proxy_test.go +++ b/proxy_test.go @@ -113,7 +113,7 @@ func TestHTTPConnect(t *testing.T) { } msg := []byte{4, 3, 5, 2} - recvBuf := make([]byte, len(msg), len(msg)) + recvBuf := make([]byte, len(msg)) done := make(chan struct{}) go func() { in, err := blis.Accept()