From 8b6d067e2fcbd5b0dc1c6ec3d461c78e4a0711c7 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Thu, 6 Jul 2017 21:08:55 -0700 Subject: [PATCH] Don't call minimum twice, and handle no record case better --- lib/searchkick/index.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/searchkick/index.rb b/lib/searchkick/index.rb index 7a597b4..9ddb8a9 100644 --- a/lib/searchkick/index.rb +++ b/lib/searchkick/index.rb @@ -421,10 +421,11 @@ module Searchkick # TODO expire Redis key primary_key = scope.primary_key - - if scope.minimum(primary_key).is_a?(Numeric) - starting_id = scope.minimum(primary_key) || 0 - max_id = scope.maximum(primary_key) || 0 + starting_id = scope.minimum(primary_key) + if starting_id.nil? + # no records, do nothing + elsif starting_id.is_a?(Numeric) + max_id = scope.maximum(primary_key) batches_count = ((max_id - starting_id + 1) / batch_size.to_f).ceil batches_count.times do |i| -- libgit2 0.21.0