diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-07 16:25:06 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-07 16:25:06 +0000 |
commit | 5024c4aacc9ff9fd9d069e9d6b87ebdfe2ef356e (patch) | |
tree | f98345e6545427c2f130b70183ea12e835bbc96e | |
parent | 4e18206f84ac6a8149b816c3a3cdd9a1b141d709 (diff) | |
parent | 0206476ae2a2d659fd0fb42338050253a9a91439 (diff) | |
download | gitlab-ce-5024c4aacc9ff9fd9d069e9d6b87ebdfe2ef356e.tar.gz |
Merge branch 'n-plus-one-notification-recipients' into 'master'
Fix some N+1s when calculating notification recipients
Closes #45534
See merge request gitlab-org/gitlab-ce!19535
-rw-r--r-- | app/models/notification_recipient.rb | 2 | ||||
-rw-r--r-- | app/models/user.rb | 5 | ||||
-rw-r--r-- | changelogs/unreleased/n-plus-one-notification-recipients.yml | 5 | ||||
-rw-r--r-- | spec/services/notification_recipient_service_spec.rb | 36 |
4 files changed, 46 insertions, 2 deletions
diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb index 2c3580bbdc6..79458bd048a 100644 --- a/app/models/notification_recipient.rb +++ b/app/models/notification_recipient.rb @@ -64,7 +64,7 @@ class NotificationRecipient return false unless @target return false unless @target.respond_to?(:subscriptions) - subscription = @target.subscriptions.find_by_user_id(@user.id) + subscription = @target.subscriptions.find { |subscription| subscription.user_id == @user.id } subscription && !subscription.subscribed end diff --git a/app/models/user.rb b/app/models/user.rb index e219ab800ad..8e0dc91b2a7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1038,7 +1038,10 @@ class User < ActiveRecord::Base def notification_settings_for(source) if notification_settings.loaded? - notification_settings.find { |notification| notification.source == source } + notification_settings.find do |notification| + notification.source_type == source.class.base_class.name && + notification.source_id == source.id + end else notification_settings.find_or_initialize_by(source: source) end diff --git a/changelogs/unreleased/n-plus-one-notification-recipients.yml b/changelogs/unreleased/n-plus-one-notification-recipients.yml new file mode 100644 index 00000000000..91c31e4c930 --- /dev/null +++ b/changelogs/unreleased/n-plus-one-notification-recipients.yml @@ -0,0 +1,5 @@ +--- +title: Fix some sources of excessive query counts when calculating notification recipients +merge_request: +author: +type: performance diff --git a/spec/services/notification_recipient_service_spec.rb b/spec/services/notification_recipient_service_spec.rb new file mode 100644 index 00000000000..340d4585e0c --- /dev/null +++ b/spec/services/notification_recipient_service_spec.rb @@ -0,0 +1,36 @@ +require 'spec_helper' + +describe NotificationRecipientService do + let(:service) { described_class } + let(:assignee) { create(:user) } + let(:project) { create(:project, :public) } + let(:other_projects) { create_list(:project, 5, :public) } + + describe '#build_new_note_recipients' do + let(:issue) { create(:issue, project: project, assignees: [assignee]) } + let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id) } + + def create_watcher + watcher = create(:user) + create(:notification_setting, project: project, user: watcher, level: :watch) + + other_projects.each do |other_project| + create(:notification_setting, project: other_project, user: watcher, level: :watch) + end + end + + it 'avoids N+1 queries' do + create_watcher + + service.build_new_note_recipients(note) + + control_count = ActiveRecord::QueryRecorder.new do + service.build_new_note_recipients(note) + end + + create_watcher + + expect { service.build_new_note_recipients(note) }.not_to exceed_query_limit(control_count) + end + end +end |