Fixed Redis version check

Andrew Kane
1 parent 782a6e52
Showing 2 changed files with 4 additions and 6 deletions Show diff stats
lib/searchkick/process_queue_job.rb
lib/searchkick/reindex_queue.rb
@@ -11,7 +11,7 @@ module Searchkick
         if record_ids.any?
           batch_options = {
             class_name: class_name,
-            record_ids: record_ids,
+            record_ids: record_ids.uniq,
             index_name: index_name
           }
  
@@ -42,13 +42,11 @@ module Searchkick
     end
  
     def supports_rpop_with_count?
-      redis_server_version >= Gem::Version.new("6.2")
+      redis_version >= Gem::Version.new("6.2")
     end
  
-    def redis_server_version
-      @redis_server_version ||= Searchkick.with_redis { |r|
-        Gem::Version.new(r.info["server_version"])
-      }
+    def redis_version
+      @redis_version ||= Searchkick.with_redis { |r| Gem::Version.new(r.info["redis_version"]) }
     end
   end
 end
...	...	@@ -11,7 +11,7 @@ module Searchkick
11	11	if record_ids.any?
12	12	batch_options = {
13	13	class_name: class_name,
14		- record_ids: record_ids,
	14	+ record_ids: record_ids.uniq,
15	15	index_name: index_name
16	16	}
17	17
...	...
...	...	@@ -42,13 +42,11 @@ module Searchkick
42	42	end
43	43
44	44	def supports_rpop_with_count?
45		- redis_server_version >= Gem::Version.new("6.2")
	45	+ redis_version >= Gem::Version.new("6.2")
46	46	end
47	47
48		- def redis_server_version
49		- @redis_server_version \|\|= Searchkick.with_redis { \|r\|
50		- Gem::Version.new(r.info["server_version"])
51		- }
	48	+ def redis_version
	49	+ @redis_version \|\|= Searchkick.with_redis { \|r\| Gem::Version.new(r.info["redis_version"]) }
52	50	end
53	51	end
54	52	end
...	...