From d13c36f72de6b1c56e2063dafddd14ecbb430b9a Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Fri, 12 Aug 2016 14:29:59 +0200
Subject: Speed up todos queries by limiting the projects set we join with

Closes #20828
---
 app/finders/projects_finder.rb |  3 ++-
 app/finders/todos_finder.rb    | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'app/finders')

diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index 2f0a9659d15..56877b6d75a 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -1,6 +1,7 @@
 class ProjectsFinder < UnionFinder
-  def execute(current_user = nil, options = {})
+  def execute(current_user = nil, options = {}, &block)
     segments = all_projects(current_user)
+    segments.map!(&block) if block
 
     find_union(segments, Project)
   end
diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index ff866c2faa5..9b24a86e1c1 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -27,9 +27,11 @@ class TodosFinder
     items = by_action_id(items)
     items = by_action(items)
     items = by_author(items)
-    items = by_project(items)
     items = by_state(items)
     items = by_type(items)
+    # Filtering by project HAS TO be the last because we use
+    # the project IDs yielded by the todos query thus far
+    items = by_project(items)
 
     items.reorder(id: :desc)
   end
@@ -91,13 +93,10 @@ class TodosFinder
     @project
   end
 
-  def projects
-    return @projects if defined?(@projects)
-
-    if project?
-      @projects = project
-    else
-      @projects = ProjectsFinder.new.execute(current_user)
+  def projects(items)
+    item_project_ids = items.reorder(nil).select(:project_id)
+    ProjectsFinder.new.execute(current_user) do |relation|
+      relation.where(id: item_project_ids)
     end
   end
 
@@ -136,8 +135,9 @@ class TodosFinder
   def by_project(items)
     if project?
       items = items.where(project: project)
-    elsif projects
-      items = items.merge(projects).joins(:project)
+    else
+      item_projects = projects(items)
+      items = items.merge(item_projects).joins(:project)
     end
 
     items
-- 
cgit v1.2.1


From 76db0dc115316e53ed7d2189cc8789f0a0cef3c2 Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Fri, 12 Aug 2016 15:52:58 +0200
Subject: Pass project IDs relation to ProjectsFinder instead of using a block

---
 app/finders/projects_finder.rb | 4 ++--
 app/finders/todos_finder.rb    | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'app/finders')

diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index 56877b6d75a..c7911736812 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -1,7 +1,7 @@
 class ProjectsFinder < UnionFinder
-  def execute(current_user = nil, options = {}, &block)
+  def execute(current_user = nil, project_ids_relation = nil)
     segments = all_projects(current_user)
-    segments.map!(&block) if block
+    segments.map! { |s| s.where(id: project_ids_relation) } if project_ids_relation
 
     find_union(segments, Project)
   end
diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 9b24a86e1c1..4fe0070552e 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -95,9 +95,7 @@ class TodosFinder
 
   def projects(items)
     item_project_ids = items.reorder(nil).select(:project_id)
-    ProjectsFinder.new.execute(current_user) do |relation|
-      relation.where(id: item_project_ids)
-    end
+    ProjectsFinder.new.execute(current_user, item_project_ids)
   end
 
   def type?
-- 
cgit v1.2.1