diff --git a/product/ZSQLCatalog/SQLCatalog.py b/product/ZSQLCatalog/SQLCatalog.py index 39f4b18723b2d4e6a886f47877832b5a069cc244..7601f99cfe666699705872a80243bbd560f77de3 100644 --- a/product/ZSQLCatalog/SQLCatalog.py +++ b/product/ZSQLCatalog/SQLCatalog.py @@ -80,11 +80,9 @@ def noReadOnlyTransactionCache(): yield try: from Products.ERP5Type.Cache import \ - readOnlyTransactionCache, caching_instance_method + readOnlyTransactionCache except ImportError: LOG('SQLCatalog', WARNING, 'Count not import caching_instance_method, expect slowness.') - def caching_instance_method(*args, **kw): - return lambda method: method readOnlyTransactionCache = noReadOnlyTransactionCache try: @@ -1092,10 +1090,7 @@ class Catalog(Folder, pass return tuple(result_list) - @caching_instance_method(id='SQLCatalog.getColumnIds', - cache_factory='erp5_content_long', - cache_id_generator=generateCatalogCacheId, - ) + @transactional_cache_decorator('SQLCatalog.getColumnIds') def _getColumnIds(self): keys = set() add_key = keys.add @@ -1121,10 +1116,6 @@ class Catalog(Folder, security.declarePrivate('getColumnMap') @transactional_cache_decorator('SQLCatalog.getColumnMap') - @caching_instance_method(id='SQLCatalog.getColumnMap', - cache_factory='erp5_content_long', - cache_id_generator=generateCatalogCacheId, - ) def getColumnMap(self): """ Calls the show column method and returns dictionnary of @@ -1139,10 +1130,6 @@ class Catalog(Folder, security.declarePrivate('getResultColumnIds') @transactional_cache_decorator('SQLCatalog.getResultColumnIds') - @caching_instance_method(id='SQLCatalog.getResultColumnIds', - cache_factory='erp5_content_long', - cache_id_generator=generateCatalogCacheId, - ) def getResultColumnIds(self): """ Calls the show column method and returns dictionnary of @@ -1156,10 +1143,6 @@ class Catalog(Folder, security.declarePrivate('getSortColumnIds') @transactional_cache_decorator('SQLCatalog.getSortColumnIds') - @caching_instance_method(id='SQLCatalog.getSortColumnIds', - cache_factory='erp5_content_long', - cache_id_generator=generateCatalogCacheId, - ) def getSortColumnIds(self): """ Calls the show column method and returns dictionnary of @@ -2014,10 +1997,7 @@ class Catalog(Folder, """ return self.sql_catalog_scriptable_keys - @caching_instance_method(id='SQLCatalog.getTableIndex', - cache_factory='erp5_content_long', - cache_id_generator=generateCatalogCacheId, - ) + @transactional_cache_decorator('SQLCatalog.getTableIndex') def _getTableIndex(self, table): table_index = {} method = getattr(self, self.sql_catalog_index, '') @@ -2549,10 +2529,6 @@ class Catalog(Folder, return kw @transactional_cache_decorator('SQLCatalog._getSearchKeyDict') - @caching_instance_method(id='SQLCatalog._getSearchKeyDict', - cache_factory='erp5_content_long', - cache_id_generator=generateCatalogCacheId, - ) def _getSearchKeyDict(self): result = {} search_key_column_dict = {