mirror of
https://github.com/minio/minio.git
synced 2025-11-07 21:02:58 -05:00
Run modernize (#21546)
`go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...` executed. `go generate ./...` ran afterwards to keep generated.
This commit is contained in:
@@ -193,19 +193,13 @@ func (r *RingBuffer) read(p []byte) (n int, err error) {
|
||||
}
|
||||
|
||||
if r.w > r.r {
|
||||
n = r.w - r.r
|
||||
if n > len(p) {
|
||||
n = len(p)
|
||||
}
|
||||
n = min(r.w-r.r, len(p))
|
||||
copy(p, r.buf[r.r:r.r+n])
|
||||
r.r = (r.r + n) % r.size
|
||||
return
|
||||
}
|
||||
|
||||
n = r.size - r.r + r.w
|
||||
if n > len(p) {
|
||||
n = len(p)
|
||||
}
|
||||
n = min(r.size-r.r+r.w, len(p))
|
||||
|
||||
if r.r+n <= r.size {
|
||||
copy(p, r.buf[r.r:r.r+n])
|
||||
|
||||
@@ -11,8 +11,7 @@ func BenchmarkRingBuffer_Sync(b *testing.B) {
|
||||
data := []byte(strings.Repeat("a", 512))
|
||||
buf := make([]byte, 512)
|
||||
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
rb.Write(data)
|
||||
rb.Read(buf)
|
||||
}
|
||||
@@ -30,8 +29,7 @@ func BenchmarkRingBuffer_AsyncRead(b *testing.B) {
|
||||
}
|
||||
}()
|
||||
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
rb.Write(data)
|
||||
}
|
||||
}
|
||||
@@ -50,8 +48,7 @@ func BenchmarkRingBuffer_AsyncReadBlocking(b *testing.B) {
|
||||
}
|
||||
}()
|
||||
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
rb.Write(data)
|
||||
}
|
||||
}
|
||||
@@ -67,8 +64,7 @@ func BenchmarkRingBuffer_AsyncWrite(b *testing.B) {
|
||||
}
|
||||
}()
|
||||
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
rb.Read(buf)
|
||||
}
|
||||
}
|
||||
@@ -87,8 +83,7 @@ func BenchmarkRingBuffer_AsyncWriteBlocking(b *testing.B) {
|
||||
}
|
||||
}()
|
||||
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
rb.Read(buf)
|
||||
}
|
||||
}
|
||||
@@ -104,8 +99,7 @@ func BenchmarkIoPipeReader(b *testing.B) {
|
||||
}
|
||||
}()
|
||||
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
pr.Read(buf)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -429,7 +429,7 @@ func TestRingBuffer_Blocking(t *testing.T) {
|
||||
read = io.MultiWriter(read, &readBuf)
|
||||
wrote = io.MultiWriter(wrote, &wroteBuf)
|
||||
}
|
||||
debugln := func(args ...interface{}) {
|
||||
debugln := func(args ...any) {
|
||||
if debug {
|
||||
fmt.Println(args...)
|
||||
}
|
||||
@@ -488,7 +488,7 @@ func TestRingBuffer_Blocking(t *testing.T) {
|
||||
{
|
||||
buf := make([]byte, 1024)
|
||||
writeRng := rand.New(rand.NewSource(2))
|
||||
for i := 0; i < 2500; i++ {
|
||||
for range 2500 {
|
||||
writeRng.Read(buf)
|
||||
// Write
|
||||
n, err := rb.Write(buf[:writeRng.Intn(len(buf))])
|
||||
@@ -592,7 +592,7 @@ func TestRingBuffer_BlockingBig(t *testing.T) {
|
||||
read = io.MultiWriter(read, &readBuf)
|
||||
wrote = io.MultiWriter(wrote, &wroteBuf)
|
||||
}
|
||||
debugln := func(args ...interface{}) {
|
||||
debugln := func(args ...any) {
|
||||
if debug {
|
||||
fmt.Println(args...)
|
||||
}
|
||||
@@ -651,7 +651,7 @@ func TestRingBuffer_BlockingBig(t *testing.T) {
|
||||
{
|
||||
writeRng := rand.New(rand.NewSource(2))
|
||||
buf := make([]byte, 64<<10)
|
||||
for i := 0; i < 500; i++ {
|
||||
for range 500 {
|
||||
writeRng.Read(buf)
|
||||
// Write
|
||||
n, err := rb.Write(buf[:writeRng.Intn(len(buf))])
|
||||
|
||||
Reference in New Issue
Block a user