mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-30 01:39:04 +01:00
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.
This commit is contained in:
parent
df7dbc41ae
commit
a1c54220e8
1 changed files with 1 additions and 3 deletions
|
@ -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.
|
# 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)
|
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(visibility: visibility).or(where(id: account.mentions.select(:status_id)))
|
||||||
.where(arel_table[:visibility].in(visibility).or(Mention.arel_table[:id].not_eq(nil)))
|
|
||||||
.order(visibility: :desc)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue