wip

Author: DifferentialOrange

appveyor.yml

@@ -1,13 +1,5 @@
 environment:
   matrix:
-    - PYTHON: "C:\\Python27"
-    - PYTHON: "C:\\Python27-x64"
-    - PYTHON: "C:\\Python34"
-    - PYTHON: "C:\\Python34-x64"
-    - PYTHON: "C:\\Python35"
-    - PYTHON: "C:\\Python35-x64"
-    - PYTHON: "C:\\Python36"
-    - PYTHON: "C:\\Python36-x64"
     - PYTHON: "C:\\Python37"
     - PYTHON: "C:\\Python37-x64"
     - PYTHON: "C:\\Python38"

tarantool/__init__.py

@@ -2,28 +2,13 @@
 # pylint: disable=C0301,W0105,W0401,W0614
 
 from tarantool.connection import Connection
+from tarantool.connection_pool import ConnectionPool, Mode
+from tarantool.const import (RECONNECT_DELAY, RECONNECT_MAX_ATTEMPTS,
+                             SOCKET_TIMEOUT)
+from tarantool.error import DatabaseError, Error, NetworkError, NetworkWarning
 from tarantool.mesh_connection import MeshConnection
-from tarantool.const import (
-    SOCKET_TIMEOUT,
-    RECONNECT_MAX_ATTEMPTS,
-    RECONNECT_DELAY,
-)
-
-from tarantool.error import (
-    Error,
-    DatabaseError,
-    NetworkError,
-    NetworkWarning,
-)
-
-from tarantool.schema import (
-    Schema,
-    SchemaError
-)
-
-from tarantool.utils import (
-    ENCODING_DEFAULT
-)
+from tarantool.schema import Schema, SchemaError
+from tarantool.utils import ENCODING_DEFAULT
 
 __version__ = "0.7.1"
 
@@ -75,4 +60,5 @@ def connectmesh(addrs=({'host': 'localhost', 'port': 3301},), user=None,
 
 __all__ = ['connect', 'Connection', 'connectmesh', 'MeshConnection', 'Schema',
            'Error', 'DatabaseError', 'NetworkError', 'NetworkWarning',
-           'SchemaError', 'dbapi']
+           'SchemaError', 'ConnectionPool',
+           'Mode', 'dbapi']

tarantool/connection.py

@@ -4,80 +4,130 @@
 This module provides low-level API for Tarantool
 '''
 
-import os
-import time
+import abc
+import ctypes
+import ctypes.util
 import errno
+import os
 import socket
+import time
+
+import msgpack
+import tarantool.error
+from tarantool.const import (CONNECTION_TIMEOUT, IPROTO_GREETING_SIZE,
+                             ITERATOR_ALL, ITERATOR_EQ, RECONNECT_DELAY,
+                             RECONNECT_MAX_ATTEMPTS, REQUEST_TYPE_ERROR,
+                             REQUEST_TYPE_OK, SOCKET_TIMEOUT)
+from tarantool.error import (ConfigurationError, DatabaseError, DataError,
+                             Error, IntegrityError, InterfaceError,
+                             InternalError, NetworkError, NetworkWarning,
+                             NotSupportedError, OperationalError,
+                             ProgrammingError, SchemaError,
+                             SchemaReloadException, Warning, warn)
+from tarantool.request import (Request, RequestAuthenticate,  # RequestOK,
+                               RequestCall, RequestDelete, RequestEval,
+                               RequestExecute, RequestInsert, RequestJoin,
+                               RequestPing, RequestReplace, RequestSelect,
+                               RequestSubscribe, RequestUpdate, RequestUpsert)
+from tarantool.response import Response
+from tarantool.schema import Schema
+from tarantool.space import Space
+from tarantool.utils import (ENCODING_DEFAULT, check_key, greeting_decode,
+                             string_types, version_id)
 
-import ctypes
-import ctypes.util
 try:
     from ctypes import c_ssize_t
 except ImportError:
     from ctypes import c_longlong as c_ssize_t
 
-import msgpack
 
-import tarantool.error
-from tarantool.response import Response
-from tarantool.request import (
-    Request,
-    # RequestOK,
-    RequestCall,
-    RequestDelete,
-    RequestEval,
-    RequestInsert,
-    RequestJoin,
-    RequestReplace,
-    RequestPing,
-    RequestSelect,
-    RequestSubscribe,
-    RequestUpdate,
-    RequestUpsert,
-    RequestAuthenticate,
-    RequestExecute
-)
-from tarantool.space import Space
-from tarantool.const import (
-    CONNECTION_TIMEOUT,
-    SOCKET_TIMEOUT,
-    RECONNECT_MAX_ATTEMPTS,
-    RECONNECT_DELAY,
-    REQUEST_TYPE_OK,
-    REQUEST_TYPE_ERROR,
-    IPROTO_GREETING_SIZE,
-    ITERATOR_EQ,
-    ITERATOR_ALL
-)
-from tarantool.error import (
-    Error,
-    NetworkError,
-    DatabaseError,
-    InterfaceError,
-    ConfigurationError,
-    SchemaError,
-    NetworkWarning,
-    OperationalError,
-    DataError,
-    IntegrityError,
-    InternalError,
-    ProgrammingError,
-    NotSupportedError,
-    SchemaReloadException,
-    Warning,
-    warn
-)
-from tarantool.schema import Schema
-from tarantool.utils import (
-    check_key,
-    greeting_decode,
-    version_id,
-    string_types,
-    ENCODING_DEFAULT,
-)
+
+# Based on https://realpython.com/python-interface/
+class ConnectionInterface(metaclass=abc.ABCMeta):
+    @classmethod
+    def __subclasshook__(cls, subclass):
+        return (hasattr(subclass, 'close') and
+                callable(subclass.close) and
+                hasattr(subclass, 'is_closed') and
+                callable(subclass.is_closed) and
+                hasattr(subclass, 'connect') and
+                callable(subclass.connect) and
+                hasattr(subclass, 'call') and
+                callable(subclass.call) and
+                hasattr(subclass, 'eval') and
+                callable(subclass.eval) and
+                hasattr(subclass, 'replace') and
+                callable(subclass.replace) and
+                hasattr(subclass, 'insert') and
+                callable(subclass.insert) and
+                hasattr(subclass, 'delete') and
+                callable(subclass.delete) and
+                hasattr(subclass, 'upsert') and
+                callable(subclass.upsert) and
+                hasattr(subclass, 'update') and
+                callable(subclass.update) and
+                hasattr(subclass, 'ping') and
+                callable(subclass.ping) and
+                hasattr(subclass, 'select') and
+                callable(subclass.select) and
+                hasattr(subclass, 'execute') and
+                callable(subclass.execute) or
+                NotImplemented)
+
+    @abc.abstractmethod
+    def close(self):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def is_closed(self):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def connect(self):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def call(self, func_name, *args, **kwargs):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def eval(self, expr, *args, **kwargs):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def replace(self, space_name, values):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def insert(self, space_name, values):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def delete(self, space_name, key, **kwargs):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def upsert(self, space_name, tuple_value, op_list, **kwargs):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def update(self, space_name, key, op_list, **kwargs):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def ping(self, notime):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def select(self, space_name, key, **kwargs):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def execute(self, query, params, **kwargs):
+        raise NotImplementedError
 
 
-class Connection(object):
+class Connection(ConnectionInterface):
     '''
     Represents connection to the Tarantool server.