diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-08-01 17:18:17 +0100 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-05 06:42:34 -0700 |
| commit | d3a3db4218e10c65c2e87c763ad02169f3736883 (patch) | |
| tree | 4fc682cc529520bef4e69d740c9fdea99d46c2c3 /app/serializers/deploy_key_entity.rb | |
| parent | ded3b7574dbd6e1b3249c9e5bbcc61090c733142 (diff) | |
| download | gitlab-ce-d3a3db4218e10c65c2e87c763ad02169f3736883.tar.gz | |
Speed up loading and filtering deploy keys and their projects
This commit changes how we eager-load projects, routes, and namespaces
required by the deploy keys endpoint, getting a 10x improvement in my
local testing.
The endpoint still doesn't scale in-general, but going from ~13 seconds
to dump a 63K result to generating the same thing in ~1.6 seconds seems
like a good improvement to me.
Diffstat (limited to 'app/serializers/deploy_key_entity.rb')
| -rw-r--r-- | app/serializers/deploy_key_entity.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb index 54bf030aba1..e47d6454780 100644 --- a/app/serializers/deploy_key_entity.rb +++ b/app/serializers/deploy_key_entity.rb @@ -10,9 +10,10 @@ class DeployKeyEntity < Grape::Entity expose :created_at expose :updated_at expose :deploy_keys_projects, using: DeployKeysProjectEntity do |deploy_key| - deploy_key.deploy_keys_projects - .without_project_deleted - .select { |deploy_key_project| Ability.allowed?(options[:user], :read_project, deploy_key_project.project) } + deploy_key.deploy_keys_projects.select do |deploy_key_project| + !deploy_key_project.project&.pending_delete? && + Ability.allowed?(options[:user], :read_project, deploy_key_project.project) + end end expose :can_edit |