redis-cluster-client 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fa6c9386e1ffd7571fdc8a29bea08960387d958149b972e1cf27d28eac98da0
-  data.tar.gz: e532422c94e7416df967f772112c77861f4501d5dcd73c2d9893237586077677
+  metadata.gz: 458c3d9cc4d1f6595510663cede0403953b2555ace0d3cae814663b23f69f1cb
+  data.tar.gz: 01d2a34641e298ff7e99cc5f9edbad4ed152e5ca4f18e16181b9a4b84a2492c2
 SHA512:
-  metadata.gz: ef29a0346608779f6528559e52e348df690baf44db0cd8c9e1fe94e44bf9d282eca81101a1246cb0bff418ec398b2b207eb47563e2b976b6523e0fe6583e55fb
-  data.tar.gz: 7e4059d96f02c078989c7bae6cc4790f1580d0fc721c545a86d694ddae7eb90541573c67bb66a93bc6732b45b1f1ac18a3370b0d3d20df41760be9eb78255f5c
+  metadata.gz: 3680e6b8b1594001060eb2dea29eb60f0779bba6a43350246b1d5c7e47b1bb1e04a6e1188ac87c1228adac21e86347cb3820679d6c92b693d7f7fedabba88402
+  data.tar.gz: 21927b8a14e9ad075e3808e736789c4339af907f5d99e16806273f1553c505e7fc86faabfa067b98f2a3dd7d45a41fb0f89e780e08825aa9df4317531871da5d

data/lib/redis_client/cluster/command.rb

@@ -2,10 +2,13 @@
 
 require 'redis_client'
 require 'redis_client/cluster/errors'
+require 'redis_client/cluster/normalized_cmd_name'
 
 class RedisClient
   class Cluster
     class Command
+      EMPTY_STRING = ''
+
       class << self
         def load(nodes) # rubocop:disable Metrics/MethodLength
           errors = []
@@ -29,7 +32,10 @@ class RedisClient
 
         def parse_command_details(rows)
           rows&.reject { |row| row[0].nil? }.to_h do |row|
-            [row[0].downcase, { arity: row[1], flags: row[2], first: row[3], last: row[4], step: row[5] }]
+            [
+              ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_name(row[0]),
+              { arity: row[1], flags: row[2], first: row[3], last: row[4], step: row[5] }
+            ]
           end
         end
       end
@@ -40,7 +46,7 @@ class RedisClient
 
       def extract_first_key(command)
         i = determine_first_key_position(command)
-        return '' if i == 0
+        return EMPTY_STRING if i == 0
 
         key = (command[i].is_a?(Array) ? command[i].flatten.first : command[i]).to_s
         hash_tag = extract_hash_tag(key)
@@ -56,7 +62,8 @@ class RedisClient
       end
 
       def exists?(name)
-        @details.key?(name.to_s.downcase)
+        key = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_name(name)
+        @details.key?(key)
       end
 
       private
@@ -72,14 +79,14 @@ class RedisClient
       end
 
       def dig_details(command, key)
-        name = command&.flatten&.first.to_s.downcase
+        name = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
         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 ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
         when 'eval', 'evalsha', 'zinterstore', 'zunionstore' then 3
         when 'object' then 2
         when 'memory'
@@ -104,7 +111,7 @@ class RedisClient
         s = key.index('{')
         e = key.index('}', s.to_i + 1)
 
-        return '' if s.nil? || e.nil?
+        return EMPTY_STRING if s.nil? || e.nil?
 
         key[s + 1..e - 1]
       end

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/normalized_cmd_name.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+class RedisClient
+  class Cluster
+    class NormalizedCmdName
+      include Singleton
+
+      EMPTY_STRING = ''
+
+      def initialize
+        @cache = {}
+        @mutex = Mutex.new
+      end
+
+      def get_by_command(command)
+        get(command, index: 0)
+      end
+
+      def get_by_subcommand(command)
+        get(command, index: 1)
+      end
+
+      def get_by_name(name)
+        get(name, index: 0)
+      end
+
+      def clear
+        @mutex.synchronize { @cache.clear }
+      end
+
+      private
+
+      def get(command, index:)
+        name = extract_name(command, index: index)
+        return EMPTY_STRING if name.nil? || name.empty?
+
+        normalize(name)
+      end
+
+      def extract_name(command, index:)
+        case command
+        when String, Symbol then index.zero? ? command : nil
+        when Array then extract_name_from_array(command, index: index)
+        end
+      end
+
+      def extract_name_from_array(command, index:)
+        return if command.size - 1 < index
+
+        case e = command[index]
+        when String, Symbol then e
+        when Array then e[index]
+        end
+      end
+
+      def normalize(name)
+        return @cache[name] if @cache.key?(name)
+        return name.to_s.downcase if @mutex.locked?
+
+        @mutex.synchronize { @cache[name] = name.to_s.downcase }
+        @cache[name]
+      end
+    end
+  end
+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?
@@ -72,8 +66,11 @@ class RedisClient
             Thread.new(@router, k, v) do |router, node_key, rows|
               Thread.pass
               replies = router.find_node(node_key).pipelined do |pipeline|
-                rows.each do |(_size, *row, block)|
-                  pipeline.send(*row, &block)
+                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
 
@@ -92,6 +89,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

@@ -6,6 +6,7 @@ require 'redis_client/cluster/errors'
 require 'redis_client/cluster/key_slot_converter'
 require 'redis_client/cluster/node'
 require 'redis_client/cluster/node_key'
+require 'redis_client/cluster/normalized_cmd_name'
 
 class RedisClient
   class Cluster
@@ -25,7 +26,7 @@ class RedisClient
       end
 
       def send_command(method, command, *args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        cmd = command.first.to_s.downcase
+        cmd = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
         case cmd
         when 'acl', 'auth', 'bgrewriteaof', 'bgsave', 'quit', 'save'
           @node.call_all(method, command, args, &block).first
@@ -65,7 +66,12 @@ class RedisClient
       # @see https://redis.io/topics/cluster-spec#redirection-and-resharding
       #   Redirection and resharding
       def try_send(node, method, command, args, retry_count: 3, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        node.send(method, *args, command, &block)
+        if args.empty?
+          # prevent memory allocation for variable-length args
+          node.send(method, command, &block)
+        else
+          node.send(method, *args, command, &block)
+        end
       rescue ::RedisClient::CommandError => e
         raise if retry_count <= 0
 
@@ -193,7 +199,7 @@ class RedisClient
       end
 
       def send_config_command(method, command, args, &block)
-        case command[1].to_s.downcase
+        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
         when 'resetstat', 'rewrite', 'set'
           @node.call_all(method, command, args, &block).first
         else assign_node(command).send(method, *args, command, &block)
@@ -201,7 +207,7 @@ class RedisClient
       end
 
       def send_memory_command(method, command, args, &block)
-        case command[1].to_s.downcase
+        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
         when 'stats' then @node.call_all(method, command, args, &block)
         when 'purge' then @node.call_all(method, command, args, &block).first
         else assign_node(command).send(method, *args, command, &block)
@@ -209,7 +215,7 @@ class RedisClient
       end
 
       def send_client_command(method, command, args, &block)
-        case command[1].to_s.downcase
+        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
         when 'list' then @node.call_all(method, command, args, &block).flatten
         when 'pause', 'reply', 'setname'
           @node.call_all(method, command, args, &block).first
@@ -217,10 +223,8 @@ class RedisClient
         end
       end
 
-      def send_cluster_command(method, command, args, &block) # rubocop:disable Metrics/MethodLength
-        subcommand = command[1].to_s.downcase
-
-        case subcommand
+      def send_cluster_command(method, command, args, &block)
+        case subcommand = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
         when 'addslots', 'delslots', 'failover', 'forget', 'meet', 'replicate',
              'reset', 'set-config-epoch', 'setslot'
           raise ::RedisClient::Cluster::OrchestrationCommandNotSupported, ['cluster', subcommand]
@@ -234,7 +238,7 @@ class RedisClient
       end
 
       def send_script_command(method, command, args, &block)
-        case command[1].to_s.downcase
+        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
         when 'debug', 'kill'
           @node.call_all(method, command, args, &block).first
         when 'flush', 'load'
@@ -244,7 +248,7 @@ class RedisClient
       end
 
       def send_pubsub_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        case command[1].to_s.downcase
+        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
         when 'channels' then @node.call_all(method, command, args, &block).flatten.uniq.sort_by(&:to_s)
         when 'numsub'
           @node.call_all(method, command, args, &block).reject(&:empty?).map { |e| Hash[*e] }
@@ -281,6 +285,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

@@ -83,10 +83,14 @@ 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)
+      return if @mutex.locked?
+
       @mutex.synchronize { @node_configs << { host: host, port: port } }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -42,6 +42,7 @@ files:
 - lib/redis_client/cluster/node/random_replica.rb
 - lib/redis_client/cluster/node/replica_mixin.rb
 - lib/redis_client/cluster/node_key.rb
+- lib/redis_client/cluster/normalized_cmd_name.rb
 - lib/redis_client/cluster/pipeline.rb
 - lib/redis_client/cluster/pub_sub.rb
 - lib/redis_client/cluster/router.rb