3: make ci happy

Signed-off-by: TONG, Zhigao <[email protected]>

Author: solotzg

pkg/executor/BUILD.bazel

@@ -505,7 +505,6 @@ go_test(
         "//pkg/util/topsql/state",
         "@com_github_docker_go_units//:go-units",
         "@com_github_gorilla_mux//:mux",
-        "@com_github_hashicorp_go_version//:go-version",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_pingcap_fn//:fn",

pkg/executor/aggregate/agg_hash_partial_worker.go

@@ -244,8 +244,8 @@ func (w *HashAggPartialWorker) getPartialResultsOfEachRow(groupKey [][]byte, fin
 		delta := mapper[finalWorkerIdx].Set(string(groupKey[i]), w.partialResultsBuffer[lastIdx])
 		allMemDelta += int64(len(groupKey[i]))
 		if delta > 0 {
-			w.partialResultsMapMem.Add(int64(delta))
-			w.memTracker.Consume(int64(delta))
+			w.partialResultsMapMem.Add(delta)
+			w.memTracker.Consume(delta)
 		}
 	}
 	w.partialResultsMapMem.Add(allMemDelta)

pkg/executor/join/BUILD.bazel

@@ -118,7 +118,6 @@ go_test(
         "//pkg/util/chunk",
         "//pkg/util/codec",
         "//pkg/util/disk",
-        "//pkg/util/hack",
         "//pkg/util/memory",
         "//pkg/util/mock",
         "//pkg/util/sqlkiller",

pkg/executor/table_reader.go

@@ -206,7 +206,7 @@ func (e *TableReaderExecutor) setDummy() {
 }
 
 func (e *TableReaderExecutor) memUsage() int64 {
-	const sizeofTableReaderExecutor = int64(unsafe.Sizeof(TableReaderExecutor{}))
+	const sizeofTableReaderExecutor = int64(unsafe.Sizeof(*e))
 
 	res := sizeofTableReaderExecutor
 	res += size.SizeOfPointer * int64(cap(e.ranges))

pkg/kv/BUILD.bazel

@@ -40,7 +40,6 @@ go_library(
         "//pkg/util/logutil",
         "//pkg/util/memory",
         "//pkg/util/resourcegrouptag",
-        "//pkg/util/set",
         "//pkg/util/size",
         "//pkg/util/tiflash",
         "//pkg/util/tiflashcompute",

pkg/kv/key.go

@@ -620,17 +620,17 @@ func (m *MemAwareHandleMap[V]) Get(h Handle) (v V, found bool) {
 	if ph, ok := h.(PartitionHandle); ok {
 		idx := ph.PartitionID
 		if h.IsInt() {
-			if p := m.partitionInts[idx]; p == nil {
+			p := m.partitionInts[idx]
+			if p == nil {
 				return
-			} else {
-				ints = p.M
 			}
+			ints = p.M
 		} else {
-			if p := m.partitionStrs[idx]; p == nil {
+			p := m.partitionStrs[idx]
+			if p == nil {
 				return
-			} else {
-				strs = p.M
 			}
+			strs = p.M
 		}
 	}
 	if h.IsInt() {

pkg/util/hack/BUILD.bazel

@@ -4,7 +4,7 @@ go_library(
     name = "hack",
     srcs = [
         "hack.go",
-        "map_abi.go"
+        "map_abi.go",
     ],
     importpath = "github.com/pingcap/tidb/pkg/util/hack",
     visibility = ["//visibility:public"],
@@ -16,7 +16,7 @@ go_test(
     srcs = [
         "hack_test.go",
         "main_test.go",
-        "map_abi_test.go"
+        "map_abi_test.go",
     ],
     embed = [":hack"],
     flaky = True,

pkg/util/hack/map_abi.go

@@ -219,21 +219,21 @@ func (g *groupsReference) group(typ *swissMapType, i uint64) groupReference {
 	}
 }
 
-type TFlag uint8
-type Kind uint8
-type NameOff int32
-type TypeOff int32
-type TextOff int32
+type abiTFlag uint8
+type abiKind uint8
+type abiNameOff int32
+type abiTypeOff int32
+type abiTextOff int32
 
 // src/internal/abi/type.go:Type
 type abiType struct {
 	Size_       uintptr
-	PtrBytes    uintptr // number of (prefix) bytes in the type that can contain pointers
-	Hash        uint32  // hash of type; avoids computation in hash tables
-	TFlag       TFlag   // extra type information flags
-	Align_      uint8   // alignment of variable with this type
-	FieldAlign_ uint8   // alignment of struct field with this type
-	Kind_       Kind    // enumeration for C
+	PtrBytes    uintptr  // number of (prefix) bytes in the type that can contain pointers
+	Hash        uint32   // hash of type; avoids computation in hash tables
+	TFlag       abiTFlag // extra type information flags
+	Align_      uint8    // alignment of variable with this type
+	FieldAlign_ uint8    // alignment of struct field with this type
+	Kind_       abiKind  // enumeration for C
 	// function for comparing objects of this type
 	// (ptr to object A, ptr to object B) -> ==?
 	Equal func(unsafe.Pointer, unsafe.Pointer) bool
@@ -249,8 +249,8 @@ type abiType struct {
 	// including when TFlagGCMaskOnDemand is set. The types will, of course,
 	// have the same pointer layout (but not necessarily the same size).
 	GCData    *byte
-	Str       NameOff // string form
-	PtrToThis TypeOff // type for pointer to this type, may be zero
+	Str       abiNameOff // string form
+	PtrToThis abiTypeOff // type for pointer to this type, may be zero
 }
 
 // src/internal/abi/map_swiss.go:SwissMapType
@@ -285,6 +285,7 @@ const (
 )
 
 func (g *groupReference) cap(typ *swissMapType) uint64 {
+	_ = g
 	return groupCap(uint64(typ.GroupSize), uint64(typ.SlotSize))
 }
 

pkg/util/hack/map_abi_test.go

@@ -42,17 +42,16 @@ func TestSwissTable(t *testing.T) {
 			for i := range table.groups.lengthMask + 1 {
 				ref := table.groups.group(sm.Type, i)
 				require.True(t, (sm.Type.GroupSize-groupSlotsOffset)%sm.Type.SlotSize == 0)
-				cap := ref.cap(sm.Type)
-				require.True(t, cap == swissMapGroupSlots)
-				for j := range cap {
+				capacity := ref.cap(sm.Type)
+				require.True(t, capacity == swissMapGroupSlots)
+				for j := range capacity {
 					k, v := *(*uint64)(ref.key(sm.Type, uintptr(j))), *(*uint64)(ref.elem(sm.Type, uintptr(j)))
 					if k == 1234 && v == 5678 {
 						require.False(t, found)
 						found = true
 						break
 					}
 				}
-
 			}
 		}
 		require.True(t, found)