Merge pull request #39 from amirreza8002/cluster_methods

adjust cluster methods

Author: amirreza8002

django_valkey/cluster_cache/cache.py

@@ -5,12 +5,30 @@
 
 
 class ClusterCommands:
+    def msetnx(self: "ClusterValkeyCache", *args, **kwargs):
+        return self.client.msetnx(*args, **kwargs)
+
     def mget_nonatomic(self: "ClusterValkeyCache", *args, **kwargs):
         return self.client.mget_nonatomic(*args, **kwargs)
 
     def mset_nonatomic(self: "ClusterValkeyCache", *args, **kwargs):
         return self.client.mset_nonatomic(*args, **kwargs)
 
+    def readonly(self: "ClusterValkeyCache", *args, **kwargs):
+        return self.client.readonly(*args, **kwargs)
+
+    def readwrite(self: "ClusterValkeyCache", *args, **kwargs):
+        return self.client.readwrite(*args, **kwargs)
+
+    def keyslot(self: "ClusterValkeyCache", *args, **kwargs):
+        return self.client.keyslot(*args, **kwargs)
+
+    def flushall(self: "ClusterValkeyCache", *args, **kwargs):
+        return self.client.flushall(*args, **kwargs)
+
+    def invalidate_key_from_cache(self: "ClusterValkeyCache", *args, **kwargs):
+        return self.client.invalidate_key_from_cache(*args, **kwargs)
+
 
 class ClusterValkeyCache(
     BaseValkeyCache[DefaultClusterClient, ValkeyCluster],

django_valkey/cluster_cache/client/default.py

@@ -90,17 +90,19 @@ def mget_nonatomic(self, keys, version=None, client=None):
         for key, value in zip(keys, values):
             if value is None:
                 continue
-            recovered_data[map_keys[key]] = self.decode(value)
+            recovered_data[key] = self.decode(value)
         return recovered_data
 
+    get_many = mget_nonatomic
+
     def keyslot(self, key, version=None, client=None):
         client = self._get_client(client=client)
         key = self.make_key(key, version=version)
         return client.keyslot(key)
 
-    def flush_cache(self, client=None):
+    def flushall(self, asynchronous=False, client=None):
         client = self._get_client(client=client)
-        return client.flush_cache()
+        return client.flushall(asynchronous=asynchronous)
 
     def invalidate_key_from_cache(self, client=None):
         client = self._get_client(client=client)

tests/tests_cluster/test_backend.py

@@ -43,6 +43,14 @@ def test_mset(self, cache: ClusterValkeyCache):
         res = cache.mget(["a{foo}", "b{foo}", "c{foo}"])
         assert res == {"a{foo}": 1, "b{foo}": 2, "c{foo}": 3}
 
+    def test_msetnx(self, cache: ClusterValkeyCache):
+        cache.mset({"a{foo}": 1, "b{foo}": 2, "c{foo}": 3})
+        res = cache.mget(["a{foo}", "b{foo}", "c{foo}"])
+        assert res == {"a{foo}": 1, "b{foo}": 2, "c{foo}": 3}
+        cache.msetnx({"a{foo}": 3, "new{foo}": 1, "other{foo}": 1})
+        res = cache.mget(["a{foo}", "new{foo}", "other{foo}"])
+        assert res == {"a{foo}": 1}
+
     def test_delete_pattern(self, cache: ClusterValkeyCache):
         for key in ["foo-aa", "foo-ab", "foo-bb", "foo-bc"]:
             cache.set(key, "foo")
@@ -147,3 +155,12 @@ def test_sunionstore(self, cache: ClusterValkeyCache):
         cache.sadd("{foo}2", "bar2", "bar3")
         assert cache.sunionstore("{foo}3", "{foo}1", "{foo}2") == 3
         assert cache.smembers("{foo}3") == {"bar1", "bar2", "bar3"}
+
+    def test_flushall(self, cache: ClusterValkeyCache):
+        cache.set("{foo}a", 1)
+        cache.sadd("{foo}1", "bar1", "bar2")
+        cache.hset("foo_hash1", "foo1", "bar1")
+        cache.flushall()
+        assert not cache.get("{foo}a")
+        assert cache.smembers("{foo}a") == set()
+        assert not cache.hexists("foo_hash1", "foo1")