Apply modernize fixes.

Author: nickeskov

leveldb/cache/cache_test.go

@@ -153,9 +153,7 @@ func TestCacheMap(t *testing.T) {
 		objects := objects[id]
 		handles := handles[id]
 		for job := 0; job < param.concurrent; job++ {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 
 				r := rand.New(rand.NewSource(time.Now().UnixNano()))
 				for j := len(objects) * param.repeat; j >= 0; j-- {
@@ -179,7 +177,7 @@ func TestCacheMap(t *testing.T) {
 						h.Release()
 					}
 				}
-			}()
+			})
 		}
 
 		// Randomly release handles at interval.

leveldb/db_test.go

@@ -2945,11 +2945,9 @@ func TestDB_GracefulClose(t *testing.T) {
 	for i := range 1000000 {
 		if !closing && h.totalTables() > 3 {
 			t.Logf("close db during write, index=%d", i)
-			closeWait.Add(1)
-			go func() {
+			closeWait.Go(func() {
 				h.closeDB()
-				closeWait.Done()
-			}()
+			})
 			closing = true
 		}
 		if err := h.db.Put(fmt.Appendf(nil, "%09d", i), fmt.Appendf(nil, "VAL-%09d", i), h.wo); err != nil {
@@ -2966,11 +2964,9 @@ func TestDB_GracefulClose(t *testing.T) {
 	for i := 0; i < n; i++ {
 		if !closing && i > n/2 {
 			t.Logf("close db during read, index=%d", i)
-			closeWait.Add(1)
-			go func() {
+			closeWait.Go(func() {
 				h.closeDB()
-				closeWait.Done()
-			}()
+			})
 			closing = true
 		}
 		if _, err := h.db.Get(fmt.Appendf(nil, "%09d", i), h.ro); err != nil {
@@ -2990,11 +2986,9 @@ func TestDB_GracefulClose(t *testing.T) {
 		}
 		if !closing {
 			t.Logf("close db during iter, index=%d", i)
-			closeWait.Add(1)
-			go func() {
+			closeWait.Go(func() {
 				h.closeDB()
-				closeWait.Done()
-			}()
+			})
 			closing = true
 		}
 		time.Sleep(time.Millisecond)

leveldb/table/reader.go

@@ -50,13 +50,6 @@ func (e *ErrCorrupted) Error() string {
 	return fmt.Sprintf("leveldb/table: corruption on %s (pos=%d): %s", e.Kind, e.Pos, e.Reason)
 }
 
-func max(x, y int) int {
-	if x > y {
-		return x
-	}
-	return y
-}
-
 type block struct {
 	bpool          *util.BufferPool
 	bh             blockHandle
@@ -74,10 +67,7 @@ func (b *block) seek(cmp comparer.Comparer, rstart, rlimit int, key []byte) (ind
 		m := offset + n1 + n2
 		return cmp.Compare(b.data[m:m+int(v1)], key) > 0
 	}) + rstart - 1
-	if index < rstart {
-		// The smallest key is greater-than key sought.
-		index = rstart
-	}
+	index = max(index, rstart) // if index < rstart the smallest key is greater-than key sought.
 	offset = int(binary.LittleEndian.Uint32(b.data[b.restartsOffset+4*index:]))
 	return
 }

leveldb/testutil/storage.go

@@ -512,12 +512,13 @@ func (s *Storage) ForceRename(oldfd, newfd storage.FileDesc) (err error) {
 }
 
 func (s *Storage) openFiles() string {
-	out := "Open files:"
+	var out strings.Builder
+	out.WriteString("Open files:")
 	for x, writer := range s.opens {
 		fd := unpackFile(x)
-		out += fmt.Sprintf("\n · fd=%s writer=%v", fd, writer)
+		out.WriteString(fmt.Sprintf("\n · fd=%s writer=%v", fd, writer))
 	}
-	return out
+	return out.String()
 }
 
 func (s *Storage) CloseCheck() {

leveldb/version_test.go

@@ -310,13 +310,11 @@ func TestVersionReference(t *testing.T) {
 		var wg sync.WaitGroup
 		readN := rand.Intn(300)
 		for range readN {
-			wg.Add(1)
-			go func() {
+			wg.Go(func() {
 				v := s.version()
 				time.Sleep(time.Millisecond * time.Duration(rand.Intn(300)))
 				v.release()
-				wg.Done()
-			}()
+			})
 		}
 
 		v := s.version()

manualtest/dbstress/main.go

@@ -52,14 +52,14 @@ var (
 type arrayInt []int
 
 func (a arrayInt) String() string {
-	var str string
+	var str strings.Builder
 	for i, n := range a {
 		if i > 0 {
-			str += ","
+			str.WriteString(",")
 		}
-		str += strconv.Itoa(n)
+		str.WriteString(strconv.Itoa(n))
 	}
-	return str
+	return str.String()
 }
 
 func (a *arrayInt) Set(str string) error {