diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-09-09 17:05:55 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-09 21:51:57 -0700 |
| commit | 08c3e59aeed34ad71e74afb674ddda7327fdc3a7 (patch) | |
| tree | 544d9fa244519ac8b18b29ff8abf47bfdd40b30a /app/models/oauth_access_token.rb | |
| parent | ffa5328c39f195d3253e586569fc2474d3aa6860 (diff) | |
| download | gitlab-ce-08c3e59aeed34ad71e74afb674ddda7327fdc3a7.tar.gz | |
Optimize /admin/applications so that it does not timeoutsh-fix-oauth-application-page
On our dev instance, /admin/applications as not loading because:
1. There was an unindexed query by `application_id`.
2. There was an expensive query that attempted to load 1 million
unique entries via ActiveRecord just to find the unique count.
We fix the first issue by adding an index for that column.
We fix the second issue with a simple SELECT COUNT(DISTINCT
resource_owner_id) SQL query.
In addition, we add pagination to avoid loading more than 20
applications at once.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
Diffstat (limited to 'app/models/oauth_access_token.rb')
| -rw-r--r-- | app/models/oauth_access_token.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/oauth_access_token.rb b/app/models/oauth_access_token.rb index 0aa920fa828..9789d8ed62b 100644 --- a/app/models/oauth_access_token.rb +++ b/app/models/oauth_access_token.rb @@ -6,6 +6,8 @@ class OauthAccessToken < Doorkeeper::AccessToken alias_attribute :user, :resource_owner + scope :distinct_resource_owner_counts, ->(applications) { where(application: applications).distinct.group(:application_id).count(:resource_owner_id) } + def scopes=(value) if value.is_a?(Array) super(Doorkeeper::OAuth::Scopes.from_array(value).to_s) |