Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #17287 -- Prevented LocMemCache.incr/decr from changing key exp…

…iry time. Thanks Ivan Virabyan for report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1086a9a8455420b7167fe5195bca4c74883dcef0 1 parent 9c41437
@carljm carljm authored
View
16 django/core/cache/backends/locmem.py
@@ -87,6 +87,22 @@ def set(self, key, value, timeout=None, version=None):
finally:
self._lock.writer_leaves()
+ def incr(self, key, delta=1, version=None):
+ value = self.get(key, version=version)
+ if value is None:
+ raise ValueError("Key '%s' not found" % key)
+ new_value = value + delta
+ key = self.make_key(key, version=version)
+ self._lock.writer_enters()
+ try:
+ pickled = pickle.dumps(new_value, pickle.HIGHEST_PROTOCOL)
+ self._cache[key] = pickled
+ except pickle.PickleError:
+ pass
+ finally:
+ self._lock.writer_leaves()
+ return new_value
+
def has_key(self, key, version=None):
key = self.make_key(key, version=version)
self.validate_key(key)
View
10 tests/regressiontests/cache/tests.py
@@ -865,6 +865,16 @@ def test_multiple_caches(self):
self.assertEqual(mirror_cache.get('value1'), 42)
self.assertEqual(other_cache.get('value1'), None)
+ def test_incr_decr_timeout(self):
+ """incr/decr does not modify expiry time (matches memcached behavior)"""
+ key = 'value'
+ _key = self.cache.make_key(key)
+ self.cache.set(key, 1, timeout=self.cache.default_timeout*10)
+ expire = self.cache._expire_info[_key]
+ self.cache.incr(key)
+ self.assertEqual(expire, self.cache._expire_info[_key])
+ self.cache.decr(key)
+ self.assertEqual(expire, self.cache._expire_info[_key])
# memcached backend isn't guaranteed to be available.
# To check the memcached backend, the test settings file will
Please sign in to comment.
Something went wrong with that request. Please try again.