redis-cluster-client 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b13bfebd7ddbbb49d37626af8bae2b0a0c21ddc7ad198856c60c502700909e
-  data.tar.gz: 9f8deb6e34399711ba7e432a85747272c51aa5525e3efc8d637577baab831e9e
+  metadata.gz: eab80ca6b1a69e3c45bc0dd59f9dd05189559907e0976a534ddc5dc0de26527b
+  data.tar.gz: 90aa485da1918f0a46f36964ff7ede3c775dcf90ebf0477df0a6d5f2cc3846f7
 SHA512:
-  metadata.gz: 764b1ff360c46af8afebe9d937a2ac2ba3442701a4b5e9626af6157557bb29f9e35f0d0dcaff473cc77aa47b9930c6e179e42ceffa501d2105ab478e2d4f6fc8
-  data.tar.gz: 2eec106a7a6d0e38253ffca1f115d2a5368f3dd3c5bcfaafe25bb51bba35be67ba765dd5f6d93916d3eb23193bf4e588fe33833df8602475b58867ef8801585f
+  metadata.gz: 101ec6c98f8f2164b4c8da1a497ca31ca456d7c567ac9c96e8ac3220b37be96160ad558111c19e92d67c1947c29523463011c073016158a2930c7462231f3bc8
+  data.tar.gz: 72067a86f5fb1839bab4766dad20e5157932238c1a6237c9de805cf7dbd77e784b5b1b47e560f3585550521b36632dd7e9a094ccecad0e4ee893eb27bfc1f342

data/lib/redis_client/cluster/pub_sub.rb

@@ -3,13 +3,45 @@
 class RedisClient
   class Cluster
     class PubSub
-      MAX_THREADS = Integer(ENV.fetch('REDIS_CLIENT_MAX_THREADS', 5))
+      class State
+        def initialize(client)
+          @client = client
+          @worker = nil
+        end
+
+        def call(command)
+          @client.call_v(command)
+        end
+
+        def close
+          @worker.exit if @worker&.alive?
+          @client.close
+        end
+
+        def take_message(timeout)
+          @worker = subscribe(@client, timeout) if @worker.nil?
+          return if @worker.join(0.01).nil?
+
+          message = @worker[:reply]
+          @worker = nil
+          message
+        end
+
+        private
+
+        def subscribe(client, timeout)
+          Thread.new(client, timeout) do |pubsub, to|
+            Thread.current[:reply] = pubsub.next_event(to)
+          rescue StandardError => e
+            Thread.current[:reply] = e
+          end
+        end
+      end
 
       def initialize(router, command_builder)
         @router = router
         @command_builder = command_builder
-        @pubsub_states = {}
-        @messages = []
+        @states = {}
       end
 
       def call(*args, **kwargs)
@@ -21,46 +53,39 @@ class RedisClient
       end
 
       def close
-        @pubsub_states.each_value(&:close)
-        @pubsub_states.clear
-        @messages.clear
+        @states.each_value(&:close)
+        @states.clear
       end
 
       def next_event(timeout = nil)
-        return if @pubsub_states.empty?
-        return @messages.shift unless @messages.empty?
+        return if @states.empty?
 
-        collect_messages(timeout)
-        @messages.shift
+        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|
+            message = pubsub.take_message(timeout)
+            return message if message
+          end
+        end
       end
 
       private
 
       def _call(command)
         node_key = @router.find_node_key(command)
-        pubsub = if @pubsub_states.key?(node_key)
-                   @pubsub_states[node_key]
-                 else
-                   @pubsub_states[node_key] = @router.find_node(node_key).pubsub
-                 end
-        pubsub.call_v(command)
+        @states[node_key] = State.new(@router.find_node(node_key).pubsub) unless @states.key?(node_key)
+        @states[node_key].call(command)
       end
 
-      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)
-            rescue StandardError => e
-              Thread.current[:reply] = e
-            end
-          end
+      def obtain_current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, :microsecond)
+      end
 
-          threads.each do |t|
-            t.join
-            @messages << t[:reply] unless t[:reply].nil?
-          end
-        end
+      def calc_max_duration(timeout)
+        timeout.nil? || timeout < 0 ? 0 : timeout * 1_000_000
       end
     end
   end

metadata

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