redis-cluster-client 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9570ec36f046f18840242eb63ede8e5bdf710e4a9a2d738b244bed46ea53530c
-  data.tar.gz: 5fd06dcf1f843e7f6151278400f33d45725c1ee1b8dcbf0afc6d72a00677c237
+  metadata.gz: 7eb062a2819ec74aebd03e23d7fd55281b8bf600bb5dd9bbcfb4cb36086070ef
+  data.tar.gz: 0bb82a71679f66948d09f07a8e5ccb6b31138e9c1fe7f9d6ab7d10abf35cf473
 SHA512:
-  metadata.gz: 0c4b639bb180399c9d71bd054da5d10c03e93fafd4f595aa958dbec36d842a8b01da9449f5fe57f4c51a6088a99abc35fc2e6e5ec1605ba7058ecab8b05a9ebd
-  data.tar.gz: 50b5b38b74b9b79b9526af4f76fdf7b3a5b54a51ccf2a641c78039610478087cbb0452239454580288a66c580cdacb0277f6aaf14f2eb44c5804ae6f86607b3d
+  metadata.gz: 87727a31dfd4278a353902f31b9bda5f99fe9e0651491f8b2af5bcab16bae819087adff8a8e7ecfdaf81bcd1f99b95e002d66bb4cc44ab690326bcca6c10dd4c
+  data.tar.gz: d4850893095a151cfe5f47a66642fcc311cd58e3466f46f5d8a1ce1e73374ac3f7faaf6b0bcb6ea1f3b18762c3198fad57af33614514280bcac85bfab2af8b08

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

@@ -21,7 +21,7 @@ class RedisClient
           @replications.each_value { |keys| keys.sort_by! { |k| latencies.fetch(k) } }
           @replica_clients = select_replica_clients(@replications, @clients)
           @clients_for_scanning = select_clients_for_scanning(@replications, @clients)
-          @existed_replicas = @replications.reject { |_, v| v.empty? }.values
+          @existed_replicas = @replications.values.reject(&:empty?)
         end
 
         def clients_for_scanning(seed: nil) # rubocop:disable Lint/UnusedMethodArgument
@@ -43,7 +43,6 @@ class RedisClient
           clients.each_slice(::RedisClient::Cluster::Node::MAX_THREADS).each_with_object({}) do |chuncked_clients, acc|
             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

data/lib/redis_client/cluster/node.rb

@@ -18,10 +18,12 @@ class RedisClient
       MAX_STARTUP_SAMPLE = 37
       MAX_THREADS = Integer(ENV.fetch('REDIS_CLIENT_MAX_THREADS', 5))
       IGNORE_GENERIC_CONFIG_KEYS = %i[url host port path].freeze
+      SLOT_OPTIMIZATION_STRING = '0' * SLOT_SIZE
 
       ReloadNeeded = Class.new(::RedisClient::Error)
+
       Info = Struct.new(
-        'RedisNode',
+        'RedisClusterNode',
         :id, :node_key, :role, :primary_id, :ping_sent,
         :pong_recv, :config_epoch, :link_state, :slots,
         keyword_init: true
@@ -35,23 +37,27 @@ class RedisClient
         end
       end
 
-      SLOT_OPTIMIZATION_MAX_SHARD_SIZE = 256
-      SLOT_OPTIMIZATION_STRING = '0' * SLOT_SIZE
-      Slot = Struct.new('RedisSlot', :slots, :primary_node_keys, keyword_init: true) do
-        def [](slot)
-          primary_node_keys[slots.getbyte(slot)]
+      Slot = Struct.new('StringArray', :string, :elements, keyword_init: true) do
+        def [](index)
+          raise IndexError if index < 0
+          return if index >= string.bytesize
+
+          elements[string.getbyte(index)]
         end
 
-        def []=(slot, primary_node_key)
-          index = primary_node_keys.find_index(primary_node_key)
-          if index.nil?
-            raise(::RedisClient::Cluster::Node::ReloadNeeded, primary_node_key) if primary_node_keys.size >= SLOT_OPTIMIZATION_MAX_SHARD_SIZE
+        def []=(index, element)
+          raise IndexError if index < 0
+          return if index >= string.bytesize
+
+          pos = elements.find_index(element) # O(N)
+          if pos.nil?
+            raise(RangeError, 'full of elements') if elements.size >= 256
 
-            index = primary_node_keys.size
-            primary_node_keys << primary_node_key
+            pos = elements.size
+            elements << element
           end
 
-          slots.setbyte(slot, index)
+          string.setbyte(index, pos)
         end
       end
 
@@ -79,7 +85,6 @@ class RedisClient
           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')
                 Thread.current.thread_variable_set(:info, parse_cluster_node_reply(reply))
@@ -229,7 +234,12 @@ class RedisClient
       def update_slot(slot, node_key)
         return if @mutex.locked?
 
-        @mutex.synchronize { @slots[slot] = node_key }
+        @mutex.synchronize do
+          @slots[slot] = node_key
+        rescue RangeError
+          @slots = Array.new(SLOT_SIZE) { |i| @slots[i] }
+          @slots[slot] = node_key
+        end
       end
 
       private
@@ -256,11 +266,11 @@ class RedisClient
       end
 
       def make_array_for_slot_node_mappings(node_info_list)
-        return Array.new(SLOT_SIZE) if node_info_list.count(&:primary?) > SLOT_OPTIMIZATION_MAX_SHARD_SIZE
+        return Array.new(SLOT_SIZE) if node_info_list.count(&:primary?) > 256
 
         ::RedisClient::Cluster::Node::Slot.new(
-          slots: String.new(SLOT_OPTIMIZATION_STRING, encoding: Encoding::BINARY, capacity: SLOT_SIZE),
-          primary_node_keys: node_info_list.select(&:primary?).map(&:node_key)
+          string: String.new(SLOT_OPTIMIZATION_STRING, encoding: Encoding::BINARY, capacity: SLOT_SIZE),
+          elements: node_info_list.select(&:primary?).map(&:node_key)
         )
       end
 
@@ -293,7 +303,6 @@ class RedisClient
         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)
               Thread.current.thread_variable_set(:result, reply)

data/lib/redis_client/cluster/pipeline.rb

@@ -142,7 +142,6 @@ class RedisClient
         @pipelines&.each_slice(MAX_THREADS) do |chuncked_pipelines|
           threads = chuncked_pipelines.map do |node_key, pipeline|
             Thread.new(node_key, pipeline) do |nk, pl|
-              Thread.pass
               Thread.current.thread_variable_set(:node_key, nk)
               replies = do_pipelining(@router.find_node(nk), pl)
               raise ReplySizeError, "commands: #{pl._size}, replies: #{replies.size}" if pl._size != replies.size

data/lib/redis_client/cluster/router.rb

@@ -12,6 +12,7 @@ class RedisClient
   class Cluster
     class Router
       ZERO_CURSOR_FOR_SCAN = '0'
+      METHODS_FOR_BLOCKING_CMD = %i[blocking_call_v blocking_call].freeze
 
       attr_reader :node
 
@@ -91,7 +92,7 @@ class RedisClient
           raise
         end
       rescue ::RedisClient::ConnectionError => e
-        raise if method == :blocking_call_v || (method == :blocking_call && e.is_a?(RedisClient::ReadTimeoutError))
+        raise if METHODS_FOR_BLOCKING_CMD.include?(method) && e.is_a?(RedisClient::ReadTimeoutError)
         raise if retry_count <= 0
 
         update_cluster_info!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client