diff options
author | unarist <m.unarist@gmail.com> | 2017-10-13 23:53:44 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-13 16:53:43 +0200 |
commit | a1c54220e8e79c4bb0cc20da193888388efe2ba4 (patch) | |
tree | 620c89e19be38f488b49edb0529ea2128bc416c2 /app | |
parent | df7dbc41ae08647a02b2171fd1bfce143acec610 (diff) |
Optimize Status#permitted_for 500x (account timeline) (#5373)
The main change of this PR is removing `order by visibility` hack. This was introduced to force using of `index_statuses_on_account_id` instead of PK index, but it seems no longer needed probably due to `index_statuses_on_account_id_id`. Removing this avoids reading all rows, so really improves first fetching of the user who has lot of statuses. I have also changed JOIN to IN + subquery, which slightly faster in most cases.
Diffstat (limited to 'app')
-rw-r--r-- | app/models/status.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 624e33395..5a7245613 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -220,9 +220,7 @@ class Status < ApplicationRecord # non-followers can see everything that isn't private/direct, but can see stuff they are mentioned in. visibility.push(:private) if account.following?(target_account) - joins("LEFT OUTER JOIN mentions ON statuses.id = mentions.status_id AND mentions.account_id = #{account.id}") - .where(arel_table[:visibility].in(visibility).or(Mention.arel_table[:id].not_eq(nil))) - .order(visibility: :desc) + where(visibility: visibility).or(where(id: account.mentions.select(:status_id))) end end |