From ad006fd9df5498907b11ddc535db92be2296c9cf Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sun, 15 Jan 2017 13:01:05 -0800 Subject: [PATCH] Changed delete to delete_missing [skip ci] --- lib/searchkick/bulk_reindex_job.rb | 4 ++-- lib/searchkick/index.rb | 8 ++++---- lib/searchkick/process_batch_job.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/searchkick/bulk_reindex_job.rb b/lib/searchkick/bulk_reindex_job.rb index b7622ed..b9888b4 100644 --- a/lib/searchkick/bulk_reindex_job.rb +++ b/lib/searchkick/bulk_reindex_job.rb @@ -2,7 +2,7 @@ module Searchkick class BulkReindexJob < ActiveJob::Base queue_as :searchkick - def perform(class_name:, record_ids: nil, index_name: nil, method_name: nil, batch_id: nil, min_id: nil, max_id: nil, delete: false) + def perform(class_name:, record_ids: nil, index_name: nil, method_name: nil, batch_id: nil, min_id: nil, max_id: nil, delete_missing: false) klass = class_name.constantize index = index_name ? Searchkick::Index.new(index_name) : klass.searchkick_index record_ids ||= min_id..max_id @@ -12,7 +12,7 @@ module Searchkick method_name: method_name, batch: true, batch_id: batch_id, - delete: delete, + delete_missing: delete_missing, record_ids: record_ids ) end diff --git a/lib/searchkick/index.rb b/lib/searchkick/index.rb index 301f7ae..3de7212 100644 --- a/lib/searchkick/index.rb +++ b/lib/searchkick/index.rb @@ -247,14 +247,14 @@ module Searchkick end end - def import_scope(scope, resume: false, method_name: nil, async: false, batch: false, batch_id: nil, full: false, delete: false, record_ids: nil) + def import_scope(scope, resume: false, method_name: nil, async: false, batch: false, batch_id: nil, full: false, delete_missing: false, record_ids: nil) batch_size = @options[:batch_size] || 1000 # use scope for import scope = scope.search_import if scope.respond_to?(:search_import) if batch - import_or_update scope.to_a, method_name, async, delete, record_ids, scope.model + import_or_update scope.to_a, method_name, async, delete_missing, record_ids, scope.model Searchkick.redis.srem(batches_key, batch_id) if batch_id && Searchkick.redis elsif full && async if scope.respond_to?(:primary_key) @@ -422,7 +422,7 @@ module Searchkick end end - def import_or_update(records, method_name, async, delete = false, record_ids = nil, klass = nil) + def import_or_update(records, method_name, async, delete_missing = false, record_ids = nil, klass = nil) if records.any? if async Searchkick::BulkReindexJob.perform_later( @@ -436,7 +436,7 @@ module Searchkick records = records.select(&:should_index?) delete_records = - if delete + if delete_missing # determine which records to delete (record_ids - records.map { |r| r.id.to_s }).map { |id| m = klass.new; m.id = id; m } else diff --git a/lib/searchkick/process_batch_job.rb b/lib/searchkick/process_batch_job.rb index f280333..3a32be0 100644 --- a/lib/searchkick/process_batch_job.rb +++ b/lib/searchkick/process_batch_job.rb @@ -7,7 +7,7 @@ module Searchkick Searchkick::BulkReindexJob.perform_now( class_name: class_name, record_ids: record_ids, - delete: true + delete_missing: true ) end end -- libgit2 0.21.0