Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly

MergeRequest#rebase_in_progress? and MergeRequest#rebase_path were called twice each time per request. This memoization helps reduce the overall number of queries. See https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51616319 as a failing job. Closes gitlab-org/gitlab-ee#4857

Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly
9a323c7e · Stan Hu · Sean McGivern · 828357fb · 9a323c7e
Commit 9a323c7e authored Feb 07, 2018 by Stan Hu Committed by Sean McGivern Feb 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

merge_request.rb app/models/merge_request.rb +5 -3

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -158,10 +158,12 @@ class MergeRequest < ActiveRecord::Base
  end

  def rebase_in_progress?
-    # The source project can be deleted
-    return false unless source_project
+    strong_memoize(:rebase_in_progress) do
+      # The source project can be deleted
+      next false unless source_project

-    source_project.repository.rebase_in_progress?(id)
+      source_project.repository.rebase_in_progress?(id)
+    end
  end

  # Use this method whenever you need to make sure the head_pipeline is synced with the