Moving Ping to separate operation, so we have only one way to send requests

Author: bigbes

src/tarantool/connection.py

@@ -284,22 +284,24 @@ def update(self, space_name, key, op_list, return_tuple=False):
         return self._send_request(request, space_name)
 
 
-    def ping(self, notime = False):
+    def ping(self, notime=False):
         '''\
         Execute PING request.
         Send empty request and receive empty response from server.
 
         :return: response time in seconds
         :rtype: float
         '''
-        self._opt_reconnect()
+
+        request = RequestPing(self)
         t0 = time.time()
-        self._socket.sendall(struct_LLL.pack(0xff00, 0, 0))
-        request_type, body_length, request_id = struct_LLL.unpack(self._socket.recv(12)) # pylint: disable=W0612
+        response = self._send_request(request)
         t1 = time.time()
-        assert request_type == 0xff00
-        assert body_length == 0
-        if no_time:
+
+        assert response._request_type == REQUEST_TYPE_PING
+        assert response._body_length == 0
+
+        if notime:
             return "Success"
         return t1 - t0
 

src/tarantool/const.py

@@ -21,17 +21,18 @@
 struct_BQ = struct.Struct("<BQ")
 
 
-REQUEST_TYPE_CALL = 22
-REQUEST_TYPE_DELETE = 21
 REQUEST_TYPE_INSERT = 13
 REQUEST_TYPE_SELECT = 17
 REQUEST_TYPE_UPDATE = 19
+REQUEST_TYPE_DELETE = 21
+REQUEST_TYPE_CALL   = 22
+REQUEST_TYPE_PING   = 65280
 
 
 UPDATE_OPERATION_CODE = {'=': 0, '+': 1, '&': 2, '^': 3, '|': 4, 'splice': 5}
 
 # Default value for socket timeout (seconds)
-SOCKET_TIMEOUT = 1
+SOCKET_TIMEOUT = None
 # Default maximum number of attempts to reconnect
 RECONNECT_MAX_ATTEMPTS = 10
 # Default delay between attempts to reconnect (seconds)

src/tarantool/request.py

@@ -291,3 +291,15 @@ def __init__(self, conn, proc_name, args, return_tuple):    # pylint: disable=W0
             self.pack_tuple([k for k in args])
 
         self._bytes = self.header(len(request_body)) + request_body
+
+class RequestPing(Request):
+    '''
+    Ping body is empty, so body_length == 0 and there's no body
+    |--------------- header ----------------|
+     <request_type><body_length><request_id>
+    '''
+    request_typle = REQUEST_TYPE_PING
+
+    def __init__(self, conn, notime):
+        super(RequestPing, self).__init__(conn)
+        self._bytes = self.header(0)