github / searchkick

Download as
Browse Code ยป

Commit 8b6d067e2fcbd5b0dc1c6ec3d461c78e4a0711c7

Authored by Andrew Kane
1 parent 45e4eb9e
Exists in master and in 19 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, 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

Don't call minimum twice, and handle no record case better

Showing 1 changed file with 5 additions and 4 deletions   Show diff stats
lib/searchkick/index.rb
  Diff comments   View file @8b6d067
@@ -421,10 +421,11 @@ module Searchkick @@ -421,10 +421,11 @@ module Searchkick
421 # TODO expire Redis key 421 # TODO expire Redis key
422 primary_key = scope.primary_key 422 primary_key = scope.primary_key
423 423
424 -  
425 - if scope.minimum(primary_key).is_a?(Numeric)  
426 - starting_id = scope.minimum(primary_key) || 0  
427 - max_id = scope.maximum(primary_key) || 0 424 + starting_id = scope.minimum(primary_key)
  425 + if starting_id.nil?
  426 + # no records, do nothing
  427 + elsif starting_id.is_a?(Numeric)
  428 + max_id = scope.maximum(primary_key)
428 batches_count = ((max_id - starting_id + 1) / batch_size.to_f).ceil 429 batches_count = ((max_id - starting_id + 1) / batch_size.to_f).ceil
429 430
430 batches_count.times do |i| 431 batches_count.times do |i|