code health: fix all places highlighted by linter

Relates to #142
tarantool · Apr 13, 2022 · 9372d12 · 9372d12
1 parent 7897baf
commit 9372d12
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 21 deletions.
diff --git a/client_tools.go b/client_tools.go
@@ -10,6 +10,7 @@ type IntKey struct {
 	I int
 }
 
+//nolint: errcheck
 func (k IntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
 	enc.EncodeSliceLen(1)
 	enc.EncodeInt(k.I)
@@ -22,6 +23,7 @@ type UintKey struct {
 	I uint
 }
 
+//nolint: errcheck
 func (k UintKey) EncodeMsgpack(enc *msgpack.Encoder) error {
 	enc.EncodeSliceLen(1)
 	enc.EncodeUint(k.I)
@@ -34,6 +36,7 @@ type StringKey struct {
 	S string
 }
 
+//nolint: errcheck
 func (k StringKey) EncodeMsgpack(enc *msgpack.Encoder) error {
 	enc.EncodeSliceLen(1)
 	enc.EncodeString(k.S)
@@ -46,6 +49,7 @@ type IntIntKey struct {
 	I1, I2 int
 }
 
+//nolint: errcheck
 func (k IntIntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
 	enc.EncodeSliceLen(2)
 	enc.EncodeInt(k.I1)
@@ -60,6 +64,7 @@ type Op struct {
 	Arg   interface{}
 }
 
+//nolint: errcheck
 func (o Op) EncodeMsgpack(enc *msgpack.Encoder) error {
 	enc.EncodeSliceLen(3)
 	enc.EncodeString(o.Op)
@@ -75,6 +80,7 @@ type OpSplice struct {
 	Replace string
 }
 
+//nolint: errcheck
 func (o OpSplice) EncodeMsgpack(enc *msgpack.Encoder) error {
 	enc.EncodeSliceLen(5)
 	enc.EncodeString(o.Op)

diff --git a/connection.go b/connection.go
@@ -145,7 +145,7 @@ type connShard struct {
 	bufmut sync.Mutex
 	buf    smallWBuf
 	enc    *msgpack.Encoder
-	_pad   [16]uint64
+	_pad   [16]uint64 //nolint: structcheck,unused
 }
 
 // Greeting is a message sent by tarantool on connect.
@@ -227,6 +227,7 @@ type Opts struct {
 //
 // - If opts.Reconnect is non-zero, then error will be returned only if authorization// fails. But if Tarantool is not reachable, then it will attempt to reconnect later
 // and will not end attempts on authorization failures.
+//nolint: errcheck
 func Connect(addr string, opts Opts) (conn *Connection, err error) {
 	conn = &Connection{
 		addr:      addr,
@@ -494,7 +495,7 @@ func (conn *Connection) createConnection(reconnect bool) (err error) {
 		conn.notify(ReconnectFailed)
 		reconnects++
 		conn.mutex.Unlock()
-		time.Sleep(now.Add(conn.opts.Reconnect).Sub(time.Now()))
+		time.Sleep(time.Until(now.Add(conn.opts.Reconnect)))
 		conn.mutex.Lock()
 	}
 	if conn.state == connClosed {
@@ -537,6 +538,7 @@ func (conn *Connection) closeConnection(neterr error, forever bool) (err error)
 	return
 }
 
+//nolint: errcheck
 func (conn *Connection) reconnect(neterr error, c net.Conn) {
 	conn.mutex.Lock()
 	defer conn.mutex.Unlock()
@@ -566,6 +568,7 @@ func (conn *Connection) unlockShards() {
 	}
 }
 
+//nolint: errcheck
 func (conn *Connection) pinger() {
 	to := conn.opts.Timeout
 	if to == 0 {
@@ -687,7 +690,7 @@ func (conn *Connection) newFuture(requestCode int32) (fut *Future) {
 	*pair.last = fut
 	pair.last = &fut.next
 	if conn.opts.Timeout > 0 {
-		fut.timeout = time.Now().Sub(epoch) + conn.opts.Timeout
+		fut.timeout = time.Until(epoch) + conn.opts.Timeout
 	}
 	shard.rmut.Unlock()
 	if conn.rlimit != nil && conn.opts.RLimitAction == RLimitWait {
@@ -795,9 +798,9 @@ func (conn *Connection) timeouts() {
 			return
 		case <-t.C:
 		}
-		minNext := time.Now().Sub(epoch) + timeout
+		minNext := time.Until(epoch) + timeout
 		for i := range conn.shard {
-			nowepoch = time.Now().Sub(epoch)
+			nowepoch = time.Until(epoch)
 			shard := &conn.shard[i]
 			for pos := range shard.requests {
 				shard.rmut.Lock()
@@ -824,7 +827,7 @@ func (conn *Connection) timeouts() {
 				shard.rmut.Unlock()
 			}
 		}
-		nowepoch = time.Now().Sub(epoch)
+		nowepoch = time.Until(epoch)
 		if nowepoch+time.Microsecond < minNext {
 			t.Reset(minNext - nowepoch)
 		} else {

diff --git a/deadline_io.go b/deadline_io.go
@@ -10,6 +10,7 @@ type DeadlineIO struct {
 	c  net.Conn
 }
 
+//nolint: errcheck
 func (d *DeadlineIO) Write(b []byte) (n int, err error) {
 	if d.to > 0 {
 		d.c.SetWriteDeadline(time.Now().Add(d.to))
@@ -18,6 +19,7 @@ func (d *DeadlineIO) Write(b []byte) (n int, err error) {
 	return
 }
 
+//nolint: errcheck
 func (d *DeadlineIO) Read(b []byte) (n int, err error) {
 	if d.to > 0 {
 		d.c.SetReadDeadline(time.Now().Add(d.to))

diff --git a/example_test.go b/example_test.go
@@ -10,7 +10,7 @@ import (
 type Tuple struct {
 	/* instruct msgpack to pack this struct as array,
 	 * so no custom packer is needed */
-	_msgpack struct{} `msgpack:",asArray"`
+	_msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused
 	Id       uint
 	Msg      string
 	Name     string
@@ -85,6 +85,7 @@ func ExampleConnection_SelectTyped() {
 	// response is [{{} 1111 hello world}]
 }
 
+//nolint
 func Example() {
 	spaceNo := uint32(512)
 	indexNo := uint32(0)
@@ -99,7 +100,7 @@ func Example() {
 	}
 	client, err := tarantool.Connect(server, opts)
 	if err != nil {
-		fmt.Errorf("Failed to connect: %s", err.Error())
+		fmt.Printf("Failed to connect: %s", err.Error())
 		return
 	}
 

diff --git a/request.go b/request.go
@@ -19,11 +19,13 @@ type Future struct {
 }
 
 // Ping sends empty request to Tarantool to check connection.
+//nolint: errcheck
 func (conn *Connection) Ping() (resp *Response, err error) {
 	future := conn.newFuture(PingRequest)
 	return future.send(conn, func(enc *msgpack.Encoder) error { enc.EncodeMapLen(0); return nil }).Get()
 }
 
+//nolint: errcheck
 func (req *Future) fillSearch(enc *msgpack.Encoder, spaceNo, indexNo uint32, key interface{}) error {
 	enc.EncodeUint64(KeySpaceNo)
 	enc.EncodeUint64(uint64(spaceNo))
@@ -33,6 +35,7 @@ func (req *Future) fillSearch(enc *msgpack.Encoder, spaceNo, indexNo uint32, key
 	return enc.Encode(key)
 }
 
+//nolint: errcheck
 func (req *Future) fillIterator(enc *msgpack.Encoder, offset, limit, iterator uint32) {
 	enc.EncodeUint64(KeyIterator)
 	enc.EncodeUint64(uint64(iterator))
@@ -42,6 +45,7 @@ func (req *Future) fillIterator(enc *msgpack.Encoder, offset, limit, iterator ui
 	enc.EncodeUint64(uint64(limit))
 }
 
+//nolint: errcheck
 func (req *Future) fillInsert(enc *msgpack.Encoder, spaceNo uint32, tuple interface{}) error {
 	enc.EncodeUint64(KeySpaceNo)
 	enc.EncodeUint64(uint64(spaceNo))
@@ -219,6 +223,7 @@ func (conn *Connection) SelectAsync(space, index interface{}, offset, limit, ite
 	if err != nil {
 		return future.fail(conn, err)
 	}
+	//nolint: errcheck
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(6)
 		future.fillIterator(enc, offset, limit, iterator)
@@ -234,6 +239,7 @@ func (conn *Connection) InsertAsync(space interface{}, tuple interface{}) *Futur
 	if err != nil {
 		return future.fail(conn, err)
 	}
+	//nolint: errcheck
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
 		return future.fillInsert(enc, spaceNo, tuple)
@@ -248,6 +254,7 @@ func (conn *Connection) ReplaceAsync(space interface{}, tuple interface{}) *Futu
 	if err != nil {
 		return future.fail(conn, err)
 	}
+	//nolint: errcheck
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
 		return future.fillInsert(enc, spaceNo, tuple)
@@ -256,6 +263,7 @@ func (conn *Connection) ReplaceAsync(space interface{}, tuple interface{}) *Futu
 
 // DeleteAsync sends deletion action to tarantool and returns Future.
 // Future's result will contain array with deleted tuple.
+//nolint: errcheck
 func (conn *Connection) DeleteAsync(space, index interface{}, key interface{}) *Future {
 	future := conn.newFuture(DeleteRequest)
 	spaceNo, indexNo, err := conn.Schema.resolveSpaceIndex(space, index)
@@ -276,6 +284,7 @@ func (conn *Connection) UpdateAsync(space, index interface{}, key, ops interface
 	if err != nil {
 		return future.fail(conn, err)
 	}
+	//nolint: errcheck
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(4)
 		if err := future.fillSearch(enc, spaceNo, indexNo, key); err != nil {
@@ -294,6 +303,7 @@ func (conn *Connection) UpsertAsync(space interface{}, tuple interface{}, ops in
 	if err != nil {
 		return future.fail(conn, err)
 	}
+	//nolint: errcheck
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(3)
 		enc.EncodeUint64(KeySpaceNo)
@@ -309,6 +319,7 @@ func (conn *Connection) UpsertAsync(space interface{}, tuple interface{}, ops in
 
 // CallAsync sends a call to registered tarantool function and returns Future.
 // It uses request code for tarantool 1.6, so future's result is always array of arrays
+//nolint: errcheck
 func (conn *Connection) CallAsync(functionName string, args interface{}) *Future {
 	future := conn.newFuture(CallRequest)
 	return future.send(conn, func(enc *msgpack.Encoder) error {
@@ -325,6 +336,7 @@ func (conn *Connection) CallAsync(functionName string, args interface{}) *Future
 // (though, keep in mind, result is always array)
 func (conn *Connection) Call17Async(functionName string, args interface{}) *Future {
 	future := conn.newFuture(Call17Request)
+	//nolint: errcheck
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
 		enc.EncodeUint64(KeyFunctionName)
@@ -337,6 +349,7 @@ func (conn *Connection) Call17Async(functionName string, args interface{}) *Futu
 // EvalAsync sends a lua expression for evaluation and returns Future.
 func (conn *Connection) EvalAsync(expr string, args interface{}) *Future {
 	future := conn.newFuture(EvalRequest)
+	//nolint: errcheck
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
 		enc.EncodeUint64(KeyExpression)
@@ -350,6 +363,7 @@ func (conn *Connection) EvalAsync(expr string, args interface{}) *Future {
 // private
 //
 
+//nolint: errcheck
 func (fut *Future) pack(h *smallWBuf, enc *msgpack.Encoder, body func(*msgpack.Encoder) error) (err error) {
 	rid := fut.requestId
 	hl := h.Len()

diff --git a/response.go b/response.go
@@ -15,10 +15,12 @@ type Response struct {
 	buf  smallBuf
 }
 
+//nolint: unused
 func (resp *Response) fill(b []byte) {
 	resp.buf.b = b
 }
 
+//nolint: errcheck
 func (resp *Response) smallInt(d *msgpack.Decoder) (i int, err error) {
 	b, err := resp.buf.ReadByte()
 	if err != nil {
@@ -31,6 +33,7 @@ func (resp *Response) smallInt(d *msgpack.Decoder) (i int, err error) {
 	return d.DecodeInt()
 }
 
+//nolint: errcheck
 func (resp *Response) decodeHeader(d *msgpack.Decoder) (err error) {
 	var l int
 	d.Reset(&resp.buf)

diff --git a/schema.go b/schema.go
@@ -51,9 +51,9 @@ type IndexField struct {
 
 const (
 	maxSchemas = 10000
-	spaceSpId  = 280
+	spaceSpId  = 280 //nolint: varcheck,deadcode
 	vspaceSpId = 281
-	indexSpId  = 288
+	indexSpId  = 288 //nolint: varcheck,deadcode
 	vindexSpId = 289
 )