Merge branch 'dm-batchloader-project' into 'master'

Include project in BatchLoader key to prevent returning blobs for the wrong project Closes gitlab-ee#4325 See merge request gitlab-org/gitlab-ce!15936 (cherry picked from commit f5114187) 6c4f6d37 Include project in BatchLoader key to prevent returning blobs for the wrong project f871027e Clear BatchLoader after each spec to prevent holding onto records longer than necessary

Merge branch 'dm-batchloader-project' into 'master'
ed23957d · Sean McGivern · Oswaldo Ferreira · f95acda0 · ed23957d · ed23957d
Commit ed23957d authored Dec 14, 2017 by Sean McGivern Committed by Oswaldo Ferreira Dec 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 3 deletions

blob.rb app/models/blob.rb +9 -3

batch_loader.rb spec/support/batch_loader.rb +5 -0

No files found.
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -77,9 +77,15 @@ class Blob < SimpleDelegator
  end

  def self.lazy(project, commit_id, path)
-    BatchLoader.for(commit_id: commit_id, path: path).batch do |items, loader|
-      project.repository.blobs_at(items.map(&:values)).each do |blob|
-        loader.call({ commit_id: blob.commit_id, path: blob.path }, blob) if blob
+    BatchLoader.for({ project: project, commit_id: commit_id, path: path }).batch do |items, loader|
+      items_by_project = items.group_by { |i| i[:project] }
+
+      items_by_project.each do |project, items|
+        items = items.map { |i| i.values_at(:commit_id, :path) }
+
+        project.repository.blobs_at(items).each do |blob|
+          loader.call({ project: blob.project, commit_id: blob.commit_id, path: blob.path }, blob) if blob
+        end
      end
    end
  end

--- a/spec/support/batch_loader.rb
+++ b/spec/support/batch_loader.rb
+RSpec.configure do |config|
+  config.after do
+    BatchLoader::Executor.clear_current
+  end
+end