redis-cluster-client 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 458c3d9cc4d1f6595510663cede0403953b2555ace0d3cae814663b23f69f1cb
-  data.tar.gz: 01d2a34641e298ff7e99cc5f9edbad4ed152e5ca4f18e16181b9a4b84a2492c2
+  metadata.gz: a697c2bd33f615cb435ee48c11c301bba56cad4eac139f30db70a183d888d891
+  data.tar.gz: 52200e9400bd7bd7fde2019c52b6cf1e26c6c019cbf1ed12a25c2167cd7ac129
 SHA512:
-  metadata.gz: 3680e6b8b1594001060eb2dea29eb60f0779bba6a43350246b1d5c7e47b1bb1e04a6e1188ac87c1228adac21e86347cb3820679d6c92b693d7f7fedabba88402
-  data.tar.gz: 21927b8a14e9ad075e3808e736789c4339af907f5d99e16806273f1553c505e7fc86faabfa067b98f2a3dd7d45a41fb0f89e780e08825aa9df4317531871da5d
+  metadata.gz: 05dc86fd1aa3cbf3cd3f0fa43d9d1c8463fcbe9e0ce1bcfe094f6095fd92d878a4bb21e6d6fa62203e91f3dc642e5869552f0b83d579cfa158b791501e1cb600
+  data.tar.gz: 8f80c5072d4d1bdbeb3e2cb4c9f92493537a6d9002edd71426598844ba28a497171c055135bb19a1d89a325c194026195100f9a0aea89c0beac3d8e9424f7f58

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

@@ -40,12 +40,12 @@ class RedisClient
         private
 
         def measure_latencies(clients) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-          latencies = {}
-
+          latencies = nil
           clients.each_slice(::RedisClient::Cluster::Node::MAX_THREADS) do |chuncked_clients|
             threads = chuncked_clients.map do |k, v|
               Thread.new(k, v) do |node_key, client|
                 Thread.pass
+                Thread.current.thread_variable_set(:node_key, node_key)
 
                 min = DUMMY_LATENCY_NSEC
                 MEASURE_ATTEMPT_COUNT.times do
@@ -55,13 +55,17 @@ class RedisClient
                   min = duration if duration < min
                 end
 
-                latencies[node_key] = min
+                Thread.current.thread_variable_set(:latency, min)
               rescue StandardError
-                latencies[node_key] = DUMMY_LATENCY_NSEC
+                Thread.current.thread_variable_set(:latency, DUMMY_LATENCY_NSEC)
               end
             end
 
-            threads.each(&:join)
+            threads.each do |t|
+              t.join
+              latencies ||= {}
+              latencies[t.thread_variable_get(:node_key)] = t.thread_variable_get(:latency)
+            end
           end
 
           latencies

data/lib/redis_client/cluster/node.rb

@@ -39,27 +39,36 @@ class RedisClient
       class << self
         def load_info(options, **kwargs) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           startup_size = options.size > MAX_STARTUP_SAMPLE ? MAX_STARTUP_SAMPLE : options.size
-          node_info_list = Array.new(startup_size)
-          errors = Array.new(startup_size)
+          node_info_list = errors = nil
           startup_options = options.to_a.sample(MAX_STARTUP_SAMPLE).to_h
           startup_nodes = ::RedisClient::Cluster::Node.new(startup_options, **kwargs)
           startup_nodes.each_slice(MAX_THREADS).with_index do |chuncked_startup_nodes, chuncked_idx|
             threads = chuncked_startup_nodes.each_with_index.map do |raw_client, idx|
               Thread.new(raw_client, (MAX_THREADS * chuncked_idx) + idx) do |cli, i|
                 Thread.pass
+                Thread.current.thread_variable_set(:index, i)
                 reply = cli.call('CLUSTER', 'NODES')
-                node_info_list[i] = parse_node_info(reply)
+                Thread.current.thread_variable_set(:info, parse_node_info(reply))
               rescue StandardError => e
-                errors[i] = e
+                Thread.current.thread_variable_set(:error, e)
               ensure
                 cli&.close
               end
             end
 
-            threads.each(&:join)
+            threads.each do |t|
+              t.join
+              if t.thread_variable?(:info)
+                node_info_list ||= Array.new(startup_size)
+                node_info_list[t.thread_variable_get(:index)] = t.thread_variable_get(:info)
+              elsif t.thread_variable?(:error)
+                errors ||= Array.new(startup_size)
+                errors[t.thread_variable_get(:index)] = t.thread_variable_get(:error)
+              end
+            end
           end
 
-          raise ::RedisClient::Cluster::InitialSetupError, errors if node_info_list.all?(&:nil?)
+          raise ::RedisClient::Cluster::InitialSetupError, errors if node_info_list.nil?
 
           grouped = node_info_list.compact.group_by do |rows|
             rows.sort_by { |row| row[:id] }
@@ -147,7 +156,7 @@ class RedisClient
 
       def send_ping(method, command, args, &block)
         result_values, errors = call_multiple_nodes(@topology.clients, method, command, args, &block)
-        return result_values if errors.empty?
+        return result_values if errors.nil? || errors.empty?
 
         raise ReloadNeeded if errors.values.any?(::RedisClient::ConnectionError)
 
@@ -228,26 +237,35 @@ class RedisClient
 
       def call_multiple_nodes!(clients, method, command, args, &block)
         result_values, errors = call_multiple_nodes(clients, method, command, args, &block)
-        return result_values if errors.empty?
+        return result_values if errors.nil? || errors.empty?
 
         raise ::RedisClient::Cluster::ErrorCollection, errors
       end
 
-      def try_map(clients) # rubocop:disable Metrics/MethodLength
-        results = {}
-        errors = {}
+      def try_map(clients) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        results = errors = nil
         clients.each_slice(MAX_THREADS) do |chuncked_clients|
           threads = chuncked_clients.map do |k, v|
             Thread.new(k, v) do |node_key, client|
               Thread.pass
+              Thread.current.thread_variable_set(:node_key, node_key)
               reply = yield(node_key, client)
-              results[node_key] = reply unless reply.nil?
+              Thread.current.thread_variable_set(:result, reply)
             rescue StandardError => e
-              errors[node_key] = e
+              Thread.current.thread_variable_set(:error, e)
             end
           end
 
-          threads.each(&:join)
+          threads.each do |t|
+            t.join
+            if t.thread_variable?(:result)
+              results ||= {}
+              results[t.thread_variable_get(:node_key)] = t.thread_variable_get(:result)
+            elsif t.thread_variable?(:error)
+              errors ||= {}
+              errors[t.thread_variable_get(:node_key)] = t.thread_variable_get(:error)
+            end
+          end
         end
 
         [results, errors]

data/lib/redis_client/cluster/pipeline.rb

@@ -20,37 +20,37 @@ class RedisClient
       def call(*args, **kwargs, &block)
         command = @command_builder.generate(args, kwargs)
         node_key = @router.find_node_key(command, seed: @seed)
-        add_line(node_key, [@size, :call_v, command, block])
+        add_row(node_key, [@size, :call_v, command, block])
       end
 
       def call_v(args, &block)
         command = @command_builder.generate(args)
         node_key = @router.find_node_key(command, seed: @seed)
-        add_line(node_key, [@size, :call_v, command, block])
+        add_row(node_key, [@size, :call_v, command, block])
       end
 
       def call_once(*args, **kwargs, &block)
         command = @command_builder.generate(args, kwargs)
         node_key = @router.find_node_key(command, seed: @seed)
-        add_line(node_key, [@size, :call_once_v, command, block])
+        add_row(node_key, [@size, :call_once_v, command, block])
       end
 
       def call_once_v(args, &block)
         command = @command_builder.generate(args)
         node_key = @router.find_node_key(command, seed: @seed)
-        add_line(node_key, [@size, :call_once_v, command, block])
+        add_row(node_key, [@size, :call_once_v, command, block])
       end
 
       def blocking_call(timeout, *args, **kwargs, &block)
         command = @command_builder.generate(args, kwargs)
         node_key = @router.find_node_key(command, seed: @seed)
-        add_line(node_key, [@size, :blocking_call_v, timeout, command, block])
+        add_row(node_key, [@size, :blocking_call_v, timeout, command, block])
       end
 
       def blocking_call_v(timeout, args, &block)
         command = @command_builder.generate(args)
         node_key = @router.find_node_key(command, seed: @seed)
-        add_line(node_key, [@size, :blocking_call_v, timeout, command, block])
+        add_row(node_key, [@size, :blocking_call_v, timeout, command, block])
       end
 
       def empty?
@@ -59,44 +59,57 @@ class RedisClient
 
       # TODO: https://github.com/redis-rb/redis-cluster-client/issues/37 handle redirections
       def execute # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        all_replies = Array.new(@size)
-        errors = {}
+        all_replies = errors = nil
         @grouped.each_slice(MAX_THREADS) do |chuncked_grouped|
           threads = chuncked_grouped.map do |k, v|
             Thread.new(@router, k, v) do |router, node_key, rows|
               Thread.pass
-              replies = router.find_node(node_key).pipelined do |pipeline|
-                rows.each do |row|
-                  case row.size
-                  when 4 then pipeline.send(row[1], row[2], &row[3])
-                  when 5 then pipeline.send(row[1], row[2], row[3], &row[4])
-                  end
-                end
-              end
-
+              replies = do_pipelining(router.find_node(node_key), rows)
               raise ReplySizeError, "commands: #{rows.size}, replies: #{replies.size}" if rows.size != replies.size
 
-              rows.each_with_index { |row, idx| all_replies[row.first] = replies[idx] }
+              Thread.current.thread_variable_set(:rows, rows)
+              Thread.current.thread_variable_set(:replies, replies)
             rescue StandardError => e
-              errors[node_key] = e
+              Thread.current.thread_variable_set(:node_key, node_key)
+              Thread.current.thread_variable_set(:error, e)
             end
           end
 
-          threads.each(&:join)
+          threads.each do |t|
+            t.join
+            if t.thread_variable?(:replies)
+              all_replies ||= Array.new(@size)
+              t.thread_variable_get(:rows).each_with_index { |r, i| all_replies[r.first] = t.thread_variable_get(:replies)[i] }
+            elsif t.thread_variable?(:error)
+              errors ||= {}
+              errors[t.thread_variable_get(:node_key)] = t.thread_variable_get(:error)
+            end
+          end
         end
 
-        return all_replies if errors.empty?
+        return all_replies if errors.nil?
 
         raise ::RedisClient::Cluster::ErrorCollection, errors
       end
 
       private
 
-      def add_line(node_key, line)
+      def add_row(node_key, row)
         @grouped[node_key] = [] unless @grouped.key?(node_key)
-        @grouped[node_key] << line
+        @grouped[node_key] << row
         @size += 1
       end
+
+      def do_pipelining(node, rows)
+        node.pipelined do |pipeline|
+          rows.each do |row|
+            case row.size
+            when 4 then pipeline.send(row[1], row[2], &row[3])
+            when 5 then pipeline.send(row[1], row[2], row[3], &row[4])
+            end
+          end
+        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.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client