Refactor decorator and cache key format

zopefoundation · May 8, 2018 · f804678 · f804678
1 parent 8b25545
commit f804678
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Products/ZCatalog/Catalog.py b/src/Products/ZCatalog/Catalog.py
@@ -595,7 +595,7 @@ def _search_index(self, cr, index_id, query, rs):
 
         return rs
 
-    @cache()
+    @cache
     def _apply_query_plan(self, cr, query):
 
         plan = cr.plan()

diff --git a/src/Products/ZCatalog/cache.py b/src/Products/ZCatalog/cache.py
@@ -31,10 +31,11 @@ def __init__(self, catalog, query=None):
         self.key = self.make_key(query)
 
     def get_id(self):
-        parent = aq_parent(self.catalog)
+        catalog = self.catalog
+        parent = aq_parent(catalog)
         path = getattr(aq_base(parent), 'getPhysicalPath', None)
         if path is None:
-            path = ('', 'NonPersistentCatalog')
+            path = ('', 'NonPersistentCatalog', id(catalog))
         else:
             path = tuple(parent.getPhysicalPath())
         return path
@@ -73,7 +74,7 @@ def make_key(self, query):
             keys.append((name, counter, value))
 
         key = frozenset(keys)
-        cache_key = '%s-%s' % (self.cid, hash(key))
+        cache_key = (self.cid, key)
         return cache_key
 
     def _convert_datum(self, index, value):
@@ -117,5 +118,8 @@ def _apply_query_plan_cachekey(method, catalog, plan, query):
     return cc.key
 
 
-def cache():
-    return ram.cache(_apply_query_plan_cachekey)
+def cache(fun):
+    @ram.cache(_apply_query_plan_cachekey)
+    def decorator(*args, **kwargs):
+        return fun(*args, **kwargs)
+    return decorator