github / searchkick

Download as
Browse Code ยป

Commit f691a1bae83fded0a2873add420bd322ffb65742

Authored by Andrew
1 parent fb9d24ae
Exists in master and in 18 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, index_name, lazy_index_name, less_deps, nested, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, wildcard

Fixed reindex_status error - closes #1112

Showing 3 changed files with 9 additions and 4 deletions   Show diff stats
CHANGELOG.md
  Diff comments   View file @f691a1b
1 1 ## 3.0.3 [unreleased]
2 2  
3 3 - Fixed "Model Search Data" output for `debug` option
  4 +- Fixed `reindex_status` error
4 5  
5 6 ## 3.0.2
6 7  
... ...
lib/searchkick/bulk_indexer.rb
  Diff comments   View file @f691a1b
... ... @@ -51,6 +51,10 @@ module Searchkick
51 51 Searchkick.indexer.queue(records.map { |r| RecordData.new(index, r).update_data(method_name) })
52 52 end
53 53  
  54 + def batches_left
  55 + Searchkick.with_redis { |r| r.scard(batches_key) }
  56 + end
  57 +
54 58 private
55 59  
56 60 def import_or_update(records, method_name, async)
... ... @@ -156,10 +160,6 @@ module Searchkick
156 160 end
157 161 end
158 162  
159   - def batches_left
160   - Searchkick.with_redis { |r| r.scard(batches_key) }
161   - end
162   -
163 163 def batches_key
164 164 "searchkick:reindex:#{index.name}:batches"
165 165 end
... ...
test/reindex_test.rb
  Diff comments   View file @f691a1b
... ... @@ -40,6 +40,10 @@ class ReindexTest < Minitest::Test
40 40 index.refresh
41 41 assert_equal 1, index.total_docs
42 42  
  43 + if defined?(Redis)
  44 + assert Searchkick.reindex_status(reindex[:name])
  45 + end
  46 +
43 47 Product.searchkick_index.promote(reindex[:index_name])
44 48 assert_search "product", ["Product A"]
45 49 end
... ...