Skip to content

Commit 417b93a

Browse files
serprexserprex
authored
apply golangci-lint fix (#1024)
1 parent 50aece7 commit 417b93a

File tree

15 files changed

+91
-78
lines changed

15 files changed

+91
-78
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
with:
101101
go-version: stable
102102
- name: golangci-lint
103-
uses: golangci/golangci-lint-action@v6
103+
uses: golangci/golangci-lint-action@v7
104104
with:
105105
version: latest
106106
args: --timeout=3m

‎.golangci.yml

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,47 @@
1+
version: "2"
12
linters:
2-
disable-all: true
3+
default: none
34
enable:
4-
# All code is ready for:
55
- errcheck
6-
- gofumpt
7-
- goimports
86
- govet
9-
- gosimple
107
- ineffassign
118
- misspell
129
- nakedret
1310
- nolintlint
1411
- staticcheck
15-
- typecheck
1612
- unconvert
1713
- unused
1814
- whitespace
19-
# ToDo:
20-
#- gocritic
21-
#- golint
22-
linters-settings:
23-
nolintlint:
24-
allow-unused: false
25-
require-specific: true
26-
27-
govet:
28-
enable-all: true
29-
disable:
30-
- fieldalignment
31-
- lostcancel
32-
- shadow
33-
issues:
34-
exclude-files:
35-
- client/examples_test.go
15+
settings:
16+
govet:
17+
disable:
18+
- fieldalignment
19+
- lostcancel
20+
- shadow
21+
enable-all: true
22+
nolintlint:
23+
require-specific: true
24+
allow-unused: false
25+
exclusions:
26+
generated: lax
27+
presets:
28+
- comments
29+
- common-false-positives
30+
- legacy
31+
- std-error-handling
32+
paths:
33+
- client/examples_test.go
34+
- third_party$
35+
- builtin$
36+
- examples$
37+
formatters:
38+
enable:
39+
- gofumpt
40+
- goimports
41+
exclusions:
42+
generated: lax
43+
paths:
44+
- client/examples_test.go
45+
- third_party$
46+
- builtin$
47+
- examples$

‎client/conn.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ func ConnectWithDialer(ctx context.Context, network, addr, user, password, dbNam
152152

153153
c.Conn = packet.NewConnWithTimeout(conn, c.ReadTimeout, c.WriteTimeout, c.BufferSize)
154154
if c.tlsConfig != nil {
155-
seq := c.Conn.Sequence
155+
seq := c.Sequence
156156
c.Conn = packet.NewTLSConnWithTimeout(conn, c.ReadTimeout, c.WriteTimeout)
157-
c.Conn.Sequence = seq
157+
c.Sequence = seq
158158
}
159159

160160
if err = c.handshake(); err != nil {
@@ -163,9 +163,9 @@ func ConnectWithDialer(ctx context.Context, network, addr, user, password, dbNam
163163
}
164164

165165
if c.ccaps&mysql.CLIENT_COMPRESS > 0 {
166-
c.Conn.Compression = mysql.MYSQL_COMPRESS_ZLIB
166+
c.Compression = mysql.MYSQL_COMPRESS_ZLIB
167167
} else if c.ccaps&mysql.CLIENT_ZSTD_COMPRESSION_ALGORITHM > 0 {
168-
c.Conn.Compression = mysql.MYSQL_COMPRESS_ZSTD
168+
c.Compression = mysql.MYSQL_COMPRESS_ZSTD
169169
}
170170

171171
// if a collation was set with a ID of > 255, then we need to call SET NAMES ...

‎client/conn_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ func (s *connTestSuite) TestExecuteMultiple() {
119119
// also, since this is not the last query, the SERVER_MORE_RESULTS_EXISTS
120120
// flag should be set
121121
require.True(s.T(), result.Status&mysql.SERVER_MORE_RESULTS_EXISTS > 0)
122-
require.Equal(s.T(), 0, result.Resultset.RowNumber())
122+
require.Equal(s.T(), 0, result.RowNumber())
123123
require.Equal(s.T(), uint64(1), result.AffectedRows)
124124
require.NoError(s.T(), err)
125125
case 1:
126126
// the SELECT query should have an resultset
127127
// still not the last query, flag should be set
128128
require.True(s.T(), result.Status&mysql.SERVER_MORE_RESULTS_EXISTS > 0)
129-
require.Greater(s.T(), result.Resultset.RowNumber(), 0)
129+
require.Greater(s.T(), result.RowNumber(), 0)
130130
require.NoError(s.T(), err)
131131
case 3:
132132
// this query is obviously bogus so the error should be non-nil
@@ -175,7 +175,7 @@ func (s *connTestSuite) TestExecuteSelectStreaming() {
175175
// result.Resultset must be defined at this point
176176
require.NotNil(s.T(), result.Resultset)
177177
// Check number of columns
178-
require.Len(s.T(), result.Resultset.Fields, colsInResult)
178+
require.Len(s.T(), result.Fields, colsInResult)
179179

180180
perResultCallbackCalledTimes++
181181
return nil

‎client/resp.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,16 @@ func (c *Conn) handleAuthResult() error {
121121
}
122122

123123
// handle caching_sha2_password
124-
if c.authPluginName == mysql.AUTH_CACHING_SHA2_PASSWORD {
124+
switch c.authPluginName {
125+
case mysql.AUTH_CACHING_SHA2_PASSWORD:
125126
if data == nil {
126127
return nil // auth already succeeded
127128
}
128-
if data[0] == mysql.CACHE_SHA2_FAST_AUTH {
129+
switch data[0] {
130+
case mysql.CACHE_SHA2_FAST_AUTH:
129131
_, err = c.readOK()
130132
return err
131-
} else if data[0] == mysql.CACHE_SHA2_FULL_AUTH {
133+
case mysql.CACHE_SHA2_FULL_AUTH:
132134
// need full authentication
133135
if c.tlsConfig != nil || c.proto == "unix" {
134136
if err = c.WriteClearAuthPacket(c.password); err != nil {
@@ -141,10 +143,10 @@ func (c *Conn) handleAuthResult() error {
141143
}
142144
_, err = c.readOK()
143145
return err
144-
} else {
146+
default:
145147
return errors.Errorf("invalid packet %x", data[0])
146148
}
147-
} else if c.authPluginName == mysql.AUTH_SHA256_PASSWORD {
149+
case mysql.AUTH_SHA256_PASSWORD:
148150
if len(data) == 0 {
149151
return nil // auth already succeeded
150152
}
@@ -205,11 +207,12 @@ func (c *Conn) readOK() (*mysql.Result, error) {
205207
return nil, errors.Trace(err)
206208
}
207209

208-
if data[0] == mysql.OK_HEADER {
210+
switch data[0] {
211+
case mysql.OK_HEADER:
209212
return c.handleOKPacket(data)
210-
} else if data[0] == mysql.ERR_HEADER {
213+
case mysql.ERR_HEADER:
211214
return nil, c.handleErrorPacket(data)
212-
} else {
215+
default:
213216
return nil, errors.New("invalid ok packet")
214217
}
215218
}
@@ -310,7 +313,7 @@ func (c *Conn) readResultsetStreaming(data []byte, binary bool, result *mysql.Re
310313
}
311314

312315
// this is a streaming resultset
313-
result.Resultset.Streaming = mysql.StreamingSelect
316+
result.Streaming = mysql.StreamingSelect
314317

315318
if err := c.readResultColumns(result); err != nil {
316319
return errors.Trace(err)
@@ -327,7 +330,7 @@ func (c *Conn) readResultsetStreaming(data []byte, binary bool, result *mysql.Re
327330
}
328331

329332
// this resultset is done streaming
330-
result.Resultset.StreamingDone = true
333+
result.StreamingDone = true
331334

332335
return nil
333336
}

‎driver/driver.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ func (st *state) replyError(err error) error {
379379

380380
func (c *conn) Exec(query string, args []sqldriver.Value) (sqldriver.Result, error) {
381381
a := buildArgs(args)
382-
r, err := c.Conn.Execute(query, a...)
382+
r, err := c.Execute(query, a...)
383383
if err != nil {
384384
return nil, c.state.replyError(err)
385385
}
@@ -389,7 +389,7 @@ func (c *conn) Exec(query string, args []sqldriver.Value) (sqldriver.Result, err
389389
func (c *conn) ExecContext(ctx context.Context, query string, args []sqldriver.NamedValue) (sqldriver.Result, error) {
390390
defer c.watchCtx(ctx)()
391391
a := buildNamedArgs(args)
392-
r, err := c.Conn.Execute(query, a...)
392+
r, err := c.Execute(query, a...)
393393
if err != nil {
394394
return nil, c.state.replyError(err)
395395
}
@@ -398,7 +398,7 @@ func (c *conn) ExecContext(ctx context.Context, query string, args []sqldriver.N
398398

399399
func (c *conn) Query(query string, args []sqldriver.Value) (sqldriver.Rows, error) {
400400
a := buildArgs(args)
401-
r, err := c.Conn.Execute(query, a...)
401+
r, err := c.Execute(query, a...)
402402
if err != nil {
403403
return nil, c.state.replyError(err)
404404
}
@@ -408,7 +408,7 @@ func (c *conn) Query(query string, args []sqldriver.Value) (sqldriver.Rows, erro
408408
func (c *conn) QueryContext(ctx context.Context, query string, args []sqldriver.NamedValue) (sqldriver.Rows, error) {
409409
defer c.watchCtx(ctx)()
410410
a := buildNamedArgs(args)
411-
r, err := c.Conn.Execute(query, a...)
411+
r, err := c.Execute(query, a...)
412412
if err != nil {
413413
return nil, c.state.replyError(err)
414414
}
@@ -429,12 +429,12 @@ func (s *stmt) Close() error {
429429
}
430430

431431
func (s *stmt) NumInput() int {
432-
return s.Stmt.ParamNum()
432+
return s.ParamNum()
433433
}
434434

435435
func (s *stmt) Exec(args []sqldriver.Value) (sqldriver.Result, error) {
436436
a := buildArgs(args)
437-
r, err := s.Stmt.Execute(a...)
437+
r, err := s.Execute(a...)
438438
if err != nil {
439439
return nil, s.connectionState.replyError(err)
440440
}
@@ -445,7 +445,7 @@ func (s *stmt) ExecContext(ctx context.Context, args []sqldriver.NamedValue) (sq
445445
defer s.watchCtx(ctx)()
446446

447447
a := buildNamedArgs(args)
448-
r, err := s.Stmt.Execute(a...)
448+
r, err := s.Execute(a...)
449449
if err != nil {
450450
return nil, s.connectionState.replyError(err)
451451
}
@@ -454,7 +454,7 @@ func (s *stmt) ExecContext(ctx context.Context, args []sqldriver.NamedValue) (sq
454454

455455
func (s *stmt) Query(args []sqldriver.Value) (sqldriver.Rows, error) {
456456
a := buildArgs(args)
457-
r, err := s.Stmt.Execute(a...)
457+
r, err := s.Execute(a...)
458458
if err != nil {
459459
return nil, s.connectionState.replyError(err)
460460
}
@@ -465,7 +465,7 @@ func (s *stmt) QueryContext(ctx context.Context, args []sqldriver.NamedValue) (s
465465
defer s.watchCtx(ctx)()
466466

467467
a := buildNamedArgs(args)
468-
r, err := s.Stmt.Execute(a...)
468+
r, err := s.Execute(a...)
469469
if err != nil {
470470
return nil, s.connectionState.replyError(err)
471471
}
@@ -489,11 +489,11 @@ type result struct {
489489
}
490490

491491
func (r *result) LastInsertId() (int64, error) {
492-
return int64(r.Result.InsertId), nil
492+
return int64(r.InsertId), nil
493493
}
494494

495495
func (r *result) RowsAffected() (int64, error) {
496-
return int64(r.Result.AffectedRows), nil
496+
return int64(r.AffectedRows), nil
497497
}
498498

499499
type rows struct {
@@ -531,14 +531,14 @@ func (r *rows) Close() error {
531531
}
532532

533533
func (r *rows) Next(dest []sqldriver.Value) error {
534-
if r.step >= r.Resultset.RowNumber() {
534+
if r.step >= r.RowNumber() {
535535
return io.EOF
536536
} else if r.step == -1 {
537537
return io.ErrUnexpectedEOF
538538
}
539539

540-
for i := 0; i < r.Resultset.ColumnNumber(); i++ {
541-
value, err := r.Resultset.GetValue(r.step, i)
540+
for i := 0; i < r.ColumnNumber(); i++ {
541+
value, err := r.GetValue(r.step, i)
542542
if err != nil {
543543
return err
544544
}

‎dump/dumper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ func (d *Dumper) Dump(w io.Writer) error {
303303
// If we only dump some tables, the dump data will not have database name
304304
// which makes us hard to parse, so here we add it manually.
305305

306-
_, err := w.Write([]byte(fmt.Sprintf("USE `%s`;\n", d.TableDB)))
306+
_, err := fmt.Fprintf(w, "USE `%s`;\n", d.TableDB)
307307
if err != nil {
308308
return fmt.Errorf(`could not write USE command: %w`, err)
309309
}

‎mysql/result.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type Executer interface {
3030

3131
func (r *Result) Close() {
3232
if r.Resultset != nil {
33-
r.Resultset.returnToPool()
33+
r.returnToPool()
3434
r.Resultset = nil
3535
}
3636
}
@@ -39,7 +39,7 @@ func (r *Result) HasResultset() bool {
3939
if r == nil {
4040
return false
4141
}
42-
if r.Resultset != nil && len(r.Resultset.Fields) > 0 {
42+
if r.Resultset != nil && len(r.Fields) > 0 {
4343
return true
4444
}
4545
return false

‎replication/backup.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,15 @@ func (h *BackupEventHandler) HandleEvent(e *BinlogEvent) error {
146146
var err error
147147
offset := e.Header.LogPos
148148

149-
if e.Header.EventType == ROTATE_EVENT {
149+
switch e.Header.EventType {
150+
case ROTATE_EVENT:
150151
rotateEvent := e.Event.(*RotateEvent)
151152
h.filename = string(rotateEvent.NextLogName)
152153
if e.Header.Timestamp == 0 || offset == 0 {
153154
// fake rotate event
154155
return nil
155156
}
156-
} else if e.Header.EventType == FORMAT_DESCRIPTION_EVENT {
157+
case FORMAT_DESCRIPTION_EVENT:
157158
if h.w != nil {
158159
if err = h.w.Close(); err != nil {
159160
h.w = nil

‎replication/binlogsyncer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ func (b *BinlogSyncer) prepareSyncGTID(gset mysql.GTIDSet) error {
722722
func (b *BinlogSyncer) onStream(s *BinlogStreamer) {
723723
defer func() {
724724
if e := recover(); e != nil {
725-
s.closeWithError(fmt.Errorf("Err: %v\n Stack: %s", e, mysql.Pstack()))
725+
s.closeWithError(fmt.Errorf("panic %v\nstack: %s", e, mysql.Pstack()))
726726
}
727727
b.wg.Done()
728728
}()

‎replication/parser.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ func (p *BinlogParser) parseSingleEvent(r io.Reader, onEvent OnEventFunc) (bool,
165165
}
166166

167167
func (p *BinlogParser) ParseReader(r io.Reader, onEvent OnEventFunc) error {
168-
for {
169-
if atomic.LoadUint32(&p.stopProcessing) == 1 {
170-
break
171-
}
172-
168+
for atomic.LoadUint32(&p.stopProcessing) != 1 {
173169
done, err := p.parseSingleEvent(r, onEvent)
174170
if err != nil {
175171
if err == errMissingTableMapEvent {

‎replication/row_event.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ func (e *RowsEvent) decodeExtraData(data []byte) (err2 error) {
10601060
pos += 1
10611061
switch extraDataType {
10621062
case ENUM_EXTRA_ROW_INFO_TYPECODE_NDB:
1063-
var ndbLength int = int(data[pos])
1063+
ndbLength := int(data[pos])
10641064
pos += 1
10651065
e.NdbFormat = data[pos]
10661066
pos += 1
@@ -1388,7 +1388,7 @@ func (e *RowsEvent) decodeValue(data []byte, tp byte, meta uint16, isPartial boo
13881388
v = int64(binary.LittleEndian.Uint16(data))
13891389
n = 2
13901390
default:
1391-
err = fmt.Errorf("Unknown ENUM packlen=%d", l)
1391+
err = fmt.Errorf("unknown ENUM packlen=%d", l)
13921392
}
13931393
case mysql.MYSQL_TYPE_SET:
13941394
n = int(meta & 0xFF)

0 commit comments

Comments
 (0)