Skip to content

Commit bad0a66

Browse files
vr009vr009
committed
code health: fix all places highlighted by linter
Relates to #142
1 parent 31ebde8 commit bad0a66

8 files changed

+240
-127
lines changed

‎client_tools.go

Lines changed: 60 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ type IntKey struct {
1010
I int
1111
}
1212

13-
func (k IntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
14-
enc.EncodeSliceLen(1)
15-
enc.EncodeInt(k.I)
13+
func (k IntKey) EncodeMsgpack(enc *msgpack.Encoder) (err error) {
14+
if err = enc.EncodeSliceLen(1); err != nil {
15+
return
16+
}
17+
if err = enc.EncodeInt(k.I); err != nil {
18+
return
19+
}
1620
return nil
1721
}
1822

@@ -22,9 +26,13 @@ type UintKey struct {
2226
I uint
2327
}
2428

25-
func (k UintKey) EncodeMsgpack(enc *msgpack.Encoder) error {
26-
enc.EncodeSliceLen(1)
27-
enc.EncodeUint(k.I)
29+
func (k UintKey) EncodeMsgpack(enc *msgpack.Encoder) (err error) {
30+
if err = enc.EncodeSliceLen(1); err != nil {
31+
return
32+
}
33+
if err = enc.EncodeUint(k.I); err != nil {
34+
return
35+
}
2836
return nil
2937
}
3038

@@ -34,9 +42,13 @@ type StringKey struct {
3442
S string
3543
}
3644

37-
func (k StringKey) EncodeMsgpack(enc *msgpack.Encoder) error {
38-
enc.EncodeSliceLen(1)
39-
enc.EncodeString(k.S)
45+
func (k StringKey) EncodeMsgpack(enc *msgpack.Encoder) (err error) {
46+
if err = enc.EncodeSliceLen(1); err != nil {
47+
return
48+
}
49+
if err = enc.EncodeString(k.S); err != nil {
50+
return
51+
}
4052
return nil
4153
}
4254

@@ -46,10 +58,16 @@ type IntIntKey struct {
4658
I1, I2 int
4759
}
4860

49-
func (k IntIntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
50-
enc.EncodeSliceLen(2)
51-
enc.EncodeInt(k.I1)
52-
enc.EncodeInt(k.I2)
61+
func (k IntIntKey) EncodeMsgpack(enc *msgpack.Encoder) (err error) {
62+
if err = enc.EncodeSliceLen(2); err != nil {
63+
return
64+
}
65+
if err = enc.EncodeInt(k.I1); err != nil {
66+
return
67+
}
68+
if err = enc.EncodeInt(k.I2); err != nil {
69+
return
70+
}
5371
return nil
5472
}
5573

@@ -60,10 +78,16 @@ type Op struct {
6078
Arg interface{}
6179
}
6280

63-
func (o Op) EncodeMsgpack(enc *msgpack.Encoder) error {
64-
enc.EncodeSliceLen(3)
65-
enc.EncodeString(o.Op)
66-
enc.EncodeInt(o.Field)
81+
func (o Op) EncodeMsgpack(enc *msgpack.Encoder) (err error) {
82+
if err = enc.EncodeSliceLen(3); err != nil {
83+
return
84+
}
85+
if err = enc.EncodeString(o.Op); err != nil {
86+
return
87+
}
88+
if err = enc.EncodeInt(o.Field); err != nil {
89+
return
90+
}
6791
return enc.Encode(o.Arg)
6892
}
6993

@@ -75,12 +99,24 @@ type OpSplice struct {
7599
Replace string
76100
}
77101

78-
func (o OpSplice) EncodeMsgpack(enc *msgpack.Encoder) error {
79-
enc.EncodeSliceLen(5)
80-
enc.EncodeString(o.Op)
81-
enc.EncodeInt(o.Field)
82-
enc.EncodeInt(o.Pos)
83-
enc.EncodeInt(o.Len)
84-
enc.EncodeString(o.Replace)
102+
func (o OpSplice) EncodeMsgpack(enc *msgpack.Encoder) (err error) {
103+
if err = enc.EncodeSliceLen(5); err != nil {
104+
return
105+
}
106+
if err = enc.EncodeString(o.Op); err != nil {
107+
return
108+
}
109+
if err = enc.EncodeInt(o.Field); err != nil {
110+
return
111+
}
112+
if err = enc.EncodeInt(o.Pos); err != nil {
113+
return
114+
}
115+
if err = enc.EncodeInt(o.Len); err != nil {
116+
return
117+
}
118+
if err = enc.EncodeString(o.Replace); err != nil {
119+
return
120+
}
85121
return nil
86122
}

‎connection.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ type connShard struct {
145145
bufmut sync.Mutex
146146
buf smallWBuf
147147
enc *msgpack.Encoder
148-
_pad [16]uint64
148+
_pad [16]uint64 //nolint
149149
}
150150

151151
// Greeting is a message sent by tarantool on connect.
@@ -280,7 +280,7 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
280280
conn.mutex.Lock()
281281
defer conn.mutex.Unlock()
282282
if err := conn.createConnection(true); err != nil {
283-
conn.closeConnection(err, true)
283+
_ = conn.closeConnection(err, true)
284284
}
285285
}(conn)
286286
err = nil
@@ -297,7 +297,7 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
297297
if err = conn.loadSchema(); err != nil {
298298
conn.mutex.Lock()
299299
defer conn.mutex.Unlock()
300-
conn.closeConnection(err, true)
300+
_ = conn.closeConnection(err, true)
301301
return nil, err
302302
}
303303
}
@@ -494,7 +494,7 @@ func (conn *Connection) createConnection(reconnect bool) (err error) {
494494
conn.notify(ReconnectFailed)
495495
reconnects++
496496
conn.mutex.Unlock()
497-
time.Sleep(now.Add(conn.opts.Reconnect).Sub(time.Now()))
497+
time.Sleep(time.Until(now.Add(conn.opts.Reconnect)))
498498
conn.mutex.Lock()
499499
}
500500
if conn.state == connClosed {
@@ -542,13 +542,13 @@ func (conn *Connection) reconnect(neterr error, c net.Conn) {
542542
defer conn.mutex.Unlock()
543543
if conn.opts.Reconnect > 0 {
544544
if c == conn.c {
545-
conn.closeConnection(neterr, false)
545+
_ = conn.closeConnection(neterr, false)
546546
if err := conn.createConnection(true); err != nil {
547-
conn.closeConnection(err, true)
547+
_ = conn.closeConnection(err, true)
548548
}
549549
}
550550
} else {
551-
conn.closeConnection(neterr, true)
551+
_ = conn.closeConnection(neterr, true)
552552
}
553553
}
554554

@@ -579,7 +579,7 @@ func (conn *Connection) pinger() {
579579
return
580580
case <-t.C:
581581
}
582-
conn.Ping()
582+
_, _ = conn.Ping()
583583
}
584584
}
585585

@@ -687,7 +687,7 @@ func (conn *Connection) newFuture(requestCode int32) (fut *Future) {
687687
*pair.last = fut
688688
pair.last = &fut.next
689689
if conn.opts.Timeout > 0 {
690-
fut.timeout = time.Now().Sub(epoch) + conn.opts.Timeout
690+
fut.timeout = time.Until(epoch) + conn.opts.Timeout
691691
}
692692
shard.rmut.Unlock()
693693
if conn.rlimit != nil && conn.opts.RLimitAction == RLimitWait {
@@ -795,9 +795,9 @@ func (conn *Connection) timeouts() {
795795
return
796796
case <-t.C:
797797
}
798-
minNext := time.Now().Sub(epoch) + timeout
798+
minNext := time.Until(epoch) + timeout
799799
for i := range conn.shard {
800-
nowepoch = time.Now().Sub(epoch)
800+
nowepoch = time.Until(epoch)
801801
shard := &conn.shard[i]
802802
for pos := range shard.requests {
803803
shard.rmut.Lock()
@@ -824,7 +824,7 @@ func (conn *Connection) timeouts() {
824824
shard.rmut.Unlock()
825825
}
826826
}
827-
nowepoch = time.Now().Sub(epoch)
827+
nowepoch = time.Until(epoch)
828828
if nowepoch+time.Microsecond < minNext {
829829
t.Reset(minNext - nowepoch)
830830
} else {

‎deadline_io.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ type DeadlineIO struct {
1212

1313
func (d *DeadlineIO) Write(b []byte) (n int, err error) {
1414
if d.to > 0 {
15-
d.c.SetWriteDeadline(time.Now().Add(d.to))
15+
if err = d.c.SetWriteDeadline(time.Now().Add(d.to)); err != nil {
16+
return
17+
}
1618
}
1719
n, err = d.c.Write(b)
1820
return
1921
}
2022

2123
func (d *DeadlineIO) Read(b []byte) (n int, err error) {
2224
if d.to > 0 {
23-
d.c.SetReadDeadline(time.Now().Add(d.to))
25+
if err = d.c.SetReadDeadline(time.Now().Add(d.to)); err != nil {
26+
return
27+
}
2428
}
2529
n, err = d.c.Read(b)
2630
return

‎example_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
type Tuple struct {
1111
/* instruct msgpack to pack this struct as array,
1212
* so no custom packer is needed */
13-
_msgpack struct{} `msgpack:",asArray"`
13+
_msgpack struct{} `msgpack:",asArray"` //nolint
1414
Id uint
1515
Msg string
1616
Name string
@@ -99,7 +99,7 @@ func Example() {
9999
}
100100
client, err := tarantool.Connect(server, opts)
101101
if err != nil {
102-
fmt.Errorf("Failed to connect: %s", err.Error())
102+
fmt.Printf("Failed to connect: %s", err.Error())
103103
return
104104
}
105105

@@ -109,8 +109,8 @@ func Example() {
109109
fmt.Println("Ping Error", err)
110110

111111
// delete tuple for cleaning
112-
client.Delete(spaceNo, indexNo, []interface{}{uint(10)})
113-
client.Delete(spaceNo, indexNo, []interface{}{uint(11)})
112+
_, _ = client.Delete(spaceNo, indexNo, []interface{}{uint(10)})
113+
_, _ = client.Delete(spaceNo, indexNo, []interface{}{uint(11)})
114114

115115
// insert new tuple { 10, 1 }
116116
resp, err = client.Insert(spaceNo, []interface{}{uint(10), "test", "one"})

0 commit comments

Comments
 (0)