From 013542965c2b6d84d28aab4823e5400897610087 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Tue, 1 Mar 2016 17:56:14 +0100 Subject: Refactor Gitlab::SearchResults Instead of plucking IDs this class now uses ActiveRecord::Relation objects. Plucking IDs is problematic as searching for projects can lead to a huge amount of IDs being loaded into memory only to be used as an argument for another query (instead of just using a sub-query). --- app/services/search/global_service.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/services/search/global_service.rb') diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb index e904cb6c6fc..e1e94c5cc38 100644 --- a/app/services/search/global_service.rb +++ b/app/services/search/global_service.rb @@ -10,9 +10,8 @@ module Search group = Group.find_by(id: params[:group_id]) if params[:group_id].present? projects = ProjectsFinder.new.execute(current_user) projects = projects.in_namespace(group.id) if group - project_ids = projects.pluck(:id) - Gitlab::SearchResults.new(project_ids, params[:search]) + Gitlab::SearchResults.new(projects, params[:search]) end end end -- cgit v1.2.1