refactoring: wrap msgpack.dumps() into own method

We'll need to tune msgpack options in order to support msgpack-1.0.0 and
it is convenient to do so in one place.

Aside of this, reusing of an msgpack.Packer() instance looks good for
performance matters, however I guess that an actual difference is
negligible.

No behaviour is changed.

Part of #155

Author: Totktonada

tarantool/request.py

@@ -65,6 +65,11 @@ def __init__(self, conn):
         self._sync = None
         self._body = ''
 
+        self.packer = msgpack.Packer()
+
+    def _dumps(self, src):
+        return self.packer.pack(src)
+
     def __bytes__(self):
         return self.header(len(self._body)) + self._body
 
@@ -82,11 +87,11 @@ def sync(self):
 
     def header(self, length):
         self._sync = self.conn.generate_sync()
-        header = msgpack.dumps({IPROTO_CODE: self.request_type,
-                                IPROTO_SYNC: self._sync,
-                                IPROTO_SCHEMA_ID: self.conn.schema_version})
+        header = self._dumps({IPROTO_CODE: self.request_type,
+                              IPROTO_SYNC: self._sync,
+                              IPROTO_SCHEMA_ID: self.conn.schema_version})
 
-        return msgpack.dumps(length + len(header)) + header
+        return self._dumps(length + len(header)) + header
 
 
 class RequestInsert(Request):
@@ -102,8 +107,8 @@ def __init__(self, conn, space_no, values):
         super(RequestInsert, self).__init__(conn)
         assert isinstance(values, (tuple, list))
 
-        request_body = msgpack.dumps({IPROTO_SPACE_ID: space_no,
-                                      IPROTO_TUPLE: values})
+        request_body = self._dumps({IPROTO_SPACE_ID: space_no,
+                                    IPROTO_TUPLE: values})
 
         self._body = request_body
 
@@ -131,19 +136,19 @@ def sha1(values):
         hash2 = sha1((hash1,))
         scramble = sha1((salt, hash2))
         scramble = strxor(hash1, scramble)
-        request_body = msgpack.dumps({IPROTO_USER_NAME: user,
-                                      IPROTO_TUPLE: ("chap-sha1", scramble)})
+        request_body = self._dumps({IPROTO_USER_NAME: user,
+                                    IPROTO_TUPLE: ("chap-sha1", scramble)})
         self._body = request_body
 
     def header(self, length):
         self._sync = self.conn.generate_sync()
         # Set IPROTO_SCHEMA_ID: 0 to avoid SchemaReloadException
         # It is ok to use 0 in auth every time.
-        header = msgpack.dumps({IPROTO_CODE: self.request_type,
-                                IPROTO_SYNC: self._sync,
-                                IPROTO_SCHEMA_ID: 0})
+        header = self._dumps({IPROTO_CODE: self.request_type,
+                              IPROTO_SYNC: self._sync,
+                              IPROTO_SCHEMA_ID: 0})
 
-        return msgpack.dumps(length + len(header)) + header
+        return self._dumps(length + len(header)) + header
 
 
 class RequestReplace(Request):
@@ -159,8 +164,8 @@ def __init__(self, conn, space_no, values):
         super(RequestReplace, self).__init__(conn)
         assert isinstance(values, (tuple, list))
 
-        request_body = msgpack.dumps({IPROTO_SPACE_ID: space_no,
-                                      IPROTO_TUPLE: values})
+        request_body = self._dumps({IPROTO_SPACE_ID: space_no,
+                                    IPROTO_TUPLE: values})
 
         self._body = request_body
 
@@ -177,9 +182,9 @@ def __init__(self, conn, space_no, index_no, key):
         '''
         super(RequestDelete, self).__init__(conn)
 
-        request_body = msgpack.dumps({IPROTO_SPACE_ID: space_no,
-                                      IPROTO_INDEX_ID: index_no,
-                                      IPROTO_KEY: key})
+        request_body = self._dumps({IPROTO_SPACE_ID: space_no,
+                                    IPROTO_INDEX_ID: index_no,
+                                    IPROTO_KEY: key})
 
         self._body = request_body
 
@@ -193,12 +198,12 @@ class RequestSelect(Request):
     # pylint: disable=W0231
     def __init__(self, conn, space_no, index_no, key, offset, limit, iterator):
         super(RequestSelect, self).__init__(conn)
-        request_body = msgpack.dumps({IPROTO_SPACE_ID: space_no,
-                                      IPROTO_INDEX_ID: index_no,
-                                      IPROTO_OFFSET: offset,
-                                      IPROTO_LIMIT: limit,
-                                      IPROTO_ITERATOR: iterator,
-                                      IPROTO_KEY: key})
+        request_body = self._dumps({IPROTO_SPACE_ID: space_no,
+                                    IPROTO_INDEX_ID: index_no,
+                                    IPROTO_OFFSET: offset,
+                                    IPROTO_LIMIT: limit,
+                                    IPROTO_ITERATOR: iterator,
+                                    IPROTO_KEY: key})
 
         self._body = request_body
 
@@ -214,10 +219,10 @@ class RequestUpdate(Request):
     def __init__(self, conn, space_no, index_no, key, op_list):
         super(RequestUpdate, self).__init__(conn)
 
-        request_body = msgpack.dumps({IPROTO_SPACE_ID: space_no,
-                                      IPROTO_INDEX_ID: index_no,
-                                      IPROTO_KEY: key,
-                                      IPROTO_TUPLE: op_list})
+        request_body = self._dumps({IPROTO_SPACE_ID: space_no,
+                                    IPROTO_INDEX_ID: index_no,
+                                    IPROTO_KEY: key,
+                                    IPROTO_TUPLE: op_list})
 
         self._body = request_body
 
@@ -235,8 +240,8 @@ def __init__(self, conn, name, args, call_16):
         super(RequestCall, self).__init__(conn)
         assert isinstance(args, (list, tuple))
 
-        request_body = msgpack.dumps({IPROTO_FUNCTION_NAME: name,
-                                      IPROTO_TUPLE: args})
+        request_body = self._dumps({IPROTO_FUNCTION_NAME: name,
+                                    IPROTO_TUPLE: args})
 
         self._body = request_body
 
@@ -252,8 +257,8 @@ def __init__(self, conn, name, args):
         super(RequestEval, self).__init__(conn)
         assert isinstance(args, (list, tuple))
 
-        request_body = msgpack.dumps({IPROTO_EXPR: name,
-                                      IPROTO_TUPLE: args})
+        request_body = self._dumps({IPROTO_EXPR: name,
+                                    IPROTO_TUPLE: args})
 
         self._body = request_body
 
@@ -280,10 +285,10 @@ class RequestUpsert(Request):
     def __init__(self, conn, space_no, index_no, tuple_value, op_list):
         super(RequestUpsert, self).__init__(conn)
 
-        request_body = msgpack.dumps({IPROTO_SPACE_ID: space_no,
-                                      IPROTO_INDEX_ID: index_no,
-                                      IPROTO_TUPLE: tuple_value,
-                                      IPROTO_OPS: op_list})
+        request_body = self._dumps({IPROTO_SPACE_ID: space_no,
+                                    IPROTO_INDEX_ID: index_no,
+                                    IPROTO_TUPLE: tuple_value,
+                                    IPROTO_OPS: op_list})
 
         self._body = request_body
 
@@ -297,7 +302,7 @@ class RequestJoin(Request):
     # pylint: disable=W0231
     def __init__(self, conn, server_uuid):
         super(RequestJoin, self).__init__(conn)
-        request_body = msgpack.dumps({IPROTO_SERVER_UUID: server_uuid})
+        request_body = self._dumps({IPROTO_SERVER_UUID: server_uuid})
         self._body = request_body
 
 
@@ -312,7 +317,7 @@ def __init__(self, conn, cluster_uuid, server_uuid, vclock):
         super(RequestSubscribe, self).__init__(conn)
         assert isinstance(vclock, dict)
 
-        request_body = msgpack.dumps({
+        request_body = self._dumps({
             IPROTO_CLUSTER_UUID: cluster_uuid,
             IPROTO_SERVER_UUID: server_uuid,
             IPROTO_VCLOCK: vclock
@@ -329,6 +334,6 @@ class RequestOK(Request):
     # pylint: disable=W0231
     def __init__(self, conn, sync):
         super(RequestOK, self).__init__(conn)
-        request_body = msgpack.dumps({IPROTO_CODE: self.request_type,
-                                      IPROTO_SYNC: sync})
+        request_body = self._dumps({IPROTO_CODE: self.request_type,
+                                    IPROTO_SYNC: sync})
         self._body = request_body