Skip to content

Commit 2bb9e96

Browse files
committed
lint - fix all staticcheck
1 parent 1717492 commit 2bb9e96

File tree

10 files changed

+888
-884
lines changed

10 files changed

+888
-884
lines changed

client/client_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,13 @@ func (s *clientTestSuite) TestStmt_NULL(c *C) {
309309

310310
str = `select * from mixer_test_stmt where id = ?`
311311
stmt, err = s.c.Prepare(str)
312+
c.Assert(err, IsNil)
313+
312314
defer stmt.Close()
313315

316+
result, err = stmt.Execute(2)
314317
c.Assert(err, IsNil)
315318

316-
result, err = stmt.Execute(2)
317319
b, err := result.IsNullByName(0, "id")
318320
c.Assert(err, IsNil)
319321
c.Assert(b, Equals, false)

client/resp.go

+4
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ func (c *Conn) handleAuthResult() error {
101101
}
102102
c.authPluginName = switchToPlugin
103103
auth, addNull, err := c.genAuthResponse(data)
104+
if err != nil {
105+
return err
106+
}
107+
104108
if err = c.WriteAuthSwitchPacket(auth, addNull); err != nil {
105109
return err
106110
}

cmd/go-canal/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ func main() {
8989

9090
sc := make(chan os.Signal, 1)
9191
signal.Notify(sc,
92-
os.Kill,
93-
os.Interrupt,
92+
syscall.SIGINT,
9493
syscall.SIGHUP,
9594
syscall.SIGINT,
9695
syscall.SIGTERM,

dump/dump_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func (s *parserTestSuite) TestParseValue(c *C) {
268268
c.Assert(values, HasLen, 4)
269269

270270
str = `123,'\Z#÷QÎx£. Æ‘ÇoPâÅ_\r—\\','','qn\'`
271-
values, err = parseValues(str)
271+
_, err = parseValues(str)
272272
c.Assert(err, NotNil)
273273
}
274274

failover/failover_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (s *failoverTestSuite) testFailover(c *C, h Handler, m *Server, s1 *Server,
108108
err = s2.StopSlaveIOThread()
109109
c.Assert(err, IsNil)
110110

111-
id = s.checkInsert(c, m, "b")
111+
_ = s.checkInsert(c, m, "b")
112112
id = s.checkInsert(c, m, "c")
113113

114114
err = h.WaitCatchMaster(s1, m)
@@ -138,7 +138,7 @@ func (s *failoverTestSuite) testFailover(c *C, h Handler, m *Server, s1 *Server,
138138
c.Assert(err, IsNil)
139139

140140
m, s1 = s1, m
141-
id = s.checkInsert(c, m, "d")
141+
_ = s.checkInsert(c, m, "d")
142142

143143
err = h.WaitCatchMaster(s1, m)
144144
c.Assert(err, IsNil)
@@ -153,8 +153,9 @@ func (s *failoverTestSuite) testFailover(c *C, h Handler, m *Server, s1 *Server,
153153
err = s2.StopSlaveIOThread()
154154
c.Assert(err, IsNil)
155155

156-
id = s.checkInsert(c, m, "e")
156+
_ = s.checkInsert(c, m, "e")
157157
err = h.WaitCatchMaster(s1, m)
158+
c.Assert(err, IsNil)
158159

159160
best, err = h.FindBestSlaves([]*Server{s1, s2})
160161
c.Assert(err, IsNil)

mysql/errcode.go

+866-866
Large diffs are not rendered by default.

mysql/mysql_gtid.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ func parseInterval(str string) (i Interval, err error) {
3232
i.Stop = i.Start + 1
3333
case 2:
3434
i.Start, err = strconv.ParseInt(p[0], 10, 64)
35-
i.Stop, err = strconv.ParseInt(p[1], 10, 64)
36-
i.Stop = i.Stop + 1
35+
if err == nil {
36+
i.Stop, err = strconv.ParseInt(p[1], 10, 64)
37+
i.Stop++
38+
}
3739
default:
3840
err = errors.Errorf("invalid interval format, must n[-n]")
3941
}
@@ -432,7 +434,7 @@ func (s *MysqlGTIDSet) String() string {
432434
sets = append(sets, set.String())
433435
}
434436
sort.Strings(sets)
435-
437+
436438
sep := ""
437439
for _, set := range sets {
438440
buf.WriteString(sep)

replication/parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (p *BinlogParser) ParseFile(name string, offset int64, onEvent OnEventFunc)
8080
offset = 4
8181
} else if offset > 4 {
8282
// FORMAT_DESCRIPTION event should be read by default always (despite that fact passed offset may be higher than 4)
83-
if _, err = f.Seek(4, os.SEEK_SET); err != nil {
83+
if _, err = f.Seek(4, io.SeekStart); err != nil {
8484
return errors.Errorf("seek %s to %d error %v", name, offset, err)
8585
}
8686

@@ -89,7 +89,7 @@ func (p *BinlogParser) ParseFile(name string, offset int64, onEvent OnEventFunc)
8989
}
9090
}
9191

92-
if _, err = f.Seek(offset, os.SEEK_SET); err != nil {
92+
if _, err = f.Seek(offset, io.SeekStart); err != nil {
9393
return errors.Errorf("seek %s to %d error %v", name, offset, err)
9494
}
9595

replication/row_event.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -1097,11 +1097,7 @@ func (e *RowsEvent) decodeValue(data []byte, tp byte, meta uint16) (v interface{
10971097
if i32 == 0 {
10981098
v = "00:00:00"
10991099
} else {
1100-
sign := ""
1101-
if i32 < 0 {
1102-
sign = "-"
1103-
}
1104-
v = fmt.Sprintf("%s%02d:%02d:%02d", sign, i32/10000, (i32%10000)/100, i32%100)
1100+
v = fmt.Sprintf("%02d:%02d:%02d", i32/10000, (i32%10000)/100, i32%100)
11051101
}
11061102
case MYSQL_TYPE_TIME2:
11071103
v, n, err = decodeTime2(data, meta)

utils/byte_slice_pool.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ func ByteSlicePut(data []byte) {
3131
select {
3232
case byteSliceChan <- data:
3333
default:
34-
byteSlicePool.Put(data)
34+
byteSlicePool.Put(data) //nolint:staticcheck
3535
}
3636
}

0 commit comments

Comments
 (0)