redis-cluster-client 0.4.10 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8db8a7aac1f09df0c2fc3c7da3f0227246671d2fd0a199dabcda22caa0787d3
-  data.tar.gz: d0431f663859765f0ff3f537f4f74fcd17a72c561b615616ae5e24543bb3d3df
+  metadata.gz: d8eb62456ad98c03e10bf81773dfb27cfaf68b7ad8af608b13e2427e950e7379
+  data.tar.gz: 736117d62e45313ca6f96e97e0e3fc03093a9542315302233a55c3cde2731303
 SHA512:
-  metadata.gz: bed8b8bc6f6321808fcee27b30c43746eca124abad25bbdb7923bc6b6faf56cb53343008fcf4648d4be56df42d7e8baa1a105206ff6a7370dae9c528bf7213cc
-  data.tar.gz: 1ee8f2edc8207011ccdda3a3d863895adc5ae0f3747b4b62374a96cbb19779f00b13fb350aa519a38083708da250f0e3249667c0a8dbaaeaf07781f2dcf0cbdd
+  metadata.gz: 81079a5a9985bd4fbe2b20f3ffaa5e59db4c95f9f9f184209b50ca897ab3fa3cdee8687f9be90cf46b0a371c668dff171c1f3488b3e848885d738133f0bf6e2a
+  data.tar.gz: 0d1e9da7b0de3cec96cb88431d2cdd935c9764c268610e4146737ae6bd7d634869a82d9425243a3c2307d7277974b1df5f3ee8d9abd78bab6169453fc724e3d3

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,19 +56,21 @@ 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
         loop do
           break if max_duration > 0 && obtain_current_time - starting > max_duration
 
-          @states.values.shuffle.each do |pubsub|
+          @state_list.shuffle!
+          @state_list.each do |pubsub|
             message = pubsub.take_message(timeout)
             return message if message
           end
@@ -78,26 +81,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.10
+  version: 0.4.12
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client