treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2017-04-04 13:43:36 +02:00
parent b21f7c28f6
commit b1f3499c38
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/lib/feed_manager.rb
View File

@ -50,9 +50,15 @@ class FeedManager
def merge_into_timeline(from_account, into_account) def merge_into_timeline(from_account, into_account)
timeline_key = key(:home, into_account.id) timeline_key = key(:home, into_account.id)
query = from_account.statuses.limit(MAX_ITEMS)
if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0
query = query.where('id > ?', oldest_home_score)
end
redis.pipelined do redis.pipelined do
from_account.statuses.limit(MAX_ITEMS).each do |status| query.each do |status|
next if status.direct_visibility? || filter?(:home, status, into_account) next if status.direct_visibility? || filter?(:home, status, into_account)
redis.zadd(timeline_key, status.id, status.id) redis.zadd(timeline_key, status.id, status.id)
end end
@ -63,8 +69,9 @@ class FeedManager
def unmerge_from_timeline(from_account, into_account) def unmerge_from_timeline(from_account, into_account)
timeline_key = key(:home, into_account.id) timeline_key = key(:home, into_account.id)
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0
from_account.statuses.select('id').find_in_batches do |statuses| from_account.statuses.select('id').where('id > ?', oldest_home_score).find_in_batches do |statuses|
redis.pipelined do redis.pipelined do
statuses.each do |status| statuses.each do |status|
redis.zrem(timeline_key, status.id) redis.zrem(timeline_key, status.id)