Browse Source

Fix PostgreSQL load when linking in announcements (#13250)

* Fix PostgreSQL load when linking in announcements

Fixes #13245 by caching status lookups

Since statuses are supposed to be known already and we only
need their URLs and a few other things, caching them should
be fine.

Since it's only used by announcements so far, there won't
be much statuses to cache.

* Perform status lookup when saving announcements, not when rendering them

* Change EntityCache#status to fetch URLs instead of looking into the database

* Move announcement link lookup to publishing worker

* Address issues pointed out during review
closed-social-v3
ThibG 4 years ago
committed by GitHub
parent
commit
89e28c7674
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 5 deletions
  1. +4
    -0
      app/lib/entity_cache.rb
  2. +8
    -1
      app/models/announcement.rb
  3. +1
    -1
      app/models/status.rb
  4. +12
    -3
      app/workers/publish_scheduled_announcement_worker.rb
  5. +6
    -0
      db/migrate/20200312162302_add_status_ids_to_announcements.rb
  6. +1
    -0
      db/schema.rb

+ 4
- 0
app/lib/entity_cache.rb View File

@ -7,6 +7,10 @@ class EntityCache
MAX_EXPIRATION = 7.days.freeze
def status(url)
Rails.cache.fetch(to_key(:status, url), expires_in: MAX_EXPIRATION) { FetchRemoteStatusService.new.call(url) }
end
def mention(username, domain)
Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:id, :username, :domain, :url).find_remote(username, domain) }
end

+ 8
- 1
app/models/announcement.rb View File

@ -14,6 +14,7 @@
# created_at :datetime not null
# updated_at :datetime not null
# published_at :datetime
# status_ids :bigint is an Array
#
class Announcement < ApplicationRecord
@ -49,7 +50,13 @@ class Announcement < ApplicationRecord
end
def statuses
@statuses ||= Status.from_text(text)
@statuses ||= begin
if status_ids.nil?
[]
else
Status.where(id: status_ids, visibility: [:public, :unlisted])
end
end
end
def tags

+ 1
- 1
app/models/status.rb View File

@ -379,7 +379,7 @@ class Status < ApplicationRecord
if TagManager.instance.local_url?(url)
ActivityPub::TagManager.instance.uri_to_resource(url, Status)
else
Status.find_by(uri: url) || Status.find_by(url: url)
EntityCache.instance.status(url)
end
end
status&.distributable? ? status : nil

+ 12
- 3
app/workers/publish_scheduled_announcement_worker.rb View File

@ -5,15 +5,24 @@ class PublishScheduledAnnouncementWorker
include Redisable
def perform(announcement_id)
announcement = Announcement.find(announcement_id)
@announcement = Announcement.find(announcement_id)
announcement.publish! unless announcement.published?
refresh_status_ids!
payload = InlineRenderer.render(announcement, nil, :announcement)
@announcement.publish! unless @announcement.published?
payload = InlineRenderer.render(@announcement, nil, :announcement)
payload = Oj.dump(event: :announcement, payload: payload)
FeedManager.instance.with_active_accounts do |account|
redis.publish("timeline:#{account.id}", payload) if redis.exists("subscribed:timeline:#{account.id}")
end
end
private
def refresh_status_ids!
@announcement.status_ids = Status.from_text(@announcement.text).map(&:id)
@announcement.save
end
end

+ 6
- 0
db/migrate/20200312162302_add_status_ids_to_announcements.rb View File

@ -0,0 +1,6 @@
class AddStatusIdsToAnnouncements < ActiveRecord::Migration[5.2]
def change
add_column :announcements, :status_ids, :bigint, array: true
end
end

+ 1
- 0
db/schema.rb View File

@ -231,6 +231,7 @@ ActiveRecord::Schema.define(version: 2020_03_12_185443) do
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "published_at"
t.bigint "status_ids", array: true
end
create_table "backups", force: :cascade do |t|

Loading…
Cancel
Save