redis-cluster-client 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be67f7c4a1a9e75573c957233bc9381745fc143b483583a4abb02b6b794bf49a
-  data.tar.gz: b12b518ba293af7e8f84e9a8c4770c5d5e8d776e213af30db94bcba753612802
+  metadata.gz: 75b13bfebd7ddbbb49d37626af8bae2b0a0c21ddc7ad198856c60c502700909e
+  data.tar.gz: 9f8deb6e34399711ba7e432a85747272c51aa5525e3efc8d637577baab831e9e
 SHA512:
-  metadata.gz: fa19e009a6af98f69b797a88fd0ce3e09c9cd74d0bed99fdcabf4c15e78435179736e66d5d18e0e2c66c44d6343ab75e443b3d8577b37beb91ed13065f00bf4c
-  data.tar.gz: e055226106abe328b92d84da1f63e2d3e3ef22168cf3716837e96a7491249862894d98fa49edd92681083d6617787701411e51dab391322f1259af86a730149f
+  metadata.gz: 764b1ff360c46af8afebe9d937a2ac2ba3442701a4b5e9626af6157557bb29f9e35f0d0dcaff473cc77aa47b9930c6e179e42ceffa501d2105ab478e2d4f6fc8
+  data.tar.gz: 2eec106a7a6d0e38253ffca1f115d2a5368f3dd3c5bcfaafe25bb51bba35be67ba765dd5f6d93916d3eb23193bf4e588fe33833df8602475b58867ef8801585f

data/lib/redis_client/cluster/pub_sub.rb

@@ -9,6 +9,7 @@ class RedisClient
         @router = router
         @command_builder = command_builder
         @pubsub_states = {}
+        @messages = []
       end
 
       def call(*args, **kwargs)
@@ -22,15 +23,15 @@ class RedisClient
       def close
         @pubsub_states.each_value(&:close)
         @pubsub_states.clear
+        @messages.clear
       end
 
       def next_event(timeout = nil)
         return if @pubsub_states.empty?
+        return @messages.shift unless @messages.empty?
 
-        msgs = collect_messages(timeout).compact
-        return msgs.first if msgs.size < 2
-
-        msgs
+        collect_messages(timeout)
+        @messages.shift
       end
 
       private
@@ -45,8 +46,8 @@ class RedisClient
         pubsub.call_v(command)
       end
 
-      def collect_messages(timeout) # rubocop:disable Metrics/AbcSize
-        @pubsub_states.each_slice(MAX_THREADS).each_with_object([]) do |chuncked_pubsub_states, acc|
+      def collect_messages(timeout)
+        @pubsub_states.each_slice(MAX_THREADS) do |chuncked_pubsub_states|
           threads = chuncked_pubsub_states.map do |_, v|
             Thread.new(v) do |pubsub|
               Thread.current[:reply] = pubsub.next_event(timeout)
@@ -57,7 +58,7 @@ class RedisClient
 
           threads.each do |t|
             t.join
-            acc << t[:reply] unless t[:reply].nil?
+            @messages << t[:reply] unless t[:reply].nil?
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Taishi Kasuga