Skip to content

[#3612] Generating unique command cache key #3765

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.

Sign up for GitHub

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 7 commits into
base: master
Choose a base branch
from
+60 −12
Open

[#3612] Generating unique command cache key #3765

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a630791
Fix for _current_command_cache_key generating same against key for di…
Sep 6, 2025
3590399
correction in test_read_response_returns_cached_reply test case for n…
Sep 8, 2025
728c205
Update redis/cache.py
ShubhamKaudewar Sep 16, 2025
49b5c45
linter checks
Sep 16, 2025
7694776
Merge branch 'master' into fix_unique_cache_key
ShubhamKaudewar Sep 16, 2025
376eda7
Merge branch 'master' into fix_unique_cache_key
petyaslavova Sep 25, 2025
838682d
Merge branch 'master' into fix_unique_cache_key
ShubhamKaudewar Sep 27, 2025
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
1 change: 1 addition & 0 deletions redis/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class EvictionPolicyType(Enum):
class CacheKey:
command: str
redis_keys: tuple
redis_args: tuple = ()


class CacheEntry:
Expand Down
4 changes: 2 additions & 2 deletions redis/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ def send_command(self, *args, **kwargs):
with self._cache_lock:
# Command is write command or not allowed
# to be cached.
if not self._cache.is_cachable(CacheKey(command=args[0], redis_keys=())):
if not self._cache.is_cachable(CacheKey(command=args[0], redis_keys=(), redis_args=())):
self._current_command_cache_key = None
self._conn.send_command(*args, **kwargs)
return
Expand All @@ -1224,7 +1224,7 @@ def send_command(self, *args, **kwargs):

# Creates cache key.
self._current_command_cache_key = CacheKey(
command=args[0], redis_keys=tuple(kwargs.get("keys"))
command=args[0], redis_keys=tuple(kwargs.get("keys")), redis_args=args
)

with self._cache_lock:
Expand Down
25 changes: 15 additions & 10 deletions tests/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,17 @@ def test_format_error_message(conn, error, expected_message):


def test_network_connection_failure():
exp_err = f"Error {ECONNREFUSED} connecting to localhost:9999. Connection refused."
# Match only the stable part of the error message across OS
exp_err = rf"Error {ECONNREFUSED} connecting to localhost:9999\."
with pytest.raises(ConnectionError, match=exp_err):
redis = Redis(port=9999)
redis.set("a", "b")


@pytest.mark.skipif(
not hasattr(socket, "AF_UNIX"),
reason="Unix domain sockets not supported on this platform"
)
def test_unix_socket_connection_failure():
exp_err = "Error 2 connecting to unix:///tmp/a.sock. No such file or directory."
with pytest.raises(ConnectionError, match=exp_err):
Expand Down Expand Up @@ -463,25 +468,25 @@ def test_read_response_returns_cached_reply(self, mock_cache, mock_connection):
None,
None,
CacheEntry(
cache_key=CacheKey(command="GET", redis_keys=("foo",)),
cache_key=CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo")),
cache_value=CacheProxyConnection.DUMMY_CACHE_VALUE,
status=CacheEntryStatus.IN_PROGRESS,
connection_ref=mock_connection,
),
CacheEntry(
cache_key=CacheKey(command="GET", redis_keys=("foo",)),
cache_key=CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo")),
cache_value=b"bar",
status=CacheEntryStatus.VALID,
connection_ref=mock_connection,
),
CacheEntry(
cache_key=CacheKey(command="GET", redis_keys=("foo",)),
cache_key=CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo")),
cache_value=b"bar",
status=CacheEntryStatus.VALID,
connection_ref=mock_connection,
),
CacheEntry(
cache_key=CacheKey(command="GET", redis_keys=("foo",)),
cache_key=CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo")),
cache_value=b"bar",
status=CacheEntryStatus.VALID,
connection_ref=mock_connection,
Expand All @@ -503,15 +508,15 @@ def test_read_response_returns_cached_reply(self, mock_cache, mock_connection):
[
call(
CacheEntry(
cache_key=CacheKey(command="GET", redis_keys=("foo",)),
cache_key=CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo")),
cache_value=CacheProxyConnection.DUMMY_CACHE_VALUE,
status=CacheEntryStatus.IN_PROGRESS,
connection_ref=mock_connection,
)
),
call(
CacheEntry(
cache_key=CacheKey(command="GET", redis_keys=("foo",)),
cache_key=CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo")),
cache_value=b"bar",
status=CacheEntryStatus.VALID,
connection_ref=mock_connection,
Expand All @@ -522,9 +527,9 @@ def test_read_response_returns_cached_reply(self, mock_cache, mock_connection):

mock_cache.get.assert_has_calls(
[
call(CacheKey(command="GET", redis_keys=("foo",))),
call(CacheKey(command="GET", redis_keys=("foo",))),
call(CacheKey(command="GET", redis_keys=("foo",))),
call(CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo"))),
call(CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo"))),
call(CacheKey(command="GET", redis_keys=("foo",), redis_args=("GET", "foo"))),
]
)

Expand Down
Loading