remove rest of siddontang/go dependencies

serprex · serprex · commit 7e624ef0aa4d · 2024-12-15T01:46:14.000Z
diff --git a/driver/driver_options_test.go b/driver/driver_options_test.go
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go/log"
+	"github.com/siddontang/go-log/log"
 	"github.com/stretchr/testify/require"
 
 	"github.com/go-mysql-org/go-mysql/client"
diff --git a/go.mod b/go.mod
@@ -15,7 +15,6 @@ require (
 	github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb
 	github.com/pingcap/tidb/pkg/parser v0.0.0-20241118164214-4f047be191be
 	github.com/shopspring/decimal v1.2.0
-	github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
 	github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07
 	github.com/stretchr/testify v1.8.4
 )
diff --git a/go.sum b/go.sum
@@ -48,8 +48,6 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 h1:xT+JlYxNGqyT+XcU8iUrN18JYed2TvG9yN5ULG2jATM=
-github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
 github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 h1:oI+RNwuC9jF2g2lP0u0cVEEZrc/AYBCuFdvwrLWM/6Q=
 github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07/go.mod h1:yFdBgwXP24JziuRl2NMUahT7nGLNOKi1SIiFxMttVD4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
diff --git a/server/conn.go b/server/conn.go
@@ -5,8 +5,6 @@ import (
 	"net"
 	"sync/atomic"
 
-	"github.com/siddontang/go/sync2"
-
 	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/go-mysql-org/go-mysql/packet"
 )
@@ -35,7 +33,7 @@ type Conn struct {
 	stmts  map[uint32]*Stmt
 	stmtID uint32
 
-	closed sync2.AtomicBool
+	closed atomic.Bool
 }
 
 var baseConnID uint32 = 10000
@@ -61,7 +59,7 @@ func NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, err
 		stmts:              make(map[uint32]*Stmt),
 		salt:               RandomBuf(20),
 	}
-	c.closed.Set(false)
+	c.closed.Store(false)
 
 	if err := c.handshake(); err != nil {
 		c.Close()
@@ -89,7 +87,7 @@ func NewCustomizedConn(conn net.Conn, serverConf *Server, p CredentialProvider,
 		stmts:              make(map[uint32]*Stmt),
 		salt:               RandomBuf(20),
 	}
-	c.closed.Set(false)
+	c.closed.Store(false)
 
 	if err := c.handshake(); err != nil {
 		c.Close()
@@ -126,12 +124,12 @@ func (c *Conn) handshake() error {
 }
 
 func (c *Conn) Close() {
-	c.closed.Set(true)
+	c.closed.Store(true)
 	c.Conn.Close()
 }
 
 func (c *Conn) Closed() bool {
-	return c.closed.Get()
+	return c.closed.Load()
 }
 
 func (c *Conn) GetUser() string {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ require (`
`15`	`15`	`github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb`
`16`	`16`	`github.com/pingcap/tidb/pkg/parser v0.0.0-20241118164214-4f047be191be`
`17`	`17`	`github.com/shopspring/decimal v1.2.0`
`18`		`- github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726`
`19`	`18`	`github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07`
`20`	`19`	`github.com/stretchr/testify v1.8.4`
`21`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ import (`
`5`	`5`	`"net"`
`6`	`6`	`"sync/atomic"`
`7`	`7`
`8`		`- "github.com/siddontang/go/sync2"`
`9`		`-`
`10`	`8`	`. "github.com/go-mysql-org/go-mysql/mysql"`
`11`	`9`	`"github.com/go-mysql-org/go-mysql/packet"`
`12`	`10`	`)`
`@@ -35,7 +33,7 @@ type Conn struct {`
`35`	`33`	`stmts map[uint32]*Stmt`
`36`	`34`	`stmtID uint32`
`37`	`35`
`38`		`- closed sync2.AtomicBool`
	`36`	`+ closed atomic.Bool`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`var baseConnID uint32 = 10000`
`@@ -61,7 +59,7 @@ func NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, err`
`61`	`59`	`stmts: make(map[uint32]*Stmt),`
`62`	`60`	`salt: RandomBuf(20),`
`63`	`61`	`}`
`64`		`- c.closed.Set(false)`
	`62`	`+ c.closed.Store(false)`
`65`	`63`
`66`	`64`	`if err := c.handshake(); err != nil {`
`67`	`65`	`c.Close()`
`@@ -89,7 +87,7 @@ func NewCustomizedConn(conn net.Conn, serverConf *Server, p CredentialProvider,`
`89`	`87`	`stmts: make(map[uint32]*Stmt),`
`90`	`88`	`salt: RandomBuf(20),`
`91`	`89`	`}`
`92`		`- c.closed.Set(false)`
	`90`	`+ c.closed.Store(false)`
`93`	`91`
`94`	`92`	`if err := c.handshake(); err != nil {`
`95`	`93`	`c.Close()`
`@@ -126,12 +124,12 @@ func (c *Conn) handshake() error {`
`126`	`124`	`}`
`127`	`125`
`128`	`126`	`func (c *Conn) Close() {`
`129`		`- c.closed.Set(true)`
	`127`	`+ c.closed.Store(true)`
`130`	`128`	`c.Conn.Close()`
`131`	`129`	`}`
`132`	`130`
`133`	`131`	`func (c *Conn) Closed() bool {`
`134`		`- return c.closed.Get()`
	`132`	`+ return c.closed.Load()`
`135`	`133`	`}`
`136`	`134`
`137`	`135`	`func (c *Conn) GetUser() string {`