Remove CACHEOPS_LRU

Author: Suor

README.rst

@@ -705,9 +705,6 @@ Redis however doesn't guarantee perfect TTL eviction order, it selects several k
 one with the least TTL, thus invalidator could be evicted before cache key it refers leaving it orphan and causing it survive next invalidation.
 You can reduce this chance by increasing ``maxmemory-samples`` redis config option and by reducing cache timeout.
 
-Second strategy, probably more efficient one is adding ``CACHEOPS_LRU = True`` to your settings and then using ``maxmemory-policy volatile-lru``.
-However, this makes invalidation structures persistent, they are still removed on associated events, but in absence of them can clutter redis database.
-
 
 Keeping stats
 -------------

cacheops/conf.py

@@ -15,7 +15,6 @@ class Defaults:
     CACHEOPS_DEFAULTS = {}
     CACHEOPS = {}
     CACHEOPS_PREFIX = lambda query: ''
-    CACHEOPS_LRU = False
     CACHEOPS_INSIDEOUT = False
     CACHEOPS_CLIENT_CLASS = None
     CACHEOPS_DEGRADE_ON_FAILURE = False

cacheops/getset.py

@@ -41,7 +41,7 @@ def cache_thing(prefix, cache_key, data, cond_dnfs, timeout, dbs=(), precall_key
     else:
         if prefix and precall_key == "":
             precall_key = prefix
-        load_script('cache_thing', settings.CACHEOPS_LRU)(
+        load_script('cache_thing')(
             keys=[prefix, cache_key, precall_key],
             args=[
                 settings.CACHEOPS_SERIALIZER.dumps(data),

cacheops/lua/cache_thing.lua

@@ -47,15 +47,6 @@ for db_table, disj in pairs(dnfs) do
         redis.call('sadd', conj_key, key)
         -- NOTE: an invalidator should live longer than any key it references.
         --       So we update its ttl on every key if needed.
-        -- NOTE: if CACHEOPS_LRU is True when invalidators should be left persistent,
-        --       so we strip next section from this script.
-        -- TOSTRIP
-        local conj_ttl = redis.call('ttl', conj_key)
-        if conj_ttl < timeout then
-            -- We set conj_key life with a margin over key life to call expire rarer
-            -- And add few extra seconds to be extra safe
-            redis.call('expire', conj_key, timeout * 2 + 10)
-        end
-        -- /TOSTRIP
+        redis.call('expire', conj_key, timeout, 'gt')
     end
 end

cacheops/redis.py

@@ -53,16 +53,12 @@ def redis_client():
 
 ### Lua script loader
 
-import re
 import os.path
 
-STRIP_RE = re.compile(r'TOSTRIP.*/TOSTRIP', re.S)
 
 @memoize
-def load_script(name, strip=False):
+def load_script(name):
     filename = os.path.join(os.path.dirname(__file__), 'lua/%s.lua' % name)
     with open(filename) as f:
         code = f.read()
-    if strip:
-        code = STRIP_RE.sub('', code)
     return redis_client.register_script(code)

tests/settings.py

@@ -108,7 +108,6 @@
 if os.environ.get('CACHEOPS_PREFIX'):
     CACHEOPS_PREFIX = lambda q: 'p:'
 
-CACHEOPS_LRU = bool(os.environ.get('CACHEOPS_LRU'))
 CACHEOPS_INSIDEOUT = bool(os.environ.get('CACHEOPS_INSIDEOUT'))
 CACHEOPS_DEGRADE_ON_FAILURE = bool(os.environ.get('CACHEOPS_DEGRADE_ON_FAILURE'))
 ALLOWED_HOSTS = ['testserver']

tox.ini

@@ -47,7 +47,6 @@ deps =
 commands =
     ./run_tests.py []
     env CACHEOPS_PREFIX=1 ./run_tests.py []
-    env CACHEOPS_LRU=1 ./run_tests.py []
     env CACHEOPS_INSIDEOUT=1 ./run_tests.py []
     env CACHEOPS_DB=mysql ./run_tests.py []
     env CACHEOPS_DB=postgresql ./run_tests.py []