Skip to content

fix ignored version in first get_or_set fetch #123

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 3 commits into
base: master
Choose a base branch
from
Open

fix ignored version in first get_or_set fetch #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0259ccd
fix ignored version in first get_or_set fetch
Oct 5, 2016
096f176
User versionsed key when picking client
AlexRiina Oct 5, 2016
4858b1a
add inlined versions of get and set to force same client
AlexRiina Oct 6, 2016
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
13 changes: 10 additions & 3 deletions redis_cache/backends/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,12 @@ def incr(self, client, key, delta=1):
value = client.incr(key, delta)
except redis.ResponseError:
key = key._original_key
value = self.get(key) + delta
self.set(key, value, timeout=None)

# inlined set.get to keep client consistent
value = self.get_value(client.get(key))

# inlined self.set to keep client consistent
self._set(client, key, self.prep_value(value), timeout=None)
return value

def _incr_version(self, client, old, new, delta, version):
Expand Down Expand Up @@ -405,7 +409,8 @@ def get_or_set(self, client, key, func, timeout=DEFAULT_TIMEOUT):
if not callable(func):
raise Exception("Must pass in a callable")

value = self.get(key._original_key)
# inlined set.get to keep client consistent
value = client.get(key)

if value is None:

Expand All @@ -427,6 +432,8 @@ def get_or_set(self, client, key, func, timeout=DEFAULT_TIMEOUT):

# Set value of `func` and set timeout
self._set(client, key, self.prep_value(value), timeout)
else:
value = self.get_value(value)

return value

Expand Down
9 changes: 5 additions & 4 deletions tests/testapp/tests/base_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,23 +491,24 @@ def expensive_function():

expensive_function.num_calls = 0
self.assertEqual(expensive_function.num_calls, 0)
value = self.cache.get_or_set('a', expensive_function, 1)
value = self.cache.get_or_set('a', expensive_function, 1, version=2)
self.assertEqual(expensive_function.num_calls, 1)
self.assertEqual(value, 42)

value = self.cache.get_or_set('a', expensive_function, 1)
value = self.cache.get_or_set('a', expensive_function, 1, version=2)
self.assertEqual(expensive_function.num_calls, 1)
self.assertEqual(value, 42)

value = self.cache.get_or_set('a', expensive_function, 1)
value = self.cache.get_or_set('a', expensive_function, 1, version=2)
self.assertEqual(expensive_function.num_calls, 1)
self.assertEqual(value, 42)

time.sleep(2)
value = self.cache.get_or_set('a', expensive_function, 1)
value = self.cache.get_or_set('a', expensive_function, 1, version=2)
self.assertEqual(expensive_function.num_calls, 2)
self.assertEqual(value, 42)


def assertMaxConnection(self, cache, max_num):
for client in cache.clients.values():
self.assertLessEqual(client.connection_pool._created_connections, max_num)
Expand Down