Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
886360d9
Commit
886360d9
authored
Apr 08, 2021
by
Adam Hegyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eliminate Profiles::NotificationsController N+1
parent
b57d8696
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
111 additions
and
15 deletions
+111
-15
app/finders/user_group_notification_settings_finder.rb
app/finders/user_group_notification_settings_finder.rb
+17
-0
app/models/group.rb
app/models/group.rb
+19
-0
app/models/namespace.rb
app/models/namespace.rb
+2
-2
app/models/user.rb
app/models/user.rb
+5
-3
changelogs/unreleased/21043-fix-notifications-controller-n-plus-1-queries.yml
...d/21043-fix-notifications-controller-n-plus-1-queries.yml
+5
-0
spec/controllers/profiles/notifications_controller_spec.rb
spec/controllers/profiles/notifications_controller_spec.rb
+14
-8
spec/features/groups/group_settings_spec.rb
spec/features/groups/group_settings_spec.rb
+1
-1
spec/finders/user_group_notification_settings_finder_spec.rb
spec/finders/user_group_notification_settings_finder_spec.rb
+33
-0
spec/models/group_spec.rb
spec/models/group_spec.rb
+14
-0
spec/support/shared_examples/services/notification_service_shared_examples.rb
...examples/services/notification_service_shared_examples.rb
+1
-1
No files found.
app/finders/user_group_notification_settings_finder.rb
View file @
886360d9
...
@@ -14,6 +14,8 @@ class UserGroupNotificationSettingsFinder
...
@@ -14,6 +14,8 @@ class UserGroupNotificationSettingsFinder
@loaded_groups_with_ancestors
=
groups_with_ancestors
.
index_by
(
&
:id
)
@loaded_groups_with_ancestors
=
groups_with_ancestors
.
index_by
(
&
:id
)
@loaded_notification_settings
=
user
.
notification_settings_for_groups
(
groups_with_ancestors
).
preload_source_route
.
index_by
(
&
:source_id
)
@loaded_notification_settings
=
user
.
notification_settings_for_groups
(
groups_with_ancestors
).
preload_source_route
.
index_by
(
&
:source_id
)
preload_emails_disabled
groups
.
map
do
|
group
|
groups
.
map
do
|
group
|
find_notification_setting_for
(
group
)
find_notification_setting_for
(
group
)
end
end
...
@@ -45,4 +47,19 @@ class UserGroupNotificationSettingsFinder
...
@@ -45,4 +47,19 @@ class UserGroupNotificationSettingsFinder
parent_setting
.
level
!=
NotificationSetting
.
levels
[
:global
]
||
parent_setting
.
notification_email
.
present?
parent_setting
.
level
!=
NotificationSetting
.
levels
[
:global
]
||
parent_setting
.
notification_email
.
present?
end
end
# This method preloads the `emails_disabled` strong memoized method for the given groups.
#
# For each group, look up the ancestor hierarchy and look for any group where emails_disabled is true.
# The lookup is implemented with an EXISTS subquery, so we can look up the ancestor chain for each group individually.
# The query will return groups where at least one ancestor has the `emails_disabled` set to true.
#
# After the query, we set the instance variable.
def
preload_emails_disabled
group_ids_with_disabled_email
=
Group
.
ids_with_disabled_email
(
groups
.
to_a
)
groups
.
each
do
|
group
|
group
.
emails_disabled_memoized
=
group_ids_with_disabled_email
.
include?
(
group
.
id
)
if
group
.
parent_id
end
end
end
end
app/models/group.rb
View file @
886360d9
...
@@ -180,6 +180,25 @@ class Group < Namespace
...
@@ -180,6 +180,25 @@ class Group < Namespace
groups
.
drop
(
1
).
each
{
|
group
|
group
.
root_ancestor
=
root
}
groups
.
drop
(
1
).
each
{
|
group
|
group
.
root_ancestor
=
root
}
end
end
# Returns the ids of the passed group models where the `emails_disabled`
# column is set to true anywhere in the ancestor hierarchy.
def
ids_with_disabled_email
(
groups
)
innner_query
=
Gitlab
::
ObjectHierarchy
.
new
(
Group
.
where
(
'id = namespaces_with_emails_disabled.id'
))
.
base_and_ancestors
.
where
(
emails_disabled:
true
)
.
select
(
'1'
)
.
limit
(
1
)
group_ids
=
Namespace
.
from
(
'(SELECT * FROM namespaces) as namespaces_with_emails_disabled'
)
.
where
(
namespaces_with_emails_disabled:
{
id:
groups
})
.
where
(
'EXISTS (?)'
,
innner_query
)
.
pluck
(
:id
)
Set
.
new
(
group_ids
)
end
private
private
def
public_to_user_arel
(
user
)
def
public_to_user_arel
(
user
)
...
...
app/models/namespace.rb
View file @
886360d9
...
@@ -111,7 +111,7 @@ class Namespace < ApplicationRecord
...
@@ -111,7 +111,7 @@ class Namespace < ApplicationRecord
# Make sure that the name is same as strong_memoize name in root_ancestor
# Make sure that the name is same as strong_memoize name in root_ancestor
# method
# method
attr_writer
:root_ancestor
attr_writer
:root_ancestor
,
:emails_disabled_memoized
class
<<
self
class
<<
self
def
by_path
(
path
)
def
by_path
(
path
)
...
@@ -239,7 +239,7 @@ class Namespace < ApplicationRecord
...
@@ -239,7 +239,7 @@ class Namespace < ApplicationRecord
# any ancestor can disable emails for all descendants
# any ancestor can disable emails for all descendants
def
emails_disabled?
def
emails_disabled?
strong_memoize
(
:emails_disabled
)
do
strong_memoize
(
:emails_disabled
_memoized
)
do
if
parent_id
if
parent_id
self_and_ancestors
.
where
(
emails_disabled:
true
).
exists?
self_and_ancestors
.
where
(
emails_disabled:
true
).
exists?
else
else
...
...
app/models/user.rb
View file @
886360d9
...
@@ -1358,9 +1358,11 @@ class User < ApplicationRecord
...
@@ -1358,9 +1358,11 @@ class User < ApplicationRecord
end
end
def
public_verified_emails
def
public_verified_emails
emails
=
verified_emails
(
include_private_email:
false
)
strong_memoize
(
:public_verified_emails
)
do
emails
<<
email
unless
temp_oauth_email?
emails
=
verified_emails
(
include_private_email:
false
)
emails
.
uniq
emails
<<
email
unless
temp_oauth_email?
emails
.
uniq
end
end
end
def
any_email?
(
check_email
)
def
any_email?
(
check_email
)
...
...
changelogs/unreleased/21043-fix-notifications-controller-n-plus-1-queries.yml
0 → 100644
View file @
886360d9
---
title
:
Eliminage N+1 database queries on the user notifications page
merge_request
:
58397
author
:
type
:
performance
spec/controllers/profiles/notifications_controller_spec.rb
View file @
886360d9
...
@@ -37,18 +37,24 @@ RSpec.describe Profiles::NotificationsController do
...
@@ -37,18 +37,24 @@ RSpec.describe Profiles::NotificationsController do
expect
(
assigns
(
:group_notifications
).
map
(
&
:source_id
)).
to
include
(
subgroup
.
id
)
expect
(
assigns
(
:group_notifications
).
map
(
&
:source_id
)).
to
include
(
subgroup
.
id
)
end
end
it
'does not have an N+1'
do
context
'N+1 query check'
do
sign_in
(
user
)
render_views
it
'does not have an N+1'
do
sign_in
(
user
)
control
=
ActiveRecord
::
QueryRecorder
.
new
do
get
:show
get
:show
end
create_list
(
:group
,
2
,
parent:
group
)
control
=
ActiveRecord
::
QueryRecorder
.
new
do
get
:show
end
expect
do
create_list
(
:group
,
2
,
parent:
group
)
get
:show
end
.
not_to
exceed_query_limit
(
control
)
expect
do
get
:show
end
.
not_to
exceed_query_limit
(
control
)
end
end
end
end
end
...
...
spec/features/groups/group_settings_spec.rb
View file @
886360d9
...
@@ -175,7 +175,7 @@ RSpec.describe 'Edit group settings' do
...
@@ -175,7 +175,7 @@ RSpec.describe 'Edit group settings' do
end
end
def
updated_emails_disabled?
def
updated_emails_disabled?
group
.
reload
.
clear_memoization
(
:emails_disabled
)
group
.
reload
.
clear_memoization
(
:emails_disabled
_memoized
)
group
.
emails_disabled?
group
.
emails_disabled?
end
end
end
end
spec/finders/user_group_notification_settings_finder_spec.rb
View file @
886360d9
...
@@ -129,4 +129,37 @@ RSpec.describe UserGroupNotificationSettingsFinder do
...
@@ -129,4 +129,37 @@ RSpec.describe UserGroupNotificationSettingsFinder do
end
end
end
end
end
end
context
'preloading `emails_disabled`'
do
let_it_be
(
:root_group
)
{
create
(
:group
)
}
let_it_be
(
:sub_group
)
{
create
(
:group
,
parent:
root_group
)
}
let_it_be
(
:sub_sub_group
)
{
create
(
:group
,
parent:
sub_group
)
}
let_it_be
(
:another_root_group
)
{
create
(
:group
)
}
let_it_be
(
:sub_group_with_emails_disabled
)
{
create
(
:group
,
emails_disabled:
true
,
parent:
another_root_group
)
}
let_it_be
(
:another_sub_sub_group
)
{
create
(
:group
,
parent:
sub_group_with_emails_disabled
)
}
let_it_be
(
:root_group_with_emails_disabled
)
{
create
(
:group
,
emails_disabled:
true
)
}
let_it_be
(
:group
)
{
create
(
:group
,
parent:
root_group_with_emails_disabled
)
}
let
(
:groups
)
{
Group
.
where
(
id:
[
sub_sub_group
,
another_sub_sub_group
,
group
])
}
before
do
described_class
.
new
(
user
,
groups
).
execute
end
it
'preloads the `group.emails_disabled` method'
do
recorder
=
ActiveRecord
::
QueryRecorder
.
new
do
groups
.
each
(
&
:emails_disabled?
)
end
expect
(
recorder
.
count
).
to
eq
(
0
)
end
it
'preloads the `group.emails_disabled` method correctly'
do
groups
.
each
do
|
group
|
expect
(
group
.
emails_disabled?
).
to
eq
(
Group
.
find
(
group
.
id
).
emails_disabled?
)
# compare the memoized and the freshly loaded value
end
end
end
end
end
spec/models/group_spec.rb
View file @
886360d9
...
@@ -2232,4 +2232,18 @@ RSpec.describe Group do
...
@@ -2232,4 +2232,18 @@ RSpec.describe Group do
it_behaves_like
'model with Debian distributions'
it_behaves_like
'model with Debian distributions'
end
end
describe
'.ids_with_disabled_email'
do
let!
(
:parent_1
)
{
create
(
:group
,
emails_disabled:
true
)
}
let!
(
:child_1
)
{
create
(
:group
,
parent:
parent_1
)
}
let!
(
:parent_2
)
{
create
(
:group
,
emails_disabled:
false
)
}
let!
(
:child_2
)
{
create
(
:group
,
parent:
parent_2
)
}
let!
(
:other_group
)
{
create
(
:group
,
emails_disabled:
false
)
}
subject
(
:group_ids_where_email_is_disabled
)
{
described_class
.
ids_with_disabled_email
([
child_1
,
child_2
,
other_group
])
}
it
{
is_expected
.
to
eq
(
Set
.
new
([
child_1
.
id
]))
}
end
end
end
spec/support/shared_examples/services/notification_service_shared_examples.rb
View file @
886360d9
...
@@ -45,7 +45,7 @@ RSpec.shared_examples 'group emails are disabled' do
...
@@ -45,7 +45,7 @@ RSpec.shared_examples 'group emails are disabled' do
before
do
before
do
reset_delivered_emails!
reset_delivered_emails!
target_group
.
clear_memoization
(
:emails_disabled
)
target_group
.
clear_memoization
(
:emails_disabled
_memoized
)
end
end
it
'sends no emails with group emails disabled'
do
it
'sends no emails with group emails disabled'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment