Merge branch 'master' into issue/3139

Author: mahigupta

redis/_parsers/helpers.py

@@ -80,7 +80,7 @@ def parse_memory_stats(response, **kwargs):
     """Parse the results of MEMORY STATS"""
     stats = pairs_to_dict(response, decode_keys=True, decode_string_values=True)
     for key, value in stats.items():
-        if key.startswith("db."):
+        if key.startswith("db.") and isinstance(value, list):
             stats[key] = pairs_to_dict(
                 value, decode_keys=True, decode_string_values=True
             )

redis/backoff.py

@@ -19,79 +19,79 @@ def reset(self):
         pass
 
     @abstractmethod
-    def compute(self, failures):
+    def compute(self, failures: int) -> float:
         """Compute backoff in seconds upon failure"""
         pass
 
 
 class ConstantBackoff(AbstractBackoff):
     """Constant backoff upon failure"""
 
-    def __init__(self, backoff):
+    def __init__(self, backoff: float) -> None:
         """`backoff`: backoff time in seconds"""
         self._backoff = backoff
 
-    def compute(self, failures):
+    def compute(self, failures: int) -> float:
         return self._backoff
 
 
 class NoBackoff(ConstantBackoff):
     """No backoff upon failure"""
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__(0)
 
 
 class ExponentialBackoff(AbstractBackoff):
     """Exponential backoff upon failure"""
 
-    def __init__(self, cap=DEFAULT_CAP, base=DEFAULT_BASE):
+    def __init__(self, cap: float = DEFAULT_CAP, base: float = DEFAULT_BASE):
         """
         `cap`: maximum backoff time in seconds
         `base`: base backoff time in seconds
         """
         self._cap = cap
         self._base = base
 
-    def compute(self, failures):
+    def compute(self, failures: int) -> float:
         return min(self._cap, self._base * 2**failures)
 
 
 class FullJitterBackoff(AbstractBackoff):
     """Full jitter backoff upon failure"""
 
-    def __init__(self, cap=DEFAULT_CAP, base=DEFAULT_BASE):
+    def __init__(self, cap: float = DEFAULT_CAP, base: float = DEFAULT_BASE) -> None:
         """
         `cap`: maximum backoff time in seconds
         `base`: base backoff time in seconds
         """
         self._cap = cap
         self._base = base
 
-    def compute(self, failures):
+    def compute(self, failures: int) -> float:
         return random.uniform(0, min(self._cap, self._base * 2**failures))
 
 
 class EqualJitterBackoff(AbstractBackoff):
     """Equal jitter backoff upon failure"""
 
-    def __init__(self, cap=DEFAULT_CAP, base=DEFAULT_BASE):
+    def __init__(self, cap: float = DEFAULT_CAP, base: float = DEFAULT_BASE) -> None:
         """
         `cap`: maximum backoff time in seconds
         `base`: base backoff time in seconds
         """
         self._cap = cap
         self._base = base
 
-    def compute(self, failures):
+    def compute(self, failures: int) -> float:
         temp = min(self._cap, self._base * 2**failures) / 2
         return temp + random.uniform(0, temp)
 
 
 class DecorrelatedJitterBackoff(AbstractBackoff):
     """Decorrelated jitter backoff upon failure"""
 
-    def __init__(self, cap=DEFAULT_CAP, base=DEFAULT_BASE):
+    def __init__(self, cap: float = DEFAULT_CAP, base: float = DEFAULT_BASE) -> None:
         """
         `cap`: maximum backoff time in seconds
         `base`: base backoff time in seconds
@@ -100,10 +100,10 @@ def __init__(self, cap=DEFAULT_CAP, base=DEFAULT_BASE):
         self._base = base
         self._previous_backoff = 0
 
-    def reset(self):
+    def reset(self) -> None:
         self._previous_backoff = 0
 
-    def compute(self, failures):
+    def compute(self, failures: int) -> float:
         max_backoff = max(self._base, self._previous_backoff * 3)
         temp = random.uniform(self._base, max_backoff)
         self._previous_backoff = min(self._cap, temp)

tests/test_asyncio/test_commands.py

@@ -3235,7 +3235,7 @@ async def test_memory_stats(self, r: redis.Redis):
         assert isinstance(stats, dict)
         for key, value in stats.items():
             if key.startswith("db."):
-                assert isinstance(value, dict)
+                assert not isinstance(value, list)
 
     @skip_if_server_version_lt("4.0.0")
     async def test_memory_usage(self, r: redis.Redis):

tests/test_commands.py

@@ -712,7 +712,7 @@ def test_client_kill_filter_by_user(self, r, request):
     def test_client_kill_filter_by_maxage(self, r, request):
         _get_client(redis.Redis, request, flushdb=False)
         time.sleep(4)
-        assert len(r.client_list()) == 2
+        assert len(r.client_list()) >= 2
         r.client_kill_filter(maxage=2)
         assert len(r.client_list()) == 1
 
@@ -4914,7 +4914,7 @@ def test_memory_stats(self, r):
         assert isinstance(stats, dict)
         for key, value in stats.items():
             if key.startswith("db."):
-                assert isinstance(value, dict)
+                assert not isinstance(value, list)
 
     @skip_if_server_version_lt("4.0.0")
     def test_memory_usage(self, r):