diff --git a/lib/searchkick/bulk_reindex_job.rb b/lib/searchkick/bulk_reindex_job.rb index 6a39792..7d3cb46 100644 --- a/lib/searchkick/bulk_reindex_job.rb +++ b/lib/searchkick/bulk_reindex_job.rb @@ -5,7 +5,7 @@ module Searchkick # TODO remove min_id and max_id in Searchkick 6 def perform(class_name:, record_ids: nil, index_name: nil, method_name: nil, batch_id: nil, min_id: nil, max_id: nil) model = Searchkick.load_model(class_name) - index = index_name ? Searchkick::Index.new(index_name, model.searchkick_options) : model.searchkick_index + index = model.searchkick_index(name: index_name) # legacy record_ids ||= min_id..max_id diff --git a/lib/searchkick/process_queue_job.rb b/lib/searchkick/process_queue_job.rb index df64eaa..791f928 100644 --- a/lib/searchkick/process_queue_job.rb +++ b/lib/searchkick/process_queue_job.rb @@ -4,10 +4,11 @@ module Searchkick def perform(class_name:, index_name: nil, inline: false) model = Searchkick.load_model(class_name) + index = model.searchkick_index(name: index_name) limit = model.searchkick_options[:batch_size] || 1000 loop do - record_ids = model.searchkick_index(name: index_name).reindex_queue.reserve(limit: limit) + record_ids = index.reindex_queue.reserve(limit: limit) if record_ids.any? batch_options = { class_name: class_name, diff --git a/lib/searchkick/reindex_v2_job.rb b/lib/searchkick/reindex_v2_job.rb index fc9cc4c..0946f87 100644 --- a/lib/searchkick/reindex_v2_job.rb +++ b/lib/searchkick/reindex_v2_job.rb @@ -4,7 +4,7 @@ module Searchkick def perform(class_name, id, method_name = nil, routing: nil, index_name: nil) model = Searchkick.load_model(class_name, allow_child: true) - index = index_name ? Searchkick::Index.new(index_name, model.searchkick_options) : model.searchkick_index + index = model.searchkick_index(name: index_name) # use should_index? to decide whether to index (not default scope) # just like saving inline # could use Searchkick.scope() in future -- libgit2 0.21.0