taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #372 from taigaio/concurrent-queries-for-global-search-results 

Concurrent queries for global search results
remotes/origin/enhancement/email-actions
Jesús Espino 2015-06-25 16:36:31 +02:00
parent 30e08c61ef 8b05f206b2
commit 3f91460ccb
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
taiga/searches/api.py
View File

@ -26,6 +26,7 @@ from . import services
from . import serializers from . import serializers
from concurrent import futures
class SearchViewSet(viewsets.ViewSet): class SearchViewSet(viewsets.ViewSet):
def list(self, request, **kwargs): def list(self, request, **kwargs):
@ -35,14 +36,32 @@ class SearchViewSet(viewsets.ViewSet):
project = self._get_project(project_id) project = self._get_project(project_id)
result = {} result = {}
if user_has_perm(request.user, "view_us", project): with futures.ThreadPoolExecutor(max_workers=4) as executor:
result["userstories"] = self._search_user_stories(project, text) futures_list = []
if user_has_perm(request.user, "view_tasks", project): if user_has_perm(request.user, "view_us", project):
result["tasks"] = self._search_tasks(project, text) uss_future = executor.submit(self._search_user_stories, project, text)
if user_has_perm(request.user, "view_issues", project): uss_future.result_key = "userstories"
result["issues"] = self._search_issues(project, text) futures_list.append(uss_future)
if user_has_perm(request.user, "view_wiki_pages", project): if user_has_perm(request.user, "view_tasks", project):
result["wikipages"] = self._search_wiki_pages(project, text) 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())) result["count"] = sum(map(lambda x: len(x), result.values()))
return response.Ok(result) return response.Ok(result)

2
tests/integration/test_searches.py
View File

@ -25,7 +25,7 @@ from taiga.permissions.permissions import MEMBERS_PERMISSIONS
from tests.utils import disconnect_signals, reconnect_signals from tests.utils import disconnect_signals, reconnect_signals
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db(transaction=True)
def setup_module(module): def setup_module(module):