diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-16 23:25:34 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-18 06:53:33 -0700 |
| commit | 8690ca5c2857da39c8f5839b9383931ee026f559 (patch) | |
| tree | 287b8d1dab66e00c0094027510bbbae4f10423ae /app/models/project_team.rb | |
| parent | a70c76df8fd746e5a83b305acbbc1c260955e332 (diff) | |
| download | gitlab-ce-sh-optimize-discussion-json.tar.gz | |
Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-json
In #37955,we see that the profile had a number of N+1 queries from repeated
access to `cross_reference_not_visible_for?`. This was optimized in previous
versions of GitLab by rendering all notes at once, counting the number of
visible references, and then using that number to check whether a system note
should be fully redacted.
There was also another N+1 query calling `ProjectTeam#member?`, which did not
take advantage of an optimization in prepare_notes_for_rendering that would
preload the maximum access level per project.
Closes #37955
Diffstat (limited to 'app/models/project_team.rb')
| -rw-r--r-- | app/models/project_team.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb index 09049824ff7..1d35426050e 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -146,7 +146,7 @@ class ProjectTeam def member?(user, min_access_level = Gitlab::Access::GUEST) return false unless user - user.authorized_project?(project, min_access_level) + max_member_access(user.id) >= min_access_level end def human_max_access(user_id) |