Automatic merge of gitlab-org/gitlab-ce master

app/controllers/admin/groups_controller.rb

@@ -14,7 +14,11 @@ class Admin::GroupsController < Admin::ApplicationController
 
   # rubocop: disable CodeReuse/ActiveRecord
   def show
-    @group = Group.with_statistics.joins(:route).group('routes.path').find_by_full_path(params[:id])
+    # Group.with_statistics doesn't behave nicely when including other relations.
+    # Group.find_by_full_path includes the routes relation to avoid a common N+1
+    # (at the expense of this action: there are two queries here to find and retrieve
+    # the Group with statistics).
+    @group = Group.with_statistics.find(group&.id)
     @members = present_members(
       @group.members.order("access_level DESC").page(params[:members_page]))
     @requesters = present_members(

app/models/concerns/routable.rb

@@ -38,7 +38,7 @@ module Routable
       if Feature.enabled?(:routable_two_step_lookup)
         # Case sensitive match first (it's cheaper and the usual case)
         # If we didn't have an exact match, we perform a case insensitive search
-        found = joins(:route).find_by(routes: { path: path }) || where_full_path_in([path]).take
+        found = includes(:route).find_by(routes: { path: path }) || where_full_path_in([path]).take
       else
         order_sql = Arel.sql("(CASE WHEN routes.path = #{connection.quote(path)} THEN 0 ELSE 1 END)")
         found = where_full_path_in([path]).reorder(order_sql).take
@@ -67,7 +67,7 @@ module Routable
         "(LOWER(routes.path) = LOWER(#{connection.quote(path)}))"
       end
 
-      joins(:route).where(wheres.join(' OR '))
+      includes(:route).where(wheres.join(' OR ')).references(:routes)
     end
 
     # Temporary instrumentation of method calls

changelogs/unreleased/ab-routable-nplus1.yml

+---
+title: Preload routes information to fix N+1 issue
+merge_request: 32352
+author:
+type: performance

spec/models/concerns/routable_spec.rb

@@ -66,6 +66,13 @@ describe Group, 'Routable' do
       it { expect(described_class.find_by_full_path(group.to_param.upcase)).to eq(group) }
       it { expect(described_class.find_by_full_path(nested_group.to_param)).to eq(nested_group) }
       it { expect(described_class.find_by_full_path('unknown')).to eq(nil) }
+
+      it 'includes route information when loading a record' do
+        path = group.to_param
+        control_count = ActiveRecord::QueryRecorder.new { described_class.find_by_full_path(path) }.count
+
+        expect { described_class.find_by_full_path(path).route }.not_to exceed_all_query_limit(control_count)
+      end
     end
 
     context 'with redirect routes' do