Skip to content

Commit 14a14f7

Browse files
serprexlance6716
serprex
and
lance6716
authored
lint: gofumpt (#996)
* lint: gofumpt * golangci-lint --fix --------- Co-authored-by: lance6716 <[email protected]>
1 parent c27ce4a commit 14a14f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+262
-236
lines changed

‎.golangci.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ linters:
33
enable:
44
# All code is ready for:
55
- errcheck
6-
- staticcheck
7-
- typecheck
8-
- unused
9-
- misspell
10-
- nolintlint
6+
- gofumpt
117
- goimports
12-
- nakedret
13-
- unconvert
14-
- whitespace
158
- govet
169
- gosimple
1710
- ineffassign
11+
- misspell
12+
- nakedret
13+
- nolintlint
14+
- staticcheck
15+
- typecheck
16+
- unconvert
17+
- unused
18+
- whitespace
1819
# ToDo:
1920
#- gocritic
2021
#- golint

‎canal/canal.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ type Canal struct {
5858
}
5959

6060
// canal will retry fetching unknown table's meta after UnknownTableRetryPeriod
61-
var UnknownTableRetryPeriod = time.Second * time.Duration(10)
62-
var ErrExcludedTable = errors.New("excluded table meta")
61+
var (
62+
UnknownTableRetryPeriod = time.Second * time.Duration(10)
63+
ErrExcludedTable = errors.New("excluded table meta")
64+
)
6365

6466
func NewCanal(cfg *Config) (*Canal, error) {
6567
c := new(Canal)

‎canal/canal_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ func TestCreateTableExp(t *testing.T) {
230230
}
231231
}
232232
}
233+
233234
func TestAlterTableExp(t *testing.T) {
234235
cases := []string{
235236
"ALTER TABLE /*generated by server*/ `mydb`.`mytable` ADD `field2` DATE NULL AFTER `field1`;",

‎canal/handler.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ type EventHandler interface {
2424
String() string
2525
}
2626

27-
type DummyEventHandler struct {
28-
}
27+
type DummyEventHandler struct{}
2928

3029
func (h *DummyEventHandler) OnRotate(*replication.EventHeader, *replication.RotateEvent) error {
3130
return nil
3231
}
32+
3333
func (h *DummyEventHandler) OnTableChanged(*replication.EventHeader, string, string) error {
3434
return nil
3535
}
36+
3637
func (h *DummyEventHandler) OnDDL(*replication.EventHeader, mysql.Position, *replication.QueryEvent) error {
3738
return nil
3839
}
@@ -41,9 +42,11 @@ func (h *DummyEventHandler) OnXID(*replication.EventHeader, mysql.Position) erro
4142
func (h *DummyEventHandler) OnGTID(*replication.EventHeader, mysql.BinlogGTIDEvent) error {
4243
return nil
4344
}
45+
4446
func (h *DummyEventHandler) OnPosSynced(*replication.EventHeader, mysql.Position, mysql.GTIDSet, bool) error {
4547
return nil
4648
}
49+
4750
func (h *DummyEventHandler) OnRowsQueryEvent(*replication.RowsQueryEvent) error {
4851
return nil
4952
}

‎canal/rows_test.go

+16-12
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,24 @@ func TestRowsEvent_handleUnsigned(t *testing.T) {
2828
// column 10 is out of range and should be ignored, don't panic.
2929
UnsignedColumns: []int{1, 3, 5, 7, 9, 10},
3030
},
31-
Rows: [][]interface{}{{
32-
int8(8), int8(8),
33-
int16(16), int16(16),
34-
int32(32), int32(32),
35-
int64(64), int64(64),
36-
int(128), int(128)},
31+
Rows: [][]interface{}{
32+
{
33+
int8(8), int8(8),
34+
int16(16), int16(16),
35+
int32(32), int32(32),
36+
int64(64), int64(64),
37+
int(128), int(128),
38+
},
3739
},
3840
},
39-
wantRows: [][]interface{}{{
40-
int8(8), uint8(8),
41-
int16(16), uint16(16),
42-
int32(32), uint32(32),
43-
int64(64), uint64(64),
44-
int(128), uint(128)},
41+
wantRows: [][]interface{}{
42+
{
43+
int8(8), uint8(8),
44+
int16(16), uint16(16),
45+
int32(32), uint32(32),
46+
int64(64), uint64(64),
47+
int(128), uint(128),
48+
},
4549
},
4650
},
4751
}

‎canal/sync.go

+1
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ func (c *Canal) updateTable(header *replication.EventHeader, db, table string) (
252252
}
253253
return
254254
}
255+
255256
func (c *Canal) updateReplicationDelay(ev *replication.BinlogEvent) {
256257
var newDelay uint32
257258
now := uint32(utils.Now().Unix())

‎client/common_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"flag"
55
)
66

7-
var testUser = flag.String("user", "root", "MySQL user")
8-
var testPassword = flag.String("pass", "", "MySQL password")
9-
var testDB = flag.String("db", "test", "MySQL test database")
7+
var (
8+
testUser = flag.String("user", "root", "MySQL user")
9+
testPassword = flag.String("pass", "", "MySQL password")
10+
testDB = flag.String("db", "test", "MySQL test database")
11+
)

‎client/conn_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func (s *connTestSuite) TestSetQueryAttributes() {
203203
err := s.c.SetQueryAttributes(qa)
204204
require.NoError(s.T(), err)
205205
expected := []mysql.QueryAttribute{
206-
mysql.QueryAttribute{
206+
{
207207
Name: "qattr1",
208208
Value: "qattr1val",
209209
},

‎client/example_client_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ func Example() {
1111
// Connect MySQL at 127.0.0.1:3306, with user root, an empty password and database test
1212
conn, err := client.Connect("127.0.0.1:3306", "root", "", "test")
1313
// Or to use SSL/TLS connection if MySQL server supports TLS
14-
//conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.UseSSL(true)})
15-
14+
// conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.UseSSL(true)})
1615
// Or to set your own client-side certificates for identity verification for security
17-
//tlsConfig := NewClientTLSConfig(caPem, certPem, keyPem, false, "your-server-name")
18-
//conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.SetTLSConfig(tlsConfig)})
16+
// tlsConfig := NewClientTLSConfig(caPem, certPem, keyPem, false, "your-server-name")
17+
// conn, err := client.Connect("127.0.0.1:3306", "root", "", "test", func(c *Conn) {c.SetTLSConfig(tlsConfig)})
1918
if err != nil {
2019
msg := fmt.Sprintf(`
2120
This example needs a MySQL listening on 127.0.0.1:3006 with user "root" and

‎client/pool.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -569,9 +569,9 @@ func (pool *Pool) ping(conn *Conn) error {
569569
// So before call Close, Call PutConn to put all connections that in use back to connection pool first.
570570
func (pool *Pool) Close() {
571571
pool.cancel()
572-
//wait newConnectionProducer exit.
572+
// wait newConnectionProducer exit.
573573
pool.wg.Wait()
574-
//close idle connections
574+
// close idle connections
575575
pool.synchro.Lock()
576576
for _, connection := range pool.synchro.idleConnections {
577577
pool.synchro.stats.TotalCount--

‎client/req.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ func (c *Conn) writeCommand(command byte) error {
88
c.ResetSequence()
99

1010
return c.WritePacket([]byte{
11-
0x01, //1 bytes long
11+
0x01, // 1 bytes long
1212
0x00,
1313
0x00,
14-
0x00, //sequence
14+
0x00, // sequence
1515
command,
1616
})
1717
}
@@ -41,10 +41,10 @@ func (c *Conn) writeCommandUint32(command byte, arg uint32) error {
4141

4242
buf := utils.ByteSliceGet(9)
4343

44-
buf.B[0] = 0x05 //5 bytes long
44+
buf.B[0] = 0x05 // 5 bytes long
4545
buf.B[1] = 0x00
4646
buf.B[2] = 0x00
47-
buf.B[3] = 0x00 //sequence
47+
buf.B[3] = 0x00 // sequence
4848

4949
buf.B[4] = command
5050

‎client/resp.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ func (c *Conn) readUntilEOF() (err error) {
1919

2020
for {
2121
data, err = c.ReadPacket()
22-
2322
if err != nil {
2423
return
2524
}
@@ -37,7 +36,7 @@ func (c *Conn) isEOFPacket(data []byte) bool {
3736

3837
func (c *Conn) handleOKPacket(data []byte) (*mysql.Result, error) {
3938
var n int
40-
var pos = 1
39+
pos := 1
4140

4241
r := mysql.NewResultReserveResultset(0)
4342

@@ -69,7 +68,7 @@ func (c *Conn) handleOKPacket(data []byte) (*mysql.Result, error) {
6968
func (c *Conn) handleErrorPacket(data []byte) error {
7069
e := new(mysql.MyError)
7170

72-
var pos = 1
71+
pos := 1
7372

7473
e.Code = binary.LittleEndian.Uint16(data[pos:])
7574
pos += 2
@@ -334,7 +333,7 @@ func (c *Conn) readResultsetStreaming(data []byte, binary bool, result *mysql.Re
334333
}
335334

336335
func (c *Conn) readResultColumns(result *mysql.Result) (err error) {
337-
var i = 0
336+
i := 0
338337
var data []byte
339338

340339
for {
@@ -413,7 +412,6 @@ func (c *Conn) readResultRows(result *mysql.Result, isBinary bool) (err error) {
413412

414413
for i := range result.Values {
415414
result.Values[i], err = result.RowDatas[i].Parse(result.Fields, isBinary, result.Values[i])
416-
417415
if err != nil {
418416
return errors.Trace(err)
419417
}

‎client/stmt.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (s *Stmt) write(args ...interface{}) error {
8383
paramValues := make([][]byte, paramsNum+qaLen)
8484
paramNames := make([][]byte, paramsNum+qaLen)
8585

86-
//NULL-bitmap, length: (num-params+7)
86+
// NULL-bitmap, length: (num-params+7)
8787
nullBitmap := make([]byte, (paramsNum+qaLen+7)>>3)
8888

8989
length := 1 + 4 + 1 + 4 + ((paramsNum + 7) >> 3) + 1 + (paramsNum << 1)
@@ -195,7 +195,7 @@ func (s *Stmt) write(args ...interface{}) error {
195195
}
196196
data.WriteByte(flags)
197197

198-
//iteration-count, always 1
198+
// iteration-count, always 1
199199
data.Write([]byte{1, 0, 0, 0})
200200

201201
if paramsNum > 0 || (s.conn.capability&mysql.CLIENT_QUERY_ATTRIBUTES > 0 && (flags&mysql.PARAMETER_COUNT_AVAILABLE > 0)) {
@@ -206,7 +206,7 @@ func (s *Stmt) write(args ...interface{}) error {
206206
if paramsNum > 0 {
207207
data.Write(nullBitmap)
208208

209-
//new-params-bound-flag
209+
// new-params-bound-flag
210210
data.WriteByte(newParamBoundFlag)
211211

212212
if newParamBoundFlag == 1 {
@@ -219,7 +219,7 @@ func (s *Stmt) write(args ...interface{}) error {
219219
}
220220
}
221221

222-
//value of each parameter
222+
// value of each parameter
223223
for _, v := range paramValues {
224224
data.Write(v)
225225
}
@@ -253,19 +253,19 @@ func (c *Conn) Prepare(query string) (*Stmt, error) {
253253

254254
pos := 1
255255

256-
//for statement id
256+
// for statement id
257257
s.id = binary.LittleEndian.Uint32(data[pos:])
258258
pos += 4
259259

260-
//number columns
260+
// number columns
261261
s.columns = int(binary.LittleEndian.Uint16(data[pos:]))
262262
pos += 2
263263

264-
//number params
264+
// number params
265265
s.params = int(binary.LittleEndian.Uint16(data[pos:]))
266266
pos += 2
267267

268-
//warnings
268+
// warnings
269269
s.warnings = int(binary.LittleEndian.Uint16(data[pos:]))
270270
// pos += 2
271271

‎cmd/go-binlogparser/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ func main() {
2323
}
2424

2525
err := p.ParseFile(*name, *offset, f)
26-
2726
if err != nil {
2827
println(err.Error())
2928
}

‎cmd/go-mysqldump/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ func main() {
5353
d.AddDatabases(subs...)
5454
}
5555

56-
var f = os.Stdout
56+
f := os.Stdout
5757

5858
if len(*output) > 0 {
59-
f, err = os.OpenFile(*output, os.O_CREATE|os.O_WRONLY, 0644)
59+
f, err = os.OpenFile(*output, os.O_CREATE|os.O_WRONLY, 0o644)
6060
if err != nil {
6161
fmt.Printf("Open file error %v\n", errors.ErrorStack(err))
6262
os.Exit(1)

‎compress/zlib.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ var (
2727
}
2828
)
2929

30-
var _ io.WriteCloser = zlibWriter{}
31-
var _ io.ReadCloser = zlibReader{}
30+
var (
31+
_ io.WriteCloser = zlibWriter{}
32+
_ io.ReadCloser = zlibReader{}
33+
)
3234

3335
type zlibWriter struct {
3436
w *zlib.Writer

‎driver/driver.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ var (
3939
namedValueCheckers []CheckNamedValueFunc
4040
)
4141

42-
type driver struct {
43-
}
42+
type driver struct{}
4443

4544
type connInfo struct {
4645
standardDSN bool
@@ -109,7 +108,6 @@ func (d driver) Open(dsn string) (sqldriver.Conn, error) {
109108
)
110109

111110
ci, err := parseDSN(dsn)
112-
113111
if err != nil {
114112
return nil, err
115113
}
@@ -184,8 +182,10 @@ func (d driver) Open(dsn string) (sqldriver.Conn, error) {
184182

185183
type CheckNamedValueFunc func(*sqldriver.NamedValue) error
186184

187-
var _ sqldriver.NamedValueChecker = &conn{}
188-
var _ sqldriver.Validator = &conn{}
185+
var (
186+
_ sqldriver.NamedValueChecker = &conn{}
187+
_ sqldriver.Validator = &conn{}
188+
)
189189

190190
type state struct {
191191
valid bool

‎driver/driver_options_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ func (h *mockHandler) handleQuery(query string, binary bool, args []interface{})
333333
case "select":
334334
var r *mysql.Resultset
335335
var err error
336-
//for handle go mysql driver select @@max_allowed_packet
336+
// for handle go mysql driver select @@max_allowed_packet
337337
if strings.Contains(strings.ToLower(query), "max_allowed_packet") {
338338
r, err = mysql.BuildSimpleResultset([]string{"@@max_allowed_packet"}, [][]interface{}{
339339
{mysql.MaxPayloadLen},

‎driver/driver_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ import (
1313
"github.com/go-mysql-org/go-mysql/test_util"
1414
)
1515

16-
var testUser = flag.String("user", "root", "MySQL user")
17-
var testPassword = flag.String("pass", "", "MySQL password")
18-
var testDB = flag.String("db", "test", "MySQL test database")
16+
var (
17+
testUser = flag.String("user", "root", "MySQL user")
18+
testPassword = flag.String("pass", "", "MySQL password")
19+
testDB = flag.String("db", "test", "MySQL test database")
20+
)
1921

2022
func TestDriver(t *testing.T) {
2123
suite.Run(t, new(testDriverSuite))

0 commit comments

Comments
 (0)