redis-cluster-client 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e29792dd4eb3b7609baa8943b25a385c87dd36767ba679e9c9209be765a670b
-  data.tar.gz: 367d7cb722ef026b76c7f200237c1c64a0dced84026c78a43feb55a72eb7accb
+  metadata.gz: be67f7c4a1a9e75573c957233bc9381745fc143b483583a4abb02b6b794bf49a
+  data.tar.gz: b12b518ba293af7e8f84e9a8c4770c5d5e8d776e213af30db94bcba753612802
 SHA512:
-  metadata.gz: c3b7eb12f99b928072eeb00f4465afc5be3a3cb07aeabfc821369151f94ebbf12029409317c21b57cb628710e786e1e423b84f543b7430c23d89f71e9fe9339b
-  data.tar.gz: c317f99c5bb51be184f4aab415017260237e3614e535565649bb90d79a2b47c7b9edfb07c83b3a96ead85849c7bd97639ce6d60eb1f957df351908ae098f6795
+  metadata.gz: fa19e009a6af98f69b797a88fd0ce3e09c9cd74d0bed99fdcabf4c15e78435179736e66d5d18e0e2c66c44d6343ab75e443b3d8577b37beb91ed13065f00bf4c
+  data.tar.gz: e055226106abe328b92d84da1f63e2d3e3ef22168cf3716837e96a7491249862894d98fa49edd92681083d6617787701411e51dab391322f1259af86a730149f

data/lib/redis_client/cluster/node/latency_replica.rb

@@ -10,7 +10,7 @@ class RedisClient
 
         attr_reader :replica_clients
 
-        DUMMY_LATENCY_NSEC = 100 * 1000 * 1000 * 1000
+        DUMMY_LATENCY_MSEC = 100 * 1000 * 1000
         MEASURE_ATTEMPT_COUNT = 10
 
         def initialize(replications, options, pool, **kwargs)
@@ -45,7 +45,7 @@ class RedisClient
               Thread.new(k, v) do |node_key, client|
                 Thread.current[:node_key] = node_key
 
-                min = DUMMY_LATENCY_NSEC
+                min = DUMMY_LATENCY_MSEC
                 MEASURE_ATTEMPT_COUNT.times do
                   starting = Process.clock_gettime(Process::CLOCK_MONOTONIC, :microsecond)
                   client.call_once('PING')
@@ -55,7 +55,7 @@ class RedisClient
 
                 Thread.current[:latency] = min
               rescue StandardError
-                Thread.current[:latency] = DUMMY_LATENCY_NSEC
+                Thread.current[:latency] = DUMMY_LATENCY_MSEC
               end
             end
 

data/lib/redis_client/cluster/pub_sub.rb

@@ -3,33 +3,63 @@
 class RedisClient
   class Cluster
     class PubSub
+      MAX_THREADS = Integer(ENV.fetch('REDIS_CLIENT_MAX_THREADS', 5))
+
       def initialize(router, command_builder)
         @router = router
         @command_builder = command_builder
-        @pubsub = nil
+        @pubsub_states = {}
       end
 
       def call(*args, **kwargs)
-        close
-        command = @command_builder.generate(args, kwargs)
-        @pubsub = @router.assign_node(command).pubsub
-        @pubsub.call_v(command)
+        _call(@command_builder.generate(args, kwargs))
       end
 
       def call_v(command)
-        close
-        command = @command_builder.generate(command)
-        @pubsub = @router.assign_node(command).pubsub
-        @pubsub.call_v(command)
+        _call(@command_builder.generate(command))
       end
 
       def close
-        @pubsub&.close
-        @pubsub = nil
+        @pubsub_states.each_value(&:close)
+        @pubsub_states.clear
       end
 
       def next_event(timeout = nil)
-        @pubsub&.next_event(timeout)
+        return if @pubsub_states.empty?
+
+        msgs = collect_messages(timeout).compact
+        return msgs.first if msgs.size < 2
+
+        msgs
+      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)
+      end
+
+      def collect_messages(timeout) # rubocop:disable Metrics/AbcSize
+        @pubsub_states.each_slice(MAX_THREADS).each_with_object([]) do |chuncked_pubsub_states, acc|
+          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
+
+          threads.each do |t|
+            t.join
+            acc << t[:reply] unless t[:reply].nil?
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: A Redis cluster client for Ruby