Improved resume code and fixed Mongoid code [skip ci]

Andrew Kane
1 parent fd149dbb
Showing 5 changed files with 28 additions and 15 deletions Show diff stats
lib/searchkick/record_indexer.rb
lib/searchkick/relation_indexer.rb
test/reindex_test.rb
test/support/mongoid.rb
test/test_helper.rb
@@ -34,7 +34,7 @@ module Searchkick
         else
           Searchkick::BulkReindexJob.perform_later(
             class_name: records.first.class.searchkick_options[:class_name],
-            record_ids: records.map(&:id),
+            record_ids: records.map { |r| r.id.to_s },
             index_name: index.name,
             method_name: method_name ? method_name.to_s : nil
           )
@@ -29,6 +29,8 @@ module Searchkick
         return full_reindex_async(relation)
       end
  
+      relation = resume_relation(relation) if resume
+
       reindex_options = {
         mode: mode,
         method_name: method_name,
@@ -36,18 +38,6 @@ module Searchkick
       }
       record_indexer = RecordIndexer.new(index)
  
-      if resume
-        if relation.respond_to?(:primary_key)
-          # use total docs instead of max id since there's not a great way
-          # to get the max _id without scripting since it's a string
-
-          # TODO use primary key and prefix with table name
-          relation = relation.where("id > ?", index.total_docs)
-        else
-          # TODO support resume for Mongoid
-        end
-      end
-
       if relation.respond_to?(:find_in_batches)
         relation.find_in_batches(batch_size: batch_size) do |items|
           record_indexer.reindex(items, **reindex_options)
@@ -69,6 +59,18 @@ module Searchkick
  
     private
  
+    def resume_relation(relation)
+      if relation.respond_to?(:primary_key)
+        # use total docs instead of max id since there's not a great way
+        # to get the max _id without scripting since it's a string
+
+        # TODO use primary key and prefix with table name
+        relation = relation.where("id > ?", index.total_docs)
+      else
+        raise Error, "Resume not supported for Mongoid"
+      end
+    end
+
     def full_reindex_async(scope)
       if scope.respond_to?(:primary_key)
         # TODO expire Redis key
@@ -163,7 +163,14 @@ class ReindexTest &lt; Minitest::Test
   end
  
   def test_full_resume
-    assert Product.reindex(resume: true)
+    if mongoid?
+      error = assert_raises(Searchkick::Error) do
+        Product.reindex(resume: true)
+      end
+      assert_equal "Resume not supported for Mongoid", error.message
+    else
+      assert Product.reindex(resume: true)
+    end
   end
  
   def test_full_refresh
@@ -2,7 +2,7 @@ Mongoid.logger = $logger
 Mongo::Logger.logger = $logger if defined?(Mongo::Logger)
  
 Mongoid.configure do |config|
-  config.connect_to "searchkick_test"
+  config.connect_to "searchkick_test", server_selection_timeout: 1
 end
  
 class Product
@@ -43,6 +43,10 @@ else
   require_relative "support/activerecord"
 end
  
+def mongoid?
+  defined?(Mongoid)
+end
+
 # models
 Dir["#{__dir__}/models/*"].each do |file|
   require file
...	...	@@ -34,7 +34,7 @@ module Searchkick
34	34	else
35	35	Searchkick::BulkReindexJob.perform_later(
36	36	class_name: records.first.class.searchkick_options[:class_name],
37		- record_ids: records.map(&:id),
	37	+ record_ids: records.map { \|r\| r.id.to_s },
38	38	index_name: index.name,
39	39	method_name: method_name ? method_name.to_s : nil
40	40	)
...	...
...	...	@@ -29,6 +29,8 @@ module Searchkick
29	29	return full_reindex_async(relation)
30	30	end
31	31
	32	+ relation = resume_relation(relation) if resume
	33	+
32	34	reindex_options = {
33	35	mode: mode,
34	36	method_name: method_name,
...	...	@@ -36,18 +38,6 @@ module Searchkick
36	38	}
37	39	record_indexer = RecordIndexer.new(index)
38	40
39		- if resume
40		- if relation.respond_to?(:primary_key)
41		- # use total docs instead of max id since there's not a great way
42		- # to get the max _id without scripting since it's a string
43		-
44		- # TODO use primary key and prefix with table name
45		- relation = relation.where("id > ?", index.total_docs)
46		- else
47		- # TODO support resume for Mongoid
48		- end
49		- end
50		-
51	41	if relation.respond_to?(:find_in_batches)
52	42	relation.find_in_batches(batch_size: batch_size) do \|items\|
53	43	record_indexer.reindex(items, **reindex_options)
...	...	@@ -69,6 +59,18 @@ module Searchkick
69	59
70	60	private
71	61
	62	+ def resume_relation(relation)
	63	+ if relation.respond_to?(:primary_key)
	64	+ # use total docs instead of max id since there's not a great way
	65	+ # to get the max _id without scripting since it's a string
	66	+
	67	+ # TODO use primary key and prefix with table name
	68	+ relation = relation.where("id > ?", index.total_docs)
	69	+ else
	70	+ raise Error, "Resume not supported for Mongoid"
	71	+ end
	72	+ end
	73	+
72	74	def full_reindex_async(scope)
73	75	if scope.respond_to?(:primary_key)
74	76	# TODO expire Redis key
...	...
...	...	@@ -163,7 +163,14 @@ class ReindexTest < Minitest::Test
163	163	end
164	164
165	165	def test_full_resume
166		- assert Product.reindex(resume: true)
	166	+ if mongoid?
	167	+ error = assert_raises(Searchkick::Error) do
	168	+ Product.reindex(resume: true)
	169	+ end
	170	+ assert_equal "Resume not supported for Mongoid", error.message
	171	+ else
	172	+ assert Product.reindex(resume: true)
	173	+ end
167	174	end
168	175
169	176	def test_full_refresh
...	...
...	...	@@ -2,7 +2,7 @@ Mongoid.logger = $logger
2	2	Mongo::Logger.logger = $logger if defined?(Mongo::Logger)
3	3
4	4	Mongoid.configure do \|config\|
5		- config.connect_to "searchkick_test"
	5	+ config.connect_to "searchkick_test", server_selection_timeout: 1
6	6	end
7	7
8	8	class Product
...	...
...	...	@@ -43,6 +43,10 @@ else
43	43	require_relative "support/activerecord"
44	44	end
45	45
	46	+def mongoid?
	47	+ defined?(Mongoid)
	48	+end
	49	+
46	50	# models
47	51	Dir["#{__dir__}/models/*"].each do \|file\|
48	52	require file
...	...