Skip to content

Apply suggestions from review of jazzband/django-redis#654 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: feat/add-set-functionality
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions django_redis/cache.py
Original file line number Diff line number Diff line change
@@ -204,6 +204,10 @@ def sdiffstore(self, *args, **kwargs):
def sinter(self, *args, **kwargs):
return self.client.sinter(*args, **kwargs)

@omit_exception
def sintercard(self, *args, **kwargs):
return self.client.sintercard(*args, **kwargs)

@omit_exception
def sinterstore(self, *args, **kwargs):
return self.client.sinterstore(*args, **kwargs)
@@ -212,6 +216,10 @@ def sinterstore(self, *args, **kwargs):
def sismember(self, *args, **kwargs):
return self.client.sismember(*args, **kwargs)

@omit_exception
def smismember(self, *args, **kwargs):
return self.client.smismember(*args, **kwargs)

@omit_exception
def smembers(self, *args, **kwargs):
return self.client.smembers(*args, **kwargs)
@@ -228,6 +236,10 @@ def spop(self, *args, **kwargs):
def srandmember(self, *args, **kwargs):
return self.client.srandmember(*args, **kwargs)

@omit_exception
def sscan(self, *args, **kwargs):
return self.client.sscan(*args, **kwargs)

@omit_exception
def srem(self, *args, **kwargs):
return self.client.srem(*args, **kwargs)
12 changes: 8 additions & 4 deletions django_redis/client/default.py
Original file line number Diff line number Diff line change
@@ -818,16 +818,20 @@ def sdiff(
def sdiffstore(
self,
dest: Any,
key: Any,
*keys,
version: Optional[int] = None,
version_dest: Optional[int] = None,
version_minuend: Optional[int] = None,
version_subtrahend: Optional[int] = None,
client: Optional[Redis] = None,
) -> int:
if client is None:
client = self.get_client(write=True)

dest = self.make_key(dest, version=version)
keys = [self.make_key(key, version=version) for key in keys]
return int(client.sdiffstore(dest, *keys))
dest = self.make_key(dest, version=version_dest)
minuend_key = self.make_key(key, version=version_minuend)
subtrahend_keys = [self.make_key(key_, version=version_subtrahend) for key_ in keys]
return int(client.sdiffstore(dest, minuend_key, *subtrahend_keys))


def sinter(