redis-cluster-client 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 619becbe41f6cb5c829de9df021a399ac966b1976284e06e7792c0b570061e32
-  data.tar.gz: 5b6ddc1c8410bcf8ab03538bf5dd77d0425d4bf34f170ea026ff4d1c1be2ce8e
+  metadata.gz: 1eaec04db89e1afa8a1d0a27688194d5941a94edb00aef979b1f368d01b4dd41
+  data.tar.gz: 36571e86def197fc3633d4c026958fbe635576d5f9aec3ab19b32759957a8f14
 SHA512:
-  metadata.gz: 658a78bdd61f7e902b2385c73f23f3fa692a73b77a073afc0cb3d0616726a99cb65884ec4ab7cbae2bdd4574444f1de2f639105eaa4f40e1c07c186d7589dff5
-  data.tar.gz: 33b9d88cc33fec6f5a556ae3beb494c9875796088b93a47b647efe02db6f41540d49f3120d5d7114c8757aa78e29b173abd20a8b2a2341861e953a0ab4b0f67a
+  metadata.gz: 2da9f21f30cc49f9df64cf11ed5ee3c0385bc6310bbb7e8cf3478552272f716ab68928aee05bb90b24d39253040f170fd38df78687afb78ea612f310f6a96b2e
+  data.tar.gz: 4f7828b8072f01aaa5aa56264d7fda6f8d4ff17bce7a88a5adb2c05bd5eab8a74fe137b3c59ce1bba086a9793a05d490252d0df94228e35c6c10a2b0d869d797

data/lib/redis_client/cluster/command.rb

@@ -72,14 +72,14 @@ class RedisClient
       end
 
       def dig_details(command, key)
-        name = command&.flatten&.first.to_s.downcase
+        name = command&.flatten&.first.to_s.downcase # OPTIMIZE: prevent allocation for string
         return if name.empty? || !@details.key?(name)
 
         @details.fetch(name).fetch(key)
       end
 
       def determine_first_key_position(command) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
-        case command&.flatten&.first.to_s.downcase
+        case command&.flatten&.first.to_s.downcase # OPTIMIZE: prevent allocation for string
         when 'eval', 'evalsha', 'zinterstore', 'zunionstore' then 3
         when 'object' then 2
         when 'memory'

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

@@ -21,6 +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
         end
 
         def clients_for_scanning(seed: nil) # rubocop:disable Lint/UnusedMethodArgument
@@ -33,7 +34,7 @@ class RedisClient
 
         def any_replica_node_key(seed: nil)
           random = seed.nil? ? Random : Random.new(seed)
-          @replications.reject { |_, v| v.empty? }.values.sample(random: random).first
+          @existed_replicas.sample(random: random).first
         end
 
         private

data/lib/redis_client/cluster/node.rb

@@ -181,6 +181,8 @@ class RedisClient
       end
 
       def update_slot(slot, node_key)
+        return if @mutex.locked?
+
         @mutex.synchronize { @slots[slot] = node_key }
       end
 

data/lib/redis_client/cluster/pipeline.rb

@@ -9,54 +9,48 @@ class RedisClient
       ReplySizeError = Class.new(::RedisClient::Error)
       MAX_THREADS = Integer(ENV.fetch('REDIS_CLIENT_MAX_THREADS', 5))
 
-      def initialize(router, command_builder)
+      def initialize(router, command_builder, seed: Random.new_seed)
         @router = router
         @command_builder = command_builder
-        @grouped = Hash.new([].freeze)
+        @grouped = {}
         @size = 0
-        @seed = Random.new_seed
+        @seed = seed
       end
 
       def call(*args, **kwargs, &block)
         command = @command_builder.generate(args, kwargs)
         node_key = @router.find_node_key(command, seed: @seed)
-        @grouped[node_key] += [[@size, :call_v, command, block]]
-        @size += 1
+        add_line(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)
-        @grouped[node_key] += [[@size, :call_v, command, block]]
-        @size += 1
+        add_line(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)
-        @grouped[node_key] += [[@size, :call_once_v, command, block]]
-        @size += 1
+        add_line(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)
-        @grouped[node_key] += [[@size, :call_once_v, command, block]]
-        @size += 1
+        add_line(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)
-        @grouped[node_key] += [[@size, :blocking_call_v, timeout, command, block]]
-        @size += 1
+        add_line(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)
-        @grouped[node_key] += [[@size, :blocking_call_v, timeout, command, block]]
-        @size += 1
+        add_line(node_key, [@size, :blocking_call_v, timeout, command, block])
       end
 
       def empty?
@@ -92,6 +86,14 @@ class RedisClient
 
         raise ::RedisClient::Cluster::ErrorCollection, errors
       end
+
+      private
+
+      def add_line(node_key, line)
+        @grouped[node_key] = [] unless @grouped.key?(node_key)
+        @grouped[node_key] << line
+        @size += 1
+      end
     end
   end
 end

data/lib/redis_client/cluster/router.rb

@@ -281,6 +281,8 @@ class RedisClient
       end
 
       def update_cluster_info!
+        return if @mutex.locked?
+
         @mutex.synchronize do
           begin
             @node.each(&:close)

data/lib/redis_client/cluster.rb

@@ -78,7 +78,8 @@ class RedisClient
     end
 
     def pipelined
-      pipeline = ::RedisClient::Cluster::Pipeline.new(@router, @command_builder)
+      seed = @config.use_replica? && @config.replica_affinity == :random ? nil : Random.new_seed
+      pipeline = ::RedisClient::Cluster::Pipeline.new(@router, @command_builder, seed: seed)
       yield pipeline
       return [] if pipeline.empty? == 0
 

data/lib/redis_client/cluster_config.rb

@@ -42,6 +42,17 @@ class RedisClient
       @mutex = Mutex.new
     end
 
+    def dup
+      self.class.new(
+        nodes: @node_configs,
+        replica: @replica,
+        replica_affinity: @replica_affinity,
+        fixed_hostname: @fixed_hostname,
+        client_implementation: @client_implementation,
+        **@client_config
+      )
+    end
+
     def inspect
       "#<#{self.class.name} #{per_node_key.values}>"
     end
@@ -72,15 +83,15 @@ class RedisClient
     end
 
     def update_node(addrs)
+      return if @mutex.locked?
+
       @mutex.synchronize { @node_configs = build_node_configs(addrs) }
     end
 
     def add_node(host, port)
-      @mutex.synchronize { @node_configs << { host: host, port: port } }
-    end
+      return if @mutex.locked?
 
-    def dup
-      self.class.new(nodes: @node_configs, replica: @replica, fixed_hostname: @fixed_hostname, **@client_config)
+      @mutex.synchronize { @node_configs << { host: host, port: port } }
     end
 
     private

metadata

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