Merge branch 'master' into json-t-h

Author: dvora-h

redis/commands/core.py

@@ -1917,6 +1917,46 @@ def brpoplpush(self, src, dst, timeout=0):
             timeout = 0
         return self.execute_command("BRPOPLPUSH", src, dst, timeout)
 
+    def blmpop(
+        self,
+        timeout: float,
+        numkeys: int,
+        *args: List[str],
+        direction: str,
+        count: Optional[int] = 1,
+    ) -> Optional[list]:
+        """
+        Pop ``count`` values (default 1) from first non-empty in the list
+        of provided key names.
+
+        When all lists are empty this command blocks the connection until another
+        client pushes to it or until the timeout, timeout of 0 blocks indefinitely
+
+        For more information check https://redis.io/commands/blmpop
+        """
+        args = [timeout, numkeys, *args, direction, "COUNT", count]
+
+        return self.execute_command("BLMPOP", *args)
+
+    def lmpop(
+        self,
+        num_keys: int,
+        *args: List[str],
+        direction: str = None,
+        count: Optional[int] = 1,
+    ) -> List:
+        """
+        Pop ``count`` values (default 1) first non-empty list key from the list
+        of args provided key names.
+
+        For more information check https://redis.io/commands/lmpop
+        """
+        args = [num_keys] + list(args) + [direction]
+        if count != 1:
+            args.extend(["COUNT", count])
+
+        return self.execute_command("LMPOP", *args)
+
     def lindex(self, name, index):
         """
         Return the item from list ``name`` at position ``index``
@@ -2388,6 +2428,19 @@ def sinter(self, keys, *args):
         args = list_or_args(keys, args)
         return self.execute_command("SINTER", *args)
 
+    def sintercard(self, numkeys: int, keys: List[str], limit: int = 0) -> int:
+        """
+        Return the cardinality of the intersect of multiple sets specified by ``keys`.
+
+        When LIMIT provided (defaults to 0 and means unlimited), if the intersection
+        cardinality reaches limit partway through the computation, the algorithm will
+        exit and yield limit as the cardinality
+
+        For more information check https://redis.io/commands/sintercard
+        """
+        args = [numkeys, *keys, "LIMIT", limit]
+        return self.execute_command("SINTERCARD", *args)
+
     def sinterstore(self, dest, keys, *args):
         """
         Store the intersection of sets specified by ``keys`` into a new

redis/commands/json/commands.py

@@ -77,6 +77,7 @@ def arrpop(
         path: Optional[str] = Path.rootPath(),
         index: Optional[int] = -1,
     ) -> List[Union[str, None]]:
+
         """Pop the element at ``index`` in the array JSON value under
         ``path`` at key ``name``.
 
@@ -95,6 +96,7 @@ def arrtrim(
         return self.execute_command("JSON.ARRTRIM", name, str(path), start, stop)
 
     def type(self, name: str, path: Optional[str] = Path.rootPath()) -> List[str]:
+
         """Get the type of the JSON value under ``path`` from key ``name``.
 
         For more information: https://oss.redis.com/redisjson/commands/#jsontype

tests/test_commands.py

@@ -1480,6 +1480,29 @@ def test_brpoplpush_empty_string(self, r):
         r.rpush("a", "")
         assert r.brpoplpush("a", "b") == b""
 
+    @pytest.mark.onlynoncluster
+    # @skip_if_server_version_lt("7.0.0") turn on after redis 7 release
+    def test_blmpop(self, unstable_r):
+        unstable_r.rpush("a", "1", "2", "3", "4", "5")
+        res = [b"a", [b"1", b"2"]]
+        assert unstable_r.blmpop(1, "2", "b", "a", direction="LEFT", count=2) == res
+        with pytest.raises(TypeError):
+            unstable_r.blmpop(1, "2", "b", "a", count=2)
+        unstable_r.rpush("b", "6", "7", "8", "9")
+        assert unstable_r.blmpop(0, "2", "b", "a", direction="LEFT") == [b"b", [b"6"]]
+        assert unstable_r.blmpop(1, "2", "foo", "bar", direction="RIGHT") is None
+
+    @pytest.mark.onlynoncluster
+    # @skip_if_server_version_lt("7.0.0") turn on after redis 7 release
+    def test_lmpop(self, unstable_r):
+        unstable_r.rpush("foo", "1", "2", "3", "4", "5")
+        result = [b"foo", [b"1", b"2"]]
+        assert unstable_r.lmpop("2", "bar", "foo", direction="LEFT", count=2) == result
+        with pytest.raises(redis.ResponseError):
+            unstable_r.lmpop("2", "bar", "foo", direction="up", count=2)
+        unstable_r.rpush("bar", "a", "b", "c", "d")
+        assert unstable_r.lmpop("2", "bar", "foo", direction="LEFT") == [b"bar", [b"a"]]
+
     def test_lindex(self, r):
         r.rpush("a", "1", "2", "3")
         assert r.lindex("a", "0") == b"1"
@@ -1748,6 +1771,15 @@ def test_sinter(self, r):
         r.sadd("b", "2", "3")
         assert r.sinter("a", "b") == {b"2", b"3"}
 
+    @pytest.mark.onlynoncluster
+    # @skip_if_server_version_lt("7.0.0") turn on after redis 7 release
+    def test_sintercard(self, unstable_r):
+        unstable_r.sadd("a", 1, 2, 3)
+        unstable_r.sadd("b", 1, 2, 3)
+        unstable_r.sadd("c", 1, 3, 4)
+        assert unstable_r.sintercard(3, ["a", "b", "c"]) == 2
+        assert unstable_r.sintercard(3, ["a", "b", "c"], limit=1) == 1
+
     @pytest.mark.onlynoncluster
     def test_sinterstore(self, r):
         r.sadd("a", "1", "2", "3")