mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-12-01 08:18:22 +09:00
Code

Fix Importer::BaseImporter#clean_up! not using proper primary key (#26269)

Browse Source
This commit is contained in:
Claire 2023-07-31 11:17:41 +02:00 committed by GitHub
parent d4807a5e64
commit d82abc877a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/importer/base_importer.rb
View File

@ -45,8 +45,11 @@ class Importer::BaseImporter
# Remove documents from the index that no longer exist in the database # Remove documents from the index that no longer exist in the database
def clean_up! def clean_up!
index.scroll_batches do |documents| index.scroll_batches do |documents|
primary_key = index.adapter.target.primary_key
raise ActiveRecord::UnknownPrimaryKey, index.adapter.target if primary_key.nil?
ids = documents.pluck('_id') ids = documents.pluck('_id')
existence_map = index.adapter.target.where(id: ids).pluck(:id).each_with_object({}) { |id, map| map[id.to_s] = true } existence_map = index.adapter.target.where(primary_key => ids).pluck(primary_key).each_with_object({}) { |id, map| map[id.to_s] = true }
tmp = ids.reject { |id| existence_map[id] } tmp = ids.reject { |id| existence_map[id] }
next if tmp.empty? next if tmp.empty?