redis-cluster-client 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6055086f0723628b8c2d7158f2b49ecf6378095bcb4c7e4123461d2c14b5ff5
-  data.tar.gz: db0b1fbd400b8eafed3c3f7a660824e77d3df456eb88f6cf99f4a89572989385
+  metadata.gz: 840b8fc3ccf9f870d2a5911a6b529f4ddc021e2c9ebb41f88f54c0fb324c6b89
+  data.tar.gz: da935ffb827910097b824247c6f308afe6177ba701be3307494628100ae85d43
 SHA512:
-  metadata.gz: 7d2a016a5e7f970ed6444721a51de7c8afa3412a27a7400ed75fa7ad9e43c9f4e308fe5992f25e7bfa863446b54ab8527d8bc425888d6c36bed7cddc702bb134
-  data.tar.gz: 2b885ed32758f4deecbd6449a70f484ed340a0b123e0cc920756fe06df7898c1f77af3874f2da1d062d53d478aad6033628ecec8f0754e3ec977b1ffc56a5840
+  metadata.gz: 8973e3c8f747aad5e2e41649a7c3fb9787cdf8f794b7f9c9bb16225a0f15504746d9be65cc7eb0760bd6259d8e97f931ca578f3a71cc9a9c2094a8c00cf0e1f3
+  data.tar.gz: f13ce04e702ff896e7ab63c92f5cde997c878328bf87c539c7c764dd9c3e7b80efbf1af6edfc31946bed9d6fb69b549a60b4d7cab57d0acf4b721bf8859a9810

data/lib/redis_client/cluster/pub_sub.rb

@@ -43,7 +43,8 @@ class RedisClient
       def initialize(router, command_builder)
         @router = router
         @command_builder = command_builder
-        @states = {}
+        @state_list = []
+        @state_dict = {}
       end
 
       def call(*args, **kwargs)
@@ -55,24 +56,26 @@ class RedisClient
       end
 
       def close
-        @states.each_value(&:close)
-        @states.clear
+        @state_list.each(&:close)
+        @state_list.clear
+        @state_dict.clear
       end
 
       def next_event(timeout = nil)
-        return if @states.empty?
+        return if @state_list.empty?
 
         max_duration = calc_max_duration(timeout)
         starting = obtain_current_time
-        clients = @states.values
         loop do
           break if max_duration > 0 && obtain_current_time - starting > max_duration
 
-          clients.shuffle!
-          clients.each do |pubsub|
+          @state_list.shuffle!
+          @state_list.each do |pubsub|
             message = pubsub.take_message(timeout)
             return message if message
           end
+
+          sleep 0.001
         end
       end
 
@@ -80,26 +83,26 @@ class RedisClient
 
       def _call(command)
         node_key = @router.find_node_key(command)
-        add_state(node_key)
         try_call(node_key, command)
       end
 
       def try_call(node_key, command, retry_count: 1)
-        @states[node_key].call(command)
+        add_state(node_key).call(command)
       rescue ::RedisClient::CommandError => e
         raise if !e.message.start_with?('MOVED') || retry_count <= 0
 
         # for sharded pub/sub
         node_key = e.message.split[2]
-        add_state(node_key)
         retry_count -= 1
         retry
       end
 
       def add_state(node_key)
-        return @states[node_key] if @states.key?(node_key)
+        return @state_dict[node_key] if @state_dict.key?(node_key)
 
-        @states[node_key] = State.new(@router.find_node(node_key).pubsub)
+        state = State.new(@router.find_node(node_key).pubsub)
+        @state_list << state
+        @state_dict[node_key] = state
       end
 
       def obtain_current_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-12 00:00:00.000000000 Z
+date: 2023-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client