Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'

Fix another timeout when searching for pipelines

Closes #39054

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

(cherry picked from commit 0517b9e341a2960c54faa69717628225ed50c418)

ec73ecb0 Fix another timeout when searching for pipelines

1 files changed, 13 insertions, 1 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index efd8cca2947..dd4e67bc9da 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -865,7 +865,19 @@ class MergeRequest < ActiveRecord::Base
   #
   def all_commit_shas
     if persisted?
-      column_shas = MergeRequestDiffCommit.where(merge_request_diff: merge_request_diffs).limit(10_000).pluck('sha')
+      # MySQL doesn't support LIMIT in a subquery.
+      diffs_relation =
+        if Gitlab::Database.postgresql?
+          merge_request_diffs.order(id: :desc).limit(100)
+        else
+          merge_request_diffs
+        end
+
+      column_shas = MergeRequestDiffCommit
+                      .where(merge_request_diff: diffs_relation)
+                      .limit(10_000)
+                      .pluck('sha')
+
       serialised_shas = merge_request_diffs.where.not(st_commits: nil).flat_map(&:commit_shas)
 
       (column_shas + serialised_shas).uniq