Merge branch '24669-merge-request-dashboard-page-takes-over-a-minute-to-load' into 'master'

Resolve "Merge request dashboard page takes over a minute to load"

See merge request !7760

app/finders/issuable_finder.rb

@@ -49,6 +49,32 @@ class IssuableFinder
     execute.find_by(*params)
   end
 
+  # We often get counts for each state by running a query per state, and
+  # counting those results. This is typically slower than running one query
+  # (even if that query is slower than any of the individual state queries) and
+  # grouping and counting within that query.
+  #
+  def count_by_state
+    count_params = params.merge(state: nil, sort: nil)
+    labels_count = label_names.any? ? label_names.count : 1
+    finder = self.class.new(current_user, count_params)
+    counts = Hash.new(0)
+
+    # Searching by label includes a GROUP BY in the query, but ours will be last
+    # because it is added last. Searching by multiple labels also includes a row
+    # per issuable, so we have to count those in Ruby - which is bad, but still
+    # better than performing multiple queries.
+    #
+    finder.execute.reorder(nil).group(:state).count.each do |key, value|
+      counts[Array(key).last.to_sym] += value / labels_count
+    end
+
+    counts[:all] = counts.values.sum
+    counts[:opened] += counts[:reopened]
+
+    counts
+  end
+
   def group
     return @group if defined?(@group)
 

app/helpers/issuables_helper.rb

@@ -180,12 +180,9 @@ module IssuablesHelper
   end
 
   def issuables_count_for_state(issuable_type, state)
-    issuables_finder = public_send("#{issuable_type}_finder")
-
-    params = issuables_finder.params.merge(state: state)
-    finder = issuables_finder.class.new(issuables_finder.current_user, params)
-
-    finder.execute.page(1).total_count
+    @counts ||= {}
+    @counts[issuable_type] ||= public_send("#{issuable_type}_finder").count_by_state
+    @counts[issuable_type][state]
   end
 
   IRRELEVANT_PARAMS_FOR_CACHE_KEY = %i[utf8 sort page]
@@ -195,6 +192,7 @@ module IssuablesHelper
     opts = params.with_indifferent_access
     opts[:state] = state
     opts.except!(*IRRELEVANT_PARAMS_FOR_CACHE_KEY)
+    opts.delete_if { |_, value| value.blank? }
 
     hexdigest(['issuables_count', issuable_type, opts.sort].flatten.join('-'))
   end

app/views/shared/_issues.html.haml

-- if @issues.reorder(nil).any?
+- if @issues.to_a.any?
   - @issues.group_by(&:project).each do |group|
     .panel.panel-default.panel-small
       - project = group[0]

app/views/shared/_merge_requests.html.haml

-- if @merge_requests.reorder(nil).any?
+- if @merge_requests.to_a.any?
   - @merge_requests.group_by(&:target_project).each do |group|
     .panel.panel-default.panel-small
       - project = group[0]

changelogs/unreleased/24669-merge-request-dashboard-page-takes-over-a-minute-to-load.yml

+---
+title: Speed up issuable dashboards
+merge_request:
+author:

spec/support/matchers/have_issuable_counts.rb

 RSpec::Matchers.define :have_issuable_counts do |opts|
-  match do |actual|
   expected_counts = opts.map do |state, count|
     "#{state.to_s.humanize} #{count}"
   end
 
+  match do |actual|
     actual.within '.issues-state-filters' do
       expected_counts.each do |expected_count|
         expect(actual).to have_content(expected_count)