Fix recursive error from editor using datapusher (#486)

datopian · Aug 15, 2021 · 8958c77 · 8958c77
1 parent 4f51e8d
commit 8958c77
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/ckanext/querytool/actions.py b/ckanext/querytool/actions.py
@@ -6,27 +6,29 @@
 log = logging.getLogger(__name__)
 
 
+# Test disabling lru_cache
+
 # Module API
 
-def resource_delete(context, data_dict):
-    _clear_get_resource_data_cache()
-    return delete_core.resource_delete(context, data_dict)
+#  def resource_delete(context, data_dict):
+#      _clear_get_resource_data_cache()
+#      return delete_core.resource_delete(context, data_dict)
 
 
-def resource_patch(context, data_dict):
-    _clear_get_resource_data_cache()
-    return patch_core.resource_patch(context, data_dict)
+#  def resource_patch(context, data_dict):
+#      _clear_get_resource_data_cache()
+#      return patch_core.resource_patch(context, data_dict)
 
 
-def resource_update(context, data_dict):
-    _clear_get_resource_data_cache()
-    return update_core.resource_update(context, data_dict)
+#  def resource_update(context, data_dict):
+#      _clear_get_resource_data_cache()
+#      return update_core.resource_update(context, data_dict)
 
 
 # Internal
 
-def _clear_get_resource_data_cache():
-    log.debug('Cache statistics for `helpers.get_resource_data`:')
-    log.debug(helpers.get_resource_data.cache_info())
-    helpers.get_resource_data.cache_clear()
-    log.debug('Cache for `helpers.get_resource_data` has been reset')
+#  def _clear_get_resource_data_cache():
+#      log.debug('Cache statistics for `helpers.get_resource_data`:')
+#      log.debug(helpers.get_resource_data.cache_info())
+#      helpers.get_resource_data.cache_clear()
+#      log.debug('Cache for `helpers.get_resource_data` has been reset')
diff --git a/ckanext/querytool/helpers.py b/ckanext/querytool/helpers.py
@@ -501,7 +501,7 @@ def get_map_data(geojson_url, map_key_field, data_key_field,
     return map_data
 
 
-@functools32.lru_cache(maxsize=128)
+# @functools32.lru_cache(maxsize=128)
 def get_resource_data(sql_string):
     context = {}
 

diff --git a/ckanext/querytool/plugin.py b/ckanext/querytool/plugin.py
@@ -236,11 +236,12 @@ def after_map(self, map):
     # IActions
 
     def get_actions(self):
+        # Disable lru_cache
         module_root = 'ckanext.querytool.logic.action'
         action_functions = h._get_functions(module_root)
-        action_functions['resource_delete'] = actions.resource_delete
-        action_functions['resource_patch'] = actions.resource_patch
-        action_functions['resource_update'] = actions.resource_update
+        # action_functions['resource_delete'] = actions.resource_delete
+        # action_functions['resource_patch'] = actions.resource_patch
+        # action_functions['resource_update'] = actions.resource_update
         return action_functions
 
     # IConfigurable