Add basic support for IPROTO EVAL requests

Author: rtsisyk

.gitignore

@@ -1,6 +1,7 @@
 *.pyc
 *.pyo
 *.wpr
+*~
 /build/
 /dist/
 /MANIFEST

tarantool/connection.py

@@ -25,6 +25,7 @@
     Request,
     RequestCall,
     RequestDelete,
+    RequestEval,
     RequestInsert,
     RequestReplace,
     RequestPing,
@@ -281,6 +282,28 @@ def call(self, func_name, *args):
         response = self._send_request(request)
         return response
 
+    def eval(self, expr, *args):
+        '''\
+        Execute EVAL request. Eval Lua expression.
+
+        :param expr: Lua expression
+        :type expr: str
+        :param args: list of function arguments
+        :type args: list or tuple
+
+        :rtype: `Response` instance
+        '''
+        assert isinstance(expr, str)
+
+        # This allows to use a tuple or list as an argument
+        if len(args) == 1 and isinstance(args[0], (list, tuple)):
+            args = args[0]
+
+        request = RequestEval(self, expr, args)
+        response = self._send_request(request)
+        return response
+
+
     def replace(self, space_name, values):
         '''
         Execute REPLACE request.

tarantool/const.py

@@ -26,6 +26,7 @@
 REQUEST_TYPE_DELETE = 5
 REQUEST_TYPE_CALL = 6
 REQUEST_TYPE_AUTHENTICATE = 7
+REQUEST_TYPE_EVAL = 8
 REQUEST_TYPE_ERROR = 1 << 15
 
 

tarantool/request.py

@@ -26,6 +26,7 @@
     REQUEST_TYPE_DELETE,
     REQUEST_TYPE_UPDATE,
     REQUEST_TYPE_CALL,
+    REQUEST_TYPE_EVAL,
     REQUEST_TYPE_AUTHENTICATE
 )
 
@@ -194,6 +195,13 @@ def __init__(self, conn, name, args):
 
         self._bytes = self.header(len(request_body)) + request_body
 
+class RequestEval(RequestCall):
+
+    '''
+        Represents EVAL request
+    '''
+    request_type = REQUEST_TYPE_EVAL
+
 
 class RequestPing(Request):
 

tarantool/response.py

@@ -3,6 +3,7 @@
 
 import sys
 import msgpack
+import yaml
 
 from tarantool.const import (
     IPROTO_CODE,
@@ -41,7 +42,7 @@ def __init__(self, conn, response):
         # created in the __new__(). But let it be.
         super(Response, self).__init__()
 
-        unpacker = msgpack.Unpacker(use_list = False)
+        unpacker = msgpack.Unpacker(use_list = True)
         unpacker.feed(response)
         header = unpacker.unpack()
 
@@ -57,12 +58,18 @@ def __init__(self, conn, response):
         if code == REQUEST_TYPE_OK:
             self._return_code = 0;
             self._completion_status = 0
-            self.extend(body.get(IPROTO_DATA, []))
+            self._data = body.get(IPROTO_DATA, None)
+            # Backward-compatibility
+            if isinstance(self._data, (list, tuple)):
+                self.extend(self._data)
+            else:
+                self.append(self._data)
         else:
             # Separate return_code and completion_code
             self._return_message = body.get(IPROTO_ERROR, "")
             self._return_code = code & (REQUEST_TYPE_ERROR - 1)
             self._completion_status = 2
+            self._data = None
             if self.conn.error:
                 raise DatabaseError(self._return_code, self._return_message)
 
@@ -105,6 +112,17 @@ def return_code(self):
         '''
         return self._return_code
 
+    @property
+    def data(self):
+        '''\
+        :type: object
+
+        Required field in the server response.
+        Contains list of tuples of SELECT, REPLACE and DELETE requests
+        and arbitrary data for CALL.
+        '''
+        return self._data
+
     @property
     def strerror(self):
         '''\
@@ -131,13 +149,11 @@ def __str__(self):
 
         :rtype: str or None
         '''
-        errstr = "---\n- error:\n    errcode: {errname}\n    errmsg: {errstr}\n..."
         if self.completion_status:
-            return errstr.format(errname = self.strerror,
-                                 errstr  = self.return_message)
-        table = ""
-        if len(self):
-            table = "\n"+"\n".join(["- "+str(list(k)) for k in self])
-        return "---{0}\n...".format(table)
+            return yaml.dump({ 'error': {
+                'code': self.strerror[0],
+                'reason': self.return_message
+            }})
+        return yaml.dump(self._data)
 
     __repr__ = __str__