Add support for nx, xx, gt, lt

jazzband · Nov 16, 2024 · 7dd5c1e · 7dd5c1e
1 parent fccdcf8
commit 7dd5c1e
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 6 deletions.
diff --git a/django_redis/client/default.py b/django_redis/client/default.py
@@ -317,6 +317,10 @@ def expire(
         timeout: ExpiryT,
         version: Optional[int] = None,
         client: Optional[Redis] = None,
+        nx: bool = False,
+        xx: bool = False,
+        gt: bool = False,
+        lt: bool = False,
     ) -> bool:
         if timeout is DEFAULT_TIMEOUT:
             timeout = self._backend.default_timeout  # type: ignore
@@ -326,14 +330,18 @@ def expire(
 
         key = self.make_key(key, version=version)
 
-        return client.expire(key, timeout)
+        return client.expire(key, timeout, nx, xx, gt, lt)
 
     def pexpire(
         self,
         key: KeyT,
         timeout: ExpiryT,
         version: Optional[int] = None,
         client: Optional[Redis] = None,
+        nx: bool = False,
+        xx: bool = False,
+        gt: bool = False,
+        lt: bool = False,
     ) -> bool:
         if timeout is DEFAULT_TIMEOUT:
             timeout = self._backend.default_timeout  # type: ignore
@@ -343,7 +351,7 @@ def pexpire(
 
         key = self.make_key(key, version=version)
 
-        return bool(client.pexpire(key, timeout))
+        return bool(client.pexpire(key, timeout, nx, xx, gt, lt))
 
     def pexpire_at(
         self,

diff --git a/django_redis/client/sharded.py b/django_redis/client/sharded.py
@@ -171,19 +171,57 @@ def persist(self, key, version=None, client=None):
 
         return super().persist(key=key, version=version, client=client)
 
-    def expire(self, key, timeout, version=None, client=None):
+    def expire(
+        self,
+        key,
+        timeout,
+        version=None,
+        client=None,
+        nx=False,
+        xx=False,
+        gt=False,
+        lt=False,
+    ):
         if client is None:
             key = self.make_key(key, version=version)
             client = self.get_server(key)
 
-        return super().expire(key=key, timeout=timeout, version=version, client=client)
+        return super().expire(
+            key=key,
+            timeout=timeout,
+            version=version,
+            client=client,
+            nx=nx,
+            xx=xx,
+            gt=gt,
+            lt=lt,
+        )
 
-    def pexpire(self, key, timeout, version=None, client=None):
+    def pexpire(
+        self,
+        key,
+        timeout,
+        version=None,
+        client=None,
+        nx=False,
+        xx=False,
+        gt=False,
+        lt=False,
+    ):
         if client is None:
             key = self.make_key(key, version=version)
             client = self.get_server(key)
 
-        return super().pexpire(key=key, timeout=timeout, version=version, client=client)
+        return super().pexpire(
+            key=key,
+            timeout=timeout,
+            version=version,
+            client=client,
+            nx=nx,
+            xx=xx,
+            gt=gt,
+            lt=lt,
+        )
 
     def pexpire_at(self, key, when: Union[datetime, int], version=None, client=None):
         """