Improved split [skip ci]

Andrew Kane
1 parent ef1e6c8e
Showing 2 changed files with 11 additions and 6 deletions Show diff stats
lib/searchkick/bulk_record_indexer.rb
lib/searchkick/process_batch_job.rb
@@ -31,10 +31,8 @@ module Searchkick
       end
     end
  
-    # TODO figure out better place for logic
-    def import_queue(klass, record_ids)
-      # separate routing from id
-      routing = Hash[record_ids.map { |r| r.split(/(?<!\|)\|(?!\|)/, 2).map { |v| v.gsub("||", "|") } }]
+    def reindex_items(klass, items)
+      routing = items.to_h { |r| [r[:id], r[:routing]] }
       record_ids = routing.keys
  
       scope = Searchkick.load_records(klass, record_ids)
@@ -5,8 +5,15 @@ module Searchkick
     def perform(class_name:, record_ids:, index_name: nil)
       klass = class_name.constantize
       index = klass.searchkick_index(name: index_name)
-      # TODO move import_queue logic
-      index.send(:bulk_record_indexer).import_queue(klass, record_ids)
+
+      items =
+        record_ids.map do |r|
+          parts = r.split(/(?<!\|)\|(?!\|)/, 2)
+            .map { |v| v.gsub("||", "|") }
+          {id: parts[0], routing: parts[1]}
+        end
+
+      index.send(:bulk_record_indexer).reindex_items(klass, items)
     end
   end
 end
...	...	@@ -31,10 +31,8 @@ module Searchkick
31	31	end
32	32	end
33	33
34		- # TODO figure out better place for logic
35		- def import_queue(klass, record_ids)
36		- # separate routing from id
37		- routing = Hash[record_ids.map { \|r\| r.split(/(?<!\\|)\\|(?!\\|)/, 2).map { \|v\| v.gsub("\|\|", "\|") } }]
	34	+ def reindex_items(klass, items)
	35	+ routing = items.to_h { \|r\| [r[:id], r[:routing]] }
38	36	record_ids = routing.keys
39	37
40	38	scope = Searchkick.load_records(klass, record_ids)
...	...
...	...	@@ -5,8 +5,15 @@ module Searchkick
5	5	def perform(class_name:, record_ids:, index_name: nil)
6	6	klass = class_name.constantize
7	7	index = klass.searchkick_index(name: index_name)
8		- # TODO move import_queue logic
9		- index.send(:bulk_record_indexer).import_queue(klass, record_ids)
	8	+
	9	+ items =
	10	+ record_ids.map do \|r\|
	11	+ parts = r.split(/(?<!\\|)\\|(?!\\|)/, 2)
	12	+ .map { \|v\| v.gsub("\|\|", "\|") }
	13	+ {id: parts[0], routing: parts[1]}
	14	+ end
	15	+
	16	+ index.send(:bulk_record_indexer).reindex_items(klass, items)
10	17	end
11	18	end
12	19	end
...	...