Simplifying cachedmethod

Author: stamparm

data/txt/sha256sums.txt

@@ -172,7 +172,7 @@ a6397b10de7ae7c56ed6b0fa3b3c58eb7a9dbede61bf93d786e73258175c981e  lib/core/compa
 a9997e97ebe88e0bf7efcf21e878bc5f62c72348e5aba18f64d6861390a4dcf2  lib/core/convert.py
 c03dc585f89642cfd81b087ac2723e3e1bb3bfa8c60e6f5fe58ef3b0113ebfe6  lib/core/data.py
 ca06a0e9d66a58e74ef994d53f9b3cd2ebaed98735bbab99854054235a8083d6  lib/core/datatype.py
-e18c0c2c5a57924a623792a48bfd36e98d9bc085f6db61a95fc0dc8a3bcedc0c  lib/core/decorators.py
+70fb2528e580b22564899595b0dff6b1bc257c6a99d2022ce3996a3d04e68e4e  lib/core/decorators.py
 147823c37596bd6a56d677697781f34b8d1d1671d5a2518fbc9468d623c6d07d  lib/core/defaults.py
 6b366f897e66b9df39df2ee45fef77d46efb7a2d4e294440d3aa7dc1b2f4cedf  lib/core/dicts.py
 a033f92d136c707a25927c2383125ddb004d4283db62c004dcd67c3fc242bb1c  lib/core/dump.py
@@ -188,7 +188,7 @@ c1cb56f2a43e9f2f6b25d5f3d504e856ea21df6fc14af5e37b1000feef2bdb5a  lib/core/optio
 48797d6c34dd9bb8a53f7f3794c85f4288d82a9a1d6be7fcf317d388cb20d4b3  lib/core/replication.py
 0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6  lib/core/revision.py
 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c  lib/core/session.py
-610650be1f560c70944d801a355330c9315ab218e1ded611a054d907d6c05a87  lib/core/settings.py
+1418691b5449412e60c693b6afc2f12b00051c1e280d2261762a36f094e0da66  lib/core/settings.py
 cd5a66deee8963ba8e7e9af3dd36eb5e8127d4d68698811c29e789655f507f82  lib/core/shell.py
 bcb5d8090d5e3e0ef2a586ba09ba80eef0c6d51feb0f611ed25299fbb254f725  lib/core/subprocessng.py
 d35650179816193164a5f177102f18379dfbe6bb6d40fbb67b78d907b41c8038  lib/core/target.py

lib/core/decorators.py

@@ -6,13 +6,10 @@
 """
 
 import functools
-import hashlib
-import struct
 import threading
 
 from lib.core.datatype import LRUDict
 from lib.core.settings import MAX_CACHE_ITEMS
-from lib.core.settings import UNICODE_ENCODING
 from lib.core.threads import getCurrentThreadData
 
 _cache = {}
@@ -40,31 +37,37 @@ def cachedmethod(f):
     _cache[f] = LRUDict(capacity=MAX_CACHE_ITEMS)
     _method_locks[f] = threading.RLock()
 
+    def _freeze(val):
+        if isinstance(val, (list, set, tuple)):
+            return tuple(_freeze(x) for x in val)
+        if isinstance(val, dict):
+            return tuple(sorted((k, _freeze(v)) for k, v in val.items()))
+        return val
+
     @functools.wraps(f)
     def _f(*args, **kwargs):
+        lock, cache = _method_locks[f], _cache[f]
+
         try:
-            # NOTE: fast-path
             if kwargs:
-                key = hash((f, args, tuple(map(type, args)), frozenset(kwargs.items()))) & 0x7fffffffffffffff
+                key = (args, frozenset(kwargs.items()))
             else:
-                key = hash((f, args, tuple(map(type, args)))) & 0x7fffffffffffffff
-        except TypeError:
-            # NOTE: failback slow-path
-            parts = (
-                f.__module__ + "." + f.__name__,
-                "^".join(repr(a) for a in args),
-                "^".join("%s=%r" % (k, kwargs[k]) for k in sorted(kwargs))
-            )
-            try:
-                key = struct.unpack("<Q", hashlib.md5("`".join(parts).encode(UNICODE_ENCODING)).digest()[:8])[0] & 0x7fffffffffffffff
-            except (struct.error, ValueError):
-                return f(*args, **kwargs)
+                key = args
 
-        lock, cache = _method_locks[f], _cache[f]
+            with lock:
+                if key in cache:
+                    return cache[key]
 
-        with lock:
-            if key in cache:
-                return cache[key]
+        except TypeError:
+            # Note: fallback (slowpath(
+            if kwargs:
+                key = (_freeze(args), _freeze(kwargs))
+            else:
+                key = _freeze(args)
+
+            with lock:
+                if key in cache:
+                    return cache[key]
 
         result = f(*args, **kwargs)
 

lib/core/settings.py

@@ -20,7 +20,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.1.84"
+VERSION = "1.10.1.85"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)