Speed up todos queries by limiting the projects set we join with
Closes #20828
This commit is contained in:
parent
a632ed6973
commit
d13c36f72d
|
@ -110,6 +110,7 @@ v 8.11.0 (unreleased)
|
|||
- Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0
|
||||
- Add auto-completition in pipeline (Katarzyna Kobierska Ula Budziszewska)
|
||||
- Fix a memory leak caused by Banzai::Filter::SanitizationFilter
|
||||
- Speed up todos queries by limiting the projects set we join with
|
||||
|
||||
v 8.10.5
|
||||
- Add a data migration to fix some missing timestamps in the members table. !5670
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue