p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #30181 -- Made cache.get() with default work correctly on PyLibMCCache if None is cached.

This commit is contained in:
Jakub Szafrański 2019-02-15 01:57:38 +01:00 committed by Tim Graham
parent 741ce81a42
commit 0104b5a417
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/core/cache/backends/memcached.py vendored
View File

@ -68,10 +68,7 @@ class BaseMemcachedCache(BaseCache):
def get(self, key, default=None, version=None): def get(self, key, default=None, version=None):
key = self.make_key(key, version=version) key = self.make_key(key, version=version)
val = self._cache.get(key) return self._cache.get(key, default)
if val is None:
return default
return val
def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None): def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):
key = self.make_key(key, version=version) key = self.make_key(key, version=version)
@ -163,6 +160,16 @@ class MemcachedCache(BaseMemcachedCache):
key = self.make_key(key, version=version) key = self.make_key(key, version=version)
return self._cache.touch(key, self.get_backend_timeout(timeout)) != 0 return self._cache.touch(key, self.get_backend_timeout(timeout)) != 0
def get(self, key, default=None, version=None):
key = self.make_key(key, version=version)
val = self._cache.get(key)
# python-memcached doesn't support default values in get().
# https://github.com/linsomniac/python-memcached/issues/159
# Remove this method if that issue is fixed.
if val is None:
return default
return val
class PyLibMCCache(BaseMemcachedCache): class PyLibMCCache(BaseMemcachedCache):
"An implementation of a cache binding using pylibmc" "An implementation of a cache binding using pylibmc"

13
tests/cache/tests.py vendored
View File

@ -274,6 +274,11 @@ class BaseCacheTests:
cache.set("key", "value") cache.set("key", "value")
self.assertEqual(cache.get("key"), "value") self.assertEqual(cache.get("key"), "value")
def test_default_used_when_none_is_set(self):
"""If None is cached, get() returns it instead of the default."""
cache.set('key_default_none', None)
self.assertIsNone(cache.get('key_default_none', default='default'))
def test_add(self): def test_add(self):
# A key can be added to a cache # A key can be added to a cache
cache.add("addkey1", "value") cache.add("addkey1", "value")
@ -1365,6 +1370,14 @@ class MemcachedCacheTests(BaseMemcachedTests, TestCase):
def test_memcached_options(self): def test_memcached_options(self):
self.assertEqual(cache._cache.server_max_value_length, 9999) self.assertEqual(cache._cache.server_max_value_length, 9999)
def test_default_used_when_none_is_set(self):
"""
python-memcached doesn't support default in get() so this test
overrides the one in BaseCacheTests.
"""
cache.set('key_default_none', None)
self.assertEqual(cache.get('key_default_none', default='default'), 'default')
@unittest.skipUnless(PyLibMCCache_params, "PyLibMCCache backend not configured") @unittest.skipUnless(PyLibMCCache_params, "PyLibMCCache backend not configured")
@override_settings(CACHES=caches_setting_for_tests( @override_settings(CACHES=caches_setting_for_tests(