Merge branch 'sh-speed-up-commit-loading' into 'master'

Speed up commit loads by disabling BatchLoader replace_methods

See merge request gitlab-org/gitlab-ce!29633

3 files changed, 14 insertions, 1 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index fa0bf36ba49..be37fa2e76f 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -94,7 +94,7 @@ class Commit
     end
 
     def lazy(project, oid)
-      BatchLoader.for({ project: project, oid: oid }).batch do |items, loader|
+      BatchLoader.for({ project: project, oid: oid }).batch(replace_methods: false) do |items, loader|
         items_by_project = items.group_by { |i| i[:project] }
 
         items_by_project.each do |project, commit_ids|
diff --git a/changelogs/unreleased/sh-speed-up-commit-loading.yml b/changelogs/unreleased/sh-speed-up-commit-loading.yml
new file mode 100644
index 00000000000..db408708385
--- /dev/null
+++ b/changelogs/unreleased/sh-speed-up-commit-loading.yml
@@ -0,0 +1,5 @@
+---
+title: Speed up commit loads by disabling BatchLoader replace_methods
+merge_request: 29633
+author:
+type: performance
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 14f4b4d692f..e76186fb280 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -44,6 +44,14 @@ describe Commit do
           expect(commit.id).to eq(oids[i])
         end
       end
+
+      it 'does not attempt to replace methods via BatchLoader' do
+        subject.each do |commit|
+          expect(commit).to receive(:method_missing).and_call_original
+
+          commit.id
+        end
+      end
     end
 
     context 'when not found' do