Merge pull request #47 from cloudblue/bugfix/LITE-22733

LITE-22733 Added lock for cache update in RQLFilterBackend
cloudblue · Mar 29, 2022 · 283d376 · 283d376
2 parents 00f5703 + 9c55539
commit 283d376
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/dj_rql/drf/backend.py b/dj_rql/drf/backend.py
@@ -1,12 +1,16 @@
 #
-#  Copyright © 2021 Ingram Micro Inc. All rights reserved.
+#  Copyright © 2022 Ingram Micro Inc. All rights reserved.
 #
+from threading import Lock
 
 from dj_rql.drf._utils import get_query
 
 from rest_framework.filters import BaseFilterBackend
 
 
+lock = Lock()
+
+
 class _FilterClassCache:
     CACHE = {}
 
@@ -46,10 +50,12 @@ def filter_queryset(self, request, queryset, view):
             cache_key = str(queryset.query) + query
 
             query_cache = self._get_or_init_cache(filter_class, view)
-            filters_result = query_cache.get(cache_key)
-            if not filters_result:
+            try:
+                filters_result = query_cache[cache_key]
+            except KeyError:
                 filters_result = filter_instance.apply_filters(query, request, view)
-                query_cache[cache_key] = filters_result
+                with lock:
+                    query_cache[cache_key] = filters_result
 
         else:
             filters_result = filter_instance.apply_filters(query, request, view)

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,2 +1,2 @@
-lib-rql
+lib-rql>=1.1.1
 Django>=2.2.19