*: format files according to gofmt

Run `gofmt -s -w` across all files, excluding the `vendor` directory using the `make format` target. Most of these changes are adding the equivalent `//go:build` lines to source files that are built conditionally (per the [Go 1.17 release notes][1]). [1]: https://go.dev/doc/go1.17
cockroachdb · Nov 30, 2021 · 7fb375f · 7fb375f
1 parent fc3ffab
commit 7fb375f
Show file tree

Hide file tree

Showing 54 changed files with 118 additions and 72 deletions.
diff --git a/cmd/pebble/ycsb.go b/cmd/pebble/ycsb.go
@@ -125,27 +125,27 @@ func (w ycsbWeights) get(i int) float64 {
 }
 
 var ycsbWorkloads = map[string]ycsbWeights{
-	"A": ycsbWeights{
+	"A": {
 		ycsbRead:   0.5,
 		ycsbUpdate: 0.5,
 	},
-	"B": ycsbWeights{
+	"B": {
 		ycsbRead:   0.95,
 		ycsbUpdate: 0.05,
 	},
-	"C": ycsbWeights{
+	"C": {
 		ycsbRead: 1.0,
 	},
-	"D": ycsbWeights{
+	"D": {
 		ycsbInsert: 0.05,
 		ycsbRead:   0.95,
 		// TODO(peter): default to skewed-latest distribution.
 	},
-	"E": ycsbWeights{
+	"E": {
 		ycsbInsert: 0.05,
 		ycsbScan:   0.95,
 	},
-	"F": ycsbWeights{
+	"F": {
 		ycsbInsert: 1.0,
 		// TODO(peter): the real workload is read-modify-write.
 	},

diff --git a/internal/arenaskl/race_test.go b/internal/arenaskl/race_test.go
@@ -1,3 +1,4 @@
+//go:build race
 // +build race
 
 // Copyright 2020 The LevelDB-Go and Pebble Authors. All rights reserved. Use

diff --git a/internal/cache/cgo_disabled.go b/internal/cache/cgo_disabled.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build !cgo
 // +build !cgo
 
 package cache

diff --git a/internal/cache/cgo_enabled.go b/internal/cache/cgo_enabled.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build cgo
 // +build cgo
 
 package cache

diff --git a/internal/cache/entry_invariants.go b/internal/cache/entry_invariants.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 //
+//go:build (invariants && !race) || (tracing && !race)
 // +build invariants,!race tracing,!race
 
 package cache

diff --git a/internal/cache/entry_normal.go b/internal/cache/entry_normal.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 //
+//go:build (!invariants && !tracing) || race
 // +build !invariants,!tracing race
 
 package cache

diff --git a/internal/cache/refcnt_normal.go b/internal/cache/refcnt_normal.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build !tracing
 // +build !tracing
 
 package cache

diff --git a/internal/cache/refcnt_tracing.go b/internal/cache/refcnt_tracing.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build tracing
 // +build tracing
 
 package cache

diff --git a/internal/cache/value_invariants.go b/internal/cache/value_invariants.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build (invariants && !race) || (tracing && !race)
 // +build invariants,!race tracing,!race
 
 package cache

diff --git a/internal/cache/value_normal.go b/internal/cache/value_normal.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build (!invariants && !tracing) || race
 // +build !invariants,!tracing race
 
 package cache

diff --git a/internal/invariants/finalizer_off.go b/internal/invariants/finalizer_off.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build (!invariants && !tracing) || race
 // +build !invariants,!tracing race
 
 package invariants

diff --git a/internal/invariants/finalizer_on.go b/internal/invariants/finalizer_on.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build (invariants && !race) || (tracing && !race)
 // +build invariants,!race tracing,!race
 
 package invariants

diff --git a/internal/invariants/off.go b/internal/invariants/off.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build !invariants && !race
 // +build !invariants,!race
 
 package invariants

diff --git a/internal/invariants/on.go b/internal/invariants/on.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build invariants || race
 // +build invariants race
 
 package invariants

diff --git a/internal/invariants/race_off.go b/internal/invariants/race_off.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build !race
 // +build !race
 
 package invariants

diff --git a/internal/invariants/race_on.go b/internal/invariants/race_on.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build race
 // +build race
 
 package invariants

diff --git a/internal/manual/manual_32bit.go b/internal/manual/manual_32bit.go
@@ -2,7 +2,8 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
-// +build 386 amd64p32 arm armbe  mips mipsle mips64p32 mips64p32le ppc sparc
+//go:build 386 || amd64p32 || arm || armbe || mips || mipsle || mips64p32 || mips64p32le || ppc || sparc
+// +build 386 amd64p32 arm armbe mips mipsle mips64p32 mips64p32le ppc sparc
 
 package manual
 

diff --git a/internal/manual/manual_64bit.go b/internal/manual/manual_64bit.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build amd64 || arm64 || arm64be || ppc64 || ppc64le || mips64 || mips64le || s390x || sparc64
 // +build amd64 arm64 arm64be ppc64 ppc64le mips64 mips64le s390x sparc64
 
 package manual

diff --git a/internal/manual/manual_nocgo.go b/internal/manual/manual_nocgo.go
@@ -2,6 +2,7 @@
 // of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build !cgo
 // +build !cgo
 
 package manual

diff --git a/internal/metamorphic/generator.go b/internal/metamorphic/generator.go
@@ -330,7 +330,7 @@ func (g *generator) newIter() {
 	if iters := g.readers[readerID]; iters != nil {
 		iters[iterID] = struct{}{}
 		g.iters[iterID] = iters
-	//lint:ignore SA9003 - readability
+		//lint:ignore SA9003 - readability
 	} else {
 		// NB: the DB object does not track its open iterators because it never
 		// closes.
@@ -369,7 +369,7 @@ func (g *generator) newIterUsingClone() {
 	if iters := g.iters[existingIterID]; iters != nil {
 		iters[iterID] = struct{}{}
 		g.iters[iterID] = iters
-	//lint:ignore SA9003 - readability
+		//lint:ignore SA9003 - readability
 	} else {
 		// NB: the DB object does not track its open iterators because it never
 		// closes.
@@ -391,7 +391,7 @@ func (g *generator) iterClose() {
 	if readerIters, ok := g.iters[iterID]; ok {
 		delete(g.iters, iterID)
 		delete(readerIters, iterID)
-	//lint:ignore SA9003 - readability
+		//lint:ignore SA9003 - readability
 	} else {
 		// NB: the DB object does not track its open iterators because it never
 		// closes.

diff --git a/internal/metamorphic/key_manager.go b/internal/metamorphic/key_manager.go
@@ -34,9 +34,9 @@ type keyMeta struct {
 	objKey
 
 	// The number of Sets of the key in this writer.
-	sets      int
+	sets int
 	// The number of Merges of the key in this writer.
-	merges    int
+	merges int
 	// singleDel can be true only if sets <= 1 && merges == 0 and the
 	// SingleDelete was added to this writer after the set.
 	singleDel bool
@@ -102,11 +102,11 @@ type keyManager struct {
 	byObjKey map[string]*keyMeta
 	// List of keys per writer, and what has happened to it in that writer.
 	// Will be transferred when needed.
-	byObj    map[objID][]*keyMeta
+	byObj map[objID][]*keyMeta
 
 	// globalKeys represents all the keys that have been generated so far. Not
 	// all these keys have been written to.
-	globalKeys     [][]byte
+	globalKeys [][]byte
 	// globalKeysMap contains the same keys as globalKeys. It ensures no
 	// duplication, and contains the aggregate state of the key across all
 	// writers, including inflight state that has not made its way to the DB
@@ -161,8 +161,8 @@ var dbObjID objID = makeObjID(dbTag, 0)
 // canTolerateApplyFailure methods only.
 func newKeyManager() *keyManager {
 	m := &keyManager{
-		byObjKey:       make(map[string]*keyMeta),
-		byObj:          make(map[objID][]*keyMeta),
+		byObjKey:      make(map[string]*keyMeta),
+		byObj:         make(map[objID][]*keyMeta),
 		globalKeysMap: make(map[string]*keyMeta),
 	}
 	m.byObj[dbObjID] = []*keyMeta{}
@@ -298,7 +298,7 @@ func (k *keyManager) update(o op) {
 	case *setOp:
 		meta := k.getOrInit(s.writerID, s.key)
 		globalMeta := k.globalKeysMap[string(s.key)]
-		meta.sets++           // Update the set count on this specific (id, key) pair.
+		meta.sets++ // Update the set count on this specific (id, key) pair.
 		meta.del = false
 		globalMeta.sets++
 		if meta.singleDel || globalMeta.singleDel {
@@ -396,7 +396,7 @@ func (k *keyManager) eligibleSingleDeleteKeys(id objID) (keys [][]byte) {
 
 func (k *keyManager) globalStateIndicatesEligibleForSingleDelete(key []byte) bool {
 	m := k.globalKeysMap[string(key)]
-	return m.merges==0 && m.sets==1 && m.dels==0 && !m.singleDel
+	return m.merges == 0 && m.sets == 1 && m.dels == 0 && !m.singleDel
 }
 
 // canTolerateApplyFailure is called with a batch ID and returns true iff a

diff --git a/internal/metamorphic/key_manager_test.go b/internal/metamorphic/key_manager_test.go
@@ -67,14 +67,14 @@ func TestGlobalStateIndicatesEligibleForSingleDelete(t *testing.T) {
 			meta: keyMeta{
 				objKey: key,
 				sets:   1,
-				dels: 1,
+				dels:   1,
 			},
 			want: false,
 		},
 		{
 			meta: keyMeta{
-				objKey: key,
-				sets:   1,
+				objKey:    key,
+				sets:      1,
 				singleDel: true,
 			},
 			want: false,
@@ -93,7 +93,7 @@ func TestGlobalStateIndicatesEligibleForSingleDelete(t *testing.T) {
 func TestKeyMeta_MergeInto(t *testing.T) {
 	testCases := []struct {
 		existing keyMeta
-		toMerge keyMeta
+		toMerge  keyMeta
 		expected keyMeta
 	}{
 		{
@@ -107,49 +107,49 @@ func TestKeyMeta_MergeInto(t *testing.T) {
 				merges:    0,
 				singleDel: true,
 			},
-			expected: keyMeta {
+			expected: keyMeta{
 				sets:      1,
 				merges:    0,
 				singleDel: true,
 			},
 		},
 		{
 			existing: keyMeta{
-				sets:      3,
-				merges:    1,
-				dels: 7,
+				sets:   3,
+				merges: 1,
+				dels:   7,
 			},
 			toMerge: keyMeta{
-				sets:      4,
-				merges:    2,
-				dels: 8,
-				del: true,
+				sets:   4,
+				merges: 2,
+				dels:   8,
+				del:    true,
 			},
-			expected: keyMeta {
-				sets:      7,
-				merges:    3,
-				dels: 15,
-				del: true,
+			expected: keyMeta{
+				sets:   7,
+				merges: 3,
+				dels:   15,
+				del:    true,
 			},
 		},
 		{
 			existing: keyMeta{
-				sets:      3,
-				merges:    1,
-				dels: 7,
-				del: true,
+				sets:   3,
+				merges: 1,
+				dels:   7,
+				del:    true,
 			},
 			toMerge: keyMeta{
-				sets:      1,
-				merges:    0,
-				dels: 8,
-				del: false,
+				sets:   1,
+				merges: 0,
+				dels:   8,
+				del:    false,
 			},
-			expected: keyMeta {
-				sets:      4,
-				merges:    1,
-				dels: 15,
-				del: false,
+			expected: keyMeta{
+				sets:   4,
+				merges: 1,
+				dels:   15,
+				del:    false,
 			},
 		},
 	}