Merge pull request #500 from splitio/async-flagset-storage-consumer

updated adapter.redis, storage.redis and storage.pluggable

Author: chillaq

splitio/storage/adapters/redis.py

@@ -403,7 +403,6 @@ def pipeline(self):
         except RedisError as exc:
             raise RedisAdapterException('Error executing ttl operation') from exc
 
-
 class RedisAdapterAsync(RedisAdapterBase):  # pylint: disable=too-many-public-methods
     """
     Instance decorator for asyncio Redis clients such as StrictRedis.
@@ -609,30 +608,9 @@ async def close(self):
         await self._decorated.close()
         await self._decorated.connection_pool.disconnect(inuse_connections=True)
 
-class RedisPipelineAdapterBase(object, metaclass=abc.ABCMeta):
-    """
-    Template decorator for Redis Pipeline.
+class RedisPipelineAdapterBase(object):
     """
-    @abc.abstractmethod
-    def rpush(self, key, *values):
-        """Mimic original redis function but using user custom prefix."""
-
-    @abc.abstractmethod
-    def incr(self, name, amount=1):
-        """Mimic original redis function but using user custom prefix."""
-
-    @abc.abstractmethod
-    def hincrby(self, name, key, amount=1):
-        """Mimic original redis function but using user custom prefix."""
-
-    @abc.abstractmethod
-    def execute(self):
-        """Mimic original redis execute."""
-
-
-class RedisPipelineAdapter(RedisPipelineAdapterBase):
-    """
-    Instance decorator for Redis Pipeline.
+    Base decorator for Redis Pipeline.
 
     Adds an extra layer handling addition/removal of user prefix when handling
     keys
@@ -659,14 +637,33 @@ def hincrby(self, name, key, amount=1):
         """Mimic original redis function but using user custom prefix."""
         self._pipe.hincrby(self._prefix_helper.add_prefix(name), key, amount)
 
+    def smembers(self, name):
+        """Mimic original redis function but using user custom prefix."""
+        self._pipe.smembers(self._prefix_helper.add_prefix(name))
+
+class RedisPipelineAdapter(RedisPipelineAdapterBase):
+    """
+    Instance decorator for Redis Pipeline.
+
+    Adds an extra layer handling addition/removal of user prefix when handling
+    keys
+    """
+    def __init__(self, decorated, prefix_helper):
+        """
+        Store the user prefix and the redis client instance.
+
+        :param decorated: Instance of redis cache client to decorate.
+        :param _prefix_helper: PrefixHelper utility
+        """
+        RedisPipelineAdapterBase.__init__(self, decorated, prefix_helper)
+
     def execute(self):
         """Mimic original redis function but using user custom prefix."""
         try:
             return self._pipe.execute()
         except RedisError as exc:
             raise RedisAdapterException('Error executing pipeline operation') from exc
 
-
 class RedisPipelineAdapterAsync(RedisPipelineAdapterBase):
     """
     Instance decorator for Asyncio Redis Pipeline.
@@ -681,20 +678,7 @@ def __init__(self, decorated, prefix_helper):
         :param decorated: Instance of redis cache client to decorate.
         :param _prefix_helper: PrefixHelper utility
         """
-        self._prefix_helper = prefix_helper
-        self._pipe = decorated.pipeline()
-
-    def rpush(self, key, *values):
-        """Mimic original redis function but using user custom prefix."""
-        self._pipe.rpush(self._prefix_helper.add_prefix(key), *values)
-
-    def incr(self, name, amount=1):
-        """Mimic original redis function but using user custom prefix."""
-        self._pipe.incr(self._prefix_helper.add_prefix(name), amount)
-
-    def hincrby(self, name, key, amount=1):
-        """Mimic original redis function but using user custom prefix."""
-        self._pipe.hincrby(self._prefix_helper.add_prefix(name), key, amount)
+        RedisPipelineAdapterBase.__init__(self, decorated, prefix_helper)
 
     async def execute(self):
         """Mimic original redis function but using user custom prefix."""