From 8b05f206b210e773853933ccf053e16eefbc9391 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 25 Jun 2015 09:37:51 +0200 Subject: [PATCH] Concurrent queries for global search results --- taiga/searches/api.py | 35 +++++++++++++++++++++++------- tests/integration/test_searches.py | 2 +- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/taiga/searches/api.py b/taiga/searches/api.py index e4934194..befe539b 100644 --- a/taiga/searches/api.py +++ b/taiga/searches/api.py @@ -26,6 +26,7 @@ from . import services from . import serializers +from concurrent import futures class SearchViewSet(viewsets.ViewSet): def list(self, request, **kwargs): @@ -35,14 +36,32 @@ class SearchViewSet(viewsets.ViewSet): project = self._get_project(project_id) result = {} - if user_has_perm(request.user, "view_us", project): - result["userstories"] = self._search_user_stories(project, text) - if user_has_perm(request.user, "view_tasks", project): - result["tasks"] = self._search_tasks(project, text) - if user_has_perm(request.user, "view_issues", project): - result["issues"] = self._search_issues(project, text) - if user_has_perm(request.user, "view_wiki_pages", project): - result["wikipages"] = self._search_wiki_pages(project, text) + with futures.ThreadPoolExecutor(max_workers=4) as executor: + futures_list = [] + if user_has_perm(request.user, "view_us", project): + uss_future = executor.submit(self._search_user_stories, project, text) + uss_future.result_key = "userstories" + futures_list.append(uss_future) + if user_has_perm(request.user, "view_tasks", project): + tasks_future = executor.submit(self._search_tasks, project, text) + tasks_future.result_key = "tasks" + futures_list.append(tasks_future) + if user_has_perm(request.user, "view_issues", project): + issues_future = executor.submit(self._search_issues, project, text) + issues_future.result_key = "issues" + futures_list.append(issues_future) + if user_has_perm(request.user, "view_wiki_pages", project): + wiki_pages_future = executor.submit(self._search_wiki_pages, project, text) + wiki_pages_future.result_key = "wikipages" + futures_list.append(wiki_pages_future) + + for future in futures.as_completed(futures_list): + try: + data = future.result() + except Exception as exc: + print('%s generated an exception: %s' % (future.result_key, exc)) + else: + result[future.result_key] = data result["count"] = sum(map(lambda x: len(x), result.values())) return response.Ok(result) diff --git a/tests/integration/test_searches.py b/tests/integration/test_searches.py index 0837c4c5..f6a26cc1 100644 --- a/tests/integration/test_searches.py +++ b/tests/integration/test_searches.py @@ -25,7 +25,7 @@ from taiga.permissions.permissions import MEMBERS_PERMISSIONS from tests.utils import disconnect_signals, reconnect_signals -pytestmark = pytest.mark.django_db +pytestmark = pytest.mark.django_db(transaction=True) def setup_module(module):