Improved indexer code [skip ci]

Andrew Kane
1 parent bfe5dd1a
Showing 2 changed files with 15 additions and 9 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/indexer.rb
@@ -285,7 +285,7 @@ module Searchkick
   # private
   def self.indexer
-    Thread.current[:searchkick_indexer] ||= Searchkick::Indexer.new
+    Thread.current[:searchkick_indexer] ||= Indexer.new
   end
   # private
+# thread-local (technically fiber-local) indexer
+# used to aggregate bulk callbacks across models
 module Searchkick
   class Indexer
     attr_reader :queued_items
@@ -14,15 +16,19 @@ module Searchkick
     def perform
       items = @queued_items
       @queued_items = []
-      if items.any?
-        response = Searchkick.client.bulk(body: items)
-        if response["errors"]
-          first_with_error = response["items"].map do |item|
-            (item["index"] || item["delete"] || item["update"])
-          end.find { |item| item["error"] }
-          raise Searchkick::ImportError, "#{first_with_error["error"]} on item with id '#{first_with_error["_id"]}'"
-        end
+
+      return if items.empty?
+
+      response = Searchkick.client.bulk(body: items)
+      if response["errors"]
+        first_with_error = response["items"].map do |item|
+          (item["index"] || item["delete"] || item["update"])
+        end.find { |item| item["error"] }
+        raise ImportError, "#{first_with_error["error"]} on item with id '#{first_with_error["_id"]}'"
       end
+
+      # maybe return response in future
+      nil
     end
   end
 end
	@@ -285,7 +285,7 @@ module Searchkick		@@ -285,7 +285,7 @@ module Searchkick
285		285
286	# private	286	# private
287	def self.indexer	287	def self.indexer
288	- Thread.current[:searchkick_indexer] \|\|= Searchkick::Indexer.new	288	+ Thread.current[:searchkick_indexer] \|\|= Indexer.new
289	end	289	end
290		290
291	# private	291	# private