code health: replace EncodeUint64 by EncodeUint

We use everywhere EncodeInt instead of EncodeInt64. Also we use
everywhere EncodeUint64 instead of EncodeUint. It can be confusing.

Although EncodeUint64 and EncodeUint have same logic in msgpack.v2, but
different in msgpack.v5. It's good for migration to msgpack.v5 too.

Part of #124.

Author: oleg-jukovec

request.go

@@ -28,27 +28,27 @@ func (conn *Connection) Ping() (resp *Response, err error) {
 }
 
 func (req *Future) fillSearch(enc *msgpack.Encoder, spaceNo, indexNo uint32, key interface{}) error {
-	enc.EncodeUint64(KeySpaceNo)
-	enc.EncodeUint64(uint64(spaceNo))
-	enc.EncodeUint64(KeyIndexNo)
-	enc.EncodeUint64(uint64(indexNo))
-	enc.EncodeUint64(KeyKey)
+	enc.EncodeUint(KeySpaceNo)
+	enc.EncodeUint(uint(spaceNo))
+	enc.EncodeUint(KeyIndexNo)
+	enc.EncodeUint(uint(indexNo))
+	enc.EncodeUint(KeyKey)
 	return enc.Encode(key)
 }
 
 func (req *Future) fillIterator(enc *msgpack.Encoder, offset, limit, iterator uint32) {
-	enc.EncodeUint64(KeyIterator)
-	enc.EncodeUint64(uint64(iterator))
-	enc.EncodeUint64(KeyOffset)
-	enc.EncodeUint64(uint64(offset))
-	enc.EncodeUint64(KeyLimit)
-	enc.EncodeUint64(uint64(limit))
+	enc.EncodeUint(KeyIterator)
+	enc.EncodeUint(uint(iterator))
+	enc.EncodeUint(KeyOffset)
+	enc.EncodeUint(uint(offset))
+	enc.EncodeUint(KeyLimit)
+	enc.EncodeUint(uint(limit))
 }
 
 func (req *Future) fillInsert(enc *msgpack.Encoder, spaceNo uint32, tuple interface{}) error {
-	enc.EncodeUint64(KeySpaceNo)
-	enc.EncodeUint64(uint64(spaceNo))
-	enc.EncodeUint64(KeyTuple)
+	enc.EncodeUint(KeySpaceNo)
+	enc.EncodeUint(uint(spaceNo))
+	enc.EncodeUint(KeyTuple)
 	return enc.Encode(tuple)
 }
 
@@ -302,7 +302,7 @@ func (conn *Connection) UpdateAsync(space, index interface{}, key, ops interface
 		if err := future.fillSearch(enc, spaceNo, indexNo, key); err != nil {
 			return err
 		}
-		enc.EncodeUint64(KeyTuple)
+		enc.EncodeUint(KeyTuple)
 		return enc.Encode(ops)
 	})
 }
@@ -317,13 +317,13 @@ func (conn *Connection) UpsertAsync(space interface{}, tuple interface{}, ops in
 	}
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(3)
-		enc.EncodeUint64(KeySpaceNo)
-		enc.EncodeUint64(uint64(spaceNo))
-		enc.EncodeUint64(KeyTuple)
+		enc.EncodeUint(KeySpaceNo)
+		enc.EncodeUint(uint(spaceNo))
+		enc.EncodeUint(KeyTuple)
 		if err := enc.Encode(tuple); err != nil {
 			return err
 		}
-		enc.EncodeUint64(KeyDefTuple)
+		enc.EncodeUint(KeyDefTuple)
 		return enc.Encode(ops)
 	})
 }
@@ -334,9 +334,9 @@ func (conn *Connection) CallAsync(functionName string, args interface{}) *Future
 	future := conn.newFuture(CallRequest)
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
-		enc.EncodeUint64(KeyFunctionName)
+		enc.EncodeUint(KeyFunctionName)
 		enc.EncodeString(functionName)
-		enc.EncodeUint64(KeyTuple)
+		enc.EncodeUint(KeyTuple)
 		return enc.Encode(args)
 	})
 }
@@ -348,9 +348,9 @@ func (conn *Connection) Call17Async(functionName string, args interface{}) *Futu
 	future := conn.newFuture(Call17Request)
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
-		enc.EncodeUint64(KeyFunctionName)
+		enc.EncodeUint(KeyFunctionName)
 		enc.EncodeString(functionName)
-		enc.EncodeUint64(KeyTuple)
+		enc.EncodeUint(KeyTuple)
 		return enc.Encode(args)
 	})
 }
@@ -360,9 +360,9 @@ func (conn *Connection) EvalAsync(expr string, args interface{}) *Future {
 	future := conn.newFuture(EvalRequest)
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
-		enc.EncodeUint64(KeyExpression)
+		enc.EncodeUint(KeyExpression)
 		enc.EncodeString(expr)
-		enc.EncodeUint64(KeyTuple)
+		enc.EncodeUint(KeyTuple)
 		return enc.Encode(args)
 	})
 }
@@ -373,9 +373,9 @@ func (conn *Connection) ExecuteAsync(expr string, args interface{}) *Future {
 	future := conn.newFuture(ExecuteRequest)
 	return future.send(conn, func(enc *msgpack.Encoder) error {
 		enc.EncodeMapLen(2)
-		enc.EncodeUint64(KeySQLText)
+		enc.EncodeUint(KeySQLText)
 		enc.EncodeString(expr)
-		enc.EncodeUint64(KeySQLBind)
+		enc.EncodeUint(KeySQLBind)
 		return encodeSQLBind(enc, args)
 	})
 }