Issue Number: ref pingcap#8854

fix CI. Signed-off-by: Ping Yu <[email protected]>
pingyu · Mar 25, 2023 · 0b2afdc · 0b2afdc
1 parent 3fbcde0
commit 0b2afdc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/domain/db_test.go b/domain/db_test.go
@@ -83,7 +83,6 @@ func TestNormalSessionPool(t *testing.T) {
 	svr, err := server.NewServer(conf, nil)
 	require.NoError(t, err)
 	svr.SetDomain(domain)
-	svr.InitGlobalConnID(domain.ServerID)
 	info.SetSessionManager(svr)
 
 	pool := domain.SysSessionPool()
@@ -117,7 +116,6 @@ func TestAbnormalSessionPool(t *testing.T) {
 	svr, err := server.NewServer(conf, nil)
 	require.NoError(t, err)
 	svr.SetDomain(domain)
-	svr.InitGlobalConnID(domain.ServerID)
 	info.SetSessionManager(svr)
 
 	pool := domain.SysSessionPool()

diff --git a/domain/domain.go b/domain/domain.go
diff --git a/server/conn.go b/server/conn.go
diff --git a/server/server.go b/server/server.go
@@ -37,7 +37,6 @@ import (
 	"math/rand"
 	"net"
 	"net/http" //nolint:goimports
-
 	// For pprof
 	_ "net/http/pprof" // #nosec G108
 	"os"

diff --git a/util/BUILD.bazel b/util/BUILD.bazel
@@ -7,6 +7,7 @@ go_library(
         "cpu_windows.go",
         "errors.go",
         "etcd.go",
+        "global_conn_id.go",
         "gogc.go",
         "misc.go",
         "prefix_helper.go",
@@ -38,6 +39,8 @@ go_library(
         "//util/logutil",
         "//util/memory",
         "//util/tls",
+        "@com_github_cznic_mathutil//:mathutil",
+        "@com_github_ngaut_sync2//:sync2",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_pingcap_log//:log",
@@ -56,10 +59,10 @@ go_test(
     timeout = "short",
     srcs = [
         "errors_test.go",
+        "global_conn_id_test.go",
         "main_test.go",
         "misc_test.go",
         "prefix_helper_test.go",
-        "processinfo_test.go",
         "security_test.go",
         "urls_test.go",
         "util_test.go",
@@ -70,7 +73,6 @@ go_test(
     flaky = True,
     shard_count = 50,
     deps = [
-        "//config",
         "//kv",
         "//parser",
         "//parser/model",
@@ -82,6 +84,7 @@ go_test(
         "//types",
         "//util/fastrand",
         "//util/memory",
+        "@com_github_cznic_mathutil//:mathutil",
         "@com_github_pingcap_errors//:errors",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",

diff --git a/util/global_conn_id.go b/util/global_conn_id.go
@@ -77,7 +77,7 @@ func (a *SimpleConnIDAllocator) Init() {
 }
 
 // SetServerIDGetter implements ConnIDAllocator interface.
-func (a *SimpleConnIDAllocator) SetServerIDGetter(_ serverIDGetterFn) {
+func (*SimpleConnIDAllocator) SetServerIDGetter(_ serverIDGetterFn) {
 	// do nothing
 }
 
@@ -93,7 +93,7 @@ func (a *SimpleConnIDAllocator) Release(id uint64) {
 }
 
 // GetReservedConnID implements ConnIDAllocator interface.
-func (a *SimpleConnIDAllocator) GetReservedConnID(reservedNo uint64) uint64 {
+func (*SimpleConnIDAllocator) GetReservedConnID(reservedNo uint64) uint64 {
 	return reservedNo
 }
 
@@ -364,9 +364,9 @@ func (p *AutoIncPool) Put(id uint64) (ok bool) {
 func (p *AutoIncPool) Len() int {
 	if p.existed != nil {
 		p.mu.Lock()
-		len := len(p.existed)
+		length := len(p.existed)
 		p.mu.Unlock()
-		return len
+		return length
 	}
 	return -1
 }
@@ -452,10 +452,10 @@ func (p LockFreeCircularPool) String() string {
 	tail := p.tail.Get()
 	headSlot := &p.slots[head&(p.cap-1)]
 	tailSlot := &p.slots[tail&(p.cap-1)]
-	len := tail - head
+	length := tail - head
 
-	return fmt.Sprintf("cap:%v, len:%v; head:%x, slot:{%x,%x}; tail:%x, slot:{%x,%x}",
-		p.cap, len, head, headSlot.value, headSlot.seq, tail, tailSlot.value, tailSlot.seq)
+	return fmt.Sprintf("cap:%v, length:%v; head:%x, slot:{%x,%x}; tail:%x, slot:{%x,%x}",
+		p.cap, length, head, headSlot.value, headSlot.seq, tail, tailSlot.value, tailSlot.seq)
 }
 
 // Put implements IDPool interface.

diff --git a/util/global_conn_id_test.go b/util/global_conn_id_test.go
@@ -255,10 +255,10 @@ func (p LockBasedCircularPool) String() string {
 	tail := p.tail
 	headVal := p.slots[head&(p.cap-1)]
 	tailVal := p.slots[tail&(p.cap-1)]
-	len := tail - head
+	length := tail - head
 
 	return fmt.Sprintf("cap:%v, len:%v; head:%x, slot:{%x}; tail:%x, slot:{%x}",
-		p.cap, len, head, headVal, tail, tailVal)
+		p.cap, length, head, headVal, tail, tailVal)
 }
 
 func (p *LockBasedCircularPool) Put(val uint64) (ok bool) {