specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix n+1 query in settings migration (#24783)

Browse source
This commit is contained in:
Eugen Rochko 2023-05-02 10:26:39 +02:00 committed by GitHub
parent f1c1fa1411
commit 0ad2413b35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
db/migrate/20230215074423_move_user_settings.rb
View file

@ -59,26 +59,29 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
end end
def up def up
User.find_each do |user| User.find_in_batches do |users|
previous_settings = LegacySetting.where(thing_type: 'User', thing_id: user.id).index_by(&:var) previous_settings_for_batch = LegacySetting.where(thing_type: 'User', thing_id: users.map(&:id)).group_by(&:thing_id)
user_settings = {} users.each do |user|
previous_settings = previous_settings_for_batch[user.id]&.index_by(&:var) || {}
user_settings = {}
MAPPING.each do |legacy_key, new_key| MAPPING.each do |legacy_key, new_key|
value = previous_settings[legacy_key]&.value value = previous_settings[legacy_key]&.value
next if value.blank? next if value.blank?
if value.is_a?(Hash) if value.is_a?(Hash)
value.each do |nested_key, nested_value| value.each do |nested_key, nested_value|
user_settings[MAPPING[legacy_key][nested_key.to_sym]] = nested_value user_settings[MAPPING[legacy_key][nested_key.to_sym]] = nested_value
end
else
user_settings[new_key] = value
end end
else
user_settings[new_key] = value
end end
end
user.update_column('settings', Oj.dump(user_settings)) # rubocop:disable Rails/SkipsModelValidations user.update_column('settings', Oj.dump(user_settings)) # rubocop:disable Rails/SkipsModelValidations
end
end end
end end