redis-cluster-client 0.12.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d90c095f5058e808331eaa9219fb52b9d4a27de639a9c54d194c68ecb253611
-  data.tar.gz: 8cd8092db87c7cfa42e00c6cabd30747bdea74130d8eb1e19b971b95637665fa
+  metadata.gz: 2bc3348020af7012ab193ef18128f2cd37028c9225f1e7fa9555d3609ff92362
+  data.tar.gz: 3c08890f1c50f297f0d60f0503bd268742bbcd242a32ac73df733496a013660e
 SHA512:
-  metadata.gz: 4821b78b0d5766566fa3943f65271908d3e52e3f82269bd2ea0a789e571df7818b5e0275c88d8833eb7b449c7c0eb3ed672034c1caf03fac35528114f31adb73
-  data.tar.gz: a4bb1d4a766cd742645c61342c2822e2bd337c792fb67b9793bfbb06ec0a889185eaa8b3ed34f96591f9e57997ecfe83cc901ce65451577b7e8f13d7d23f64b3
+  metadata.gz: 8a4036ef8be3c29c747abc7deb59698fbf5d5e581ab9913fd3e06d530a9bae7eba13a397929bb9e3eaf611d5ee01960378ffef54bc6f69706aaf672bc9f38f89
+  data.tar.gz: '08897fd0c13bb175399b9118783e812f20555e0e09d021cf24fab236168d8ffd5a3ad4599f2ba1db56ccebaf501f9319c605940069c963f54b2268e1acad5dae'

data/lib/redis_client/cluster/command.rb

@@ -3,7 +3,6 @@
 require 'redis_client'
 require 'redis_client/cluster/errors'
 require 'redis_client/cluster/key_slot_converter'
-require 'redis_client/cluster/normalized_cmd_name'
 
 class RedisClient
   class Cluster
@@ -30,7 +29,7 @@ class RedisClient
           nodes&.each do |node|
             regular_timeout = node.read_timeout
             node.read_timeout = slow_command_timeout > 0.0 ? slow_command_timeout : regular_timeout
-            reply = node.call('COMMAND')
+            reply = node.call('command')
             node.read_timeout = regular_timeout
             commands = parse_command_reply(reply)
             cmd = ::RedisClient::Cluster::Command.new(commands)
@@ -47,14 +46,28 @@ class RedisClient
 
         private
 
-        def parse_command_reply(rows)
+        def parse_command_reply(rows) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
           rows&.each_with_object({}) do |row, acc|
-            next if row[0].nil?
+            next if row.first.nil?
 
-            acc[row[0].downcase] = ::RedisClient::Cluster::Command::Detail.new(
-              first_key_position: row[3],
+            # TODO: in redis 7.0 or later, subcommand information included in the command reply
+
+            pos = case row.first
+                  when 'eval', 'evalsha', 'zinterstore', 'zunionstore' then 3
+                  when 'object', 'xgroup' then 2
+                  when 'migrate', 'xread', 'xreadgroup' then 0
+                  else row[3]
+                  end
+
+            writable = case row.first
+                       when 'xgroup' then true
+                       else row[2].include?('write')
+                       end
+
+            acc[row.first] = ::RedisClient::Cluster::Command::Detail.new(
+              first_key_position: pos,
               key_step: row[5],
-              write?: row[2].include?('write'),
+              write?: writable,
               readonly?: row[2].include?('readonly')
             )
           end.freeze || EMPTY_HASH
@@ -73,39 +86,47 @@ class RedisClient
       end
 
       def should_send_to_primary?(command)
-        name = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
-        @commands[name]&.write?
+        find_command_info(command.first)&.write?
       end
 
       def should_send_to_replica?(command)
-        name = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
-        @commands[name]&.readonly?
+        find_command_info(command.first)&.readonly?
       end
 
       def exists?(name)
-        @commands.key?(::RedisClient::Cluster::NormalizedCmdName.instance.get_by_name(name))
+        @commands.key?(name) || @commands.key?(name.to_s.downcase(:ascii))
       end
 
       private
 
-      def determine_first_key_position(command) # rubocop:disable Metrics/CyclomaticComplexity
-        case name = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
-        when 'eval', 'evalsha', 'zinterstore', 'zunionstore' then 3
-        when 'object' then 2
-        when 'memory'
-          command[1].to_s.casecmp('usage').zero? ? 2 : 0
-        when 'migrate'
-          command[3].empty? ? determine_optional_key_position(command, 'keys') : 3
-        when 'xread', 'xreadgroup'
+      def find_command_info(name)
+        @commands[name] || @commands[name.to_s.downcase(:ascii)]
+      end
+
+      def determine_first_key_position(command) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+        i = find_command_info(command.first)&.first_key_position.to_i
+        return i if i > 0
+
+        cmd_name = command.first
+        if cmd_name.casecmp('xread').zero?
+          determine_optional_key_position(command, 'streams')
+        elsif cmd_name.casecmp('xreadgroup').zero?
           determine_optional_key_position(command, 'streams')
+        elsif cmd_name.casecmp('migrate').zero?
+          command[3].empty? ? determine_optional_key_position(command, 'keys') : 3
+        elsif cmd_name.casecmp('memory').zero?
+          command[1].to_s.casecmp('usage').zero? ? 2 : 0
         else
-          @commands[name]&.first_key_position.to_i
+          i
         end
       end
 
       def determine_optional_key_position(command, option_name)
-        idx = command.map { |e| e.to_s.downcase }.index(option_name&.downcase)
-        idx.nil? ? 0 : idx + 1
+        command.each_with_index do |e, i|
+          return i + 1 if e.to_s.downcase(:ascii) == option_name
+        end
+
+        0
       end
     end
   end

data/lib/redis_client/cluster/concurrent_worker/on_demand.rb

@@ -5,6 +5,8 @@ class RedisClient
     module ConcurrentWorker
       class OnDemand
         def initialize(size:)
+          raise ArgumentError, "size must be positive: #{size}" unless size.positive?
+
           @q = SizedQueue.new(size)
         end
 

data/lib/redis_client/cluster/concurrent_worker/pooled.rb

@@ -11,6 +11,8 @@ class RedisClient
       # So it consumes memory 1 MB multiplied a number of workers.
       class Pooled
         def initialize(size:)
+          raise ArgumentError, "size must be positive: #{size}" unless size.positive?
+
           @size = size
           setup
         end

data/lib/redis_client/cluster/concurrent_worker.rb

@@ -71,14 +71,12 @@ class RedisClient
 
       module_function
 
-      def create(model: :on_demand, size: 5)
-        size = size.positive? ? size : 5
-
+      def create(model: :none, size: 5)
         case model
-        when :on_demand, nil then ::RedisClient::Cluster::ConcurrentWorker::OnDemand.new(size: size)
-        when :pooled then ::RedisClient::Cluster::ConcurrentWorker::Pooled.new(size: size)
         when :none then ::RedisClient::Cluster::ConcurrentWorker::None.new
-        else raise ArgumentError, "Unknown model: #{model}"
+        when :on_demand then ::RedisClient::Cluster::ConcurrentWorker::OnDemand.new(size: size)
+        when :pooled then ::RedisClient::Cluster::ConcurrentWorker::Pooled.new(size: size)
+        else raise ArgumentError, "unknown model: #{model}"
         end
       end
     end

data/lib/redis_client/cluster/errors.rb

@@ -43,11 +43,16 @@ class RedisClient
         if !errors.is_a?(Hash) || errors.empty?
           new(errors.to_s).with_errors(EMPTY_HASH)
         else
-          messages = errors.map { |node_key, error| "#{node_key}: (#{error.class}) #{error.message}" }
+          messages = errors.map { |node_key, error| "#{node_key}: (#{error.class}) #{error.message}" }.freeze
           new(messages.join(', ')).with_errors(errors)
         end
       end
 
+      def initialize(error_message = nil)
+        @errors = nil
+        super
+      end
+
       def with_errors(errors)
         @errors = errors if @errors.nil?
         self
@@ -61,7 +66,7 @@ class RedisClient
     end
 
     class NodeMightBeDown < Error
-      def initialize(_ = '')
+      def initialize(_error_message = nil)
         super(
           'The client is trying to fetch the latest cluster state ' \
           'because a subset of nodes might be down. ' \

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

@@ -47,7 +47,7 @@ class RedisClient
               min = DUMMY_LATENCY_MSEC
               MEASURE_ATTEMPT_COUNT.times do
                 starting = obtain_current_time
-                cli.call_once('PING')
+                cli.call_once('ping')
                 duration = obtain_current_time - starting
                 min = duration if duration < min
               end

data/lib/redis_client/cluster/node.rb

@@ -7,6 +7,7 @@ require 'redis_client/cluster/node/primary_only'
 require 'redis_client/cluster/node/random_replica'
 require 'redis_client/cluster/node/random_replica_or_primary'
 require 'redis_client/cluster/node/latency_replica'
+require 'redis_client/cluster/node_key'
 
 class RedisClient
   class Cluster
@@ -43,6 +44,10 @@ class RedisClient
         def replica?
           role == 'slave'
         end
+
+        def serialize(str)
+          str << id << node_key << role << primary_id << config_epoch
+        end
       end
 
       class CharArray
@@ -90,7 +95,7 @@ class RedisClient
 
         def build_connection_prelude
           prelude = super.dup
-          prelude << ['READONLY'] if @scale_read
+          prelude << ['readonly'] if @scale_read
           prelude.freeze
         end
       end
@@ -309,7 +314,7 @@ class RedisClient
           work_group.push(i, raw_client) do |client|
             regular_timeout = client.read_timeout
             client.read_timeout = @config.slow_command_timeout > 0.0 ? @config.slow_command_timeout : regular_timeout
-            reply = client.call_once('CLUSTER', 'NODES')
+            reply = client.call_once('cluster', 'nodes')
             client.read_timeout = regular_timeout
             parse_cluster_node_reply(reply)
           rescue StandardError => e
@@ -338,9 +343,7 @@ class RedisClient
 
         grouped = node_info_list.compact.group_by do |info_list|
           info_list.sort_by!(&:id)
-          info_list.each_with_object(String.new(capacity: 128 * info_list.size)) do |e, a|
-            a << e.id << e.node_key << e.role << e.primary_id << e.config_epoch
-          end
+          info_list.each_with_object(String.new(capacity: 128 * info_list.size)) { |e, a| e.serialize(a) }
         end
 
         grouped.max_by { |_, v| v.size }[1].first
@@ -375,6 +378,48 @@ class RedisClient
         end
       end
 
+      def parse_cluster_slots_reply(reply) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        reply.group_by { |e| e[2][2] }.each_with_object([]) do |(primary_id, group), acc|
+          slots = group.map { |e| e[0, 2] }.freeze
+
+          group.first[2..].each do |arr|
+            ip = arr[0]
+            next if ip.nil? || ip.empty? || ip == '?'
+
+            id = arr[2]
+            role = id == primary_id ? 'master' : 'slave'
+            acc << ::RedisClient::Cluster::Node::Info.new(
+              id: id,
+              node_key: NodeKey.build_from_host_port(ip, arr[1]),
+              role: role,
+              primary_id: role == 'master' ? nil : primary_id,
+              slots: role == 'master' ? slots : EMPTY_ARRAY
+            )
+          end
+        end.freeze
+      end
+
+      def parse_cluster_shards_reply(reply) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        reply.each_with_object([]) do |shard, acc|
+          nodes = shard.fetch('nodes')
+          primary_id = nodes.find { |n| n.fetch('role') == 'master' }.fetch('id')
+
+          nodes.each do |node|
+            ip = node.fetch('ip')
+            next if node.fetch('health') != 'online' || ip.nil? || ip.empty? || ip == '?'
+
+            role = node.fetch('role')
+            acc << ::RedisClient::Cluster::Node::Info.new(
+              id: node.fetch('id'),
+              node_key: NodeKey.build_from_host_port(ip, node['port'] || node['tls-port']),
+              role: role == 'master' ? role : 'slave',
+              primary_id: role == 'master' ? nil : primary_id,
+              slots: role == 'master' ? shard.fetch('slots').each_slice(2).to_a.freeze : EMPTY_ARRAY
+            )
+          end
+        end.freeze
+      end
+
       # As redirection node_key is dependent on `cluster-preferred-endpoint-type` config,
       # node_key should use hostname if present in CLUSTER NODES output.
       #

data/lib/redis_client/cluster/optimistic_locking.rb

@@ -18,15 +18,15 @@ class RedisClient
         handle_redirection(slot, retry_count: 1) do |nd|
           nd.with do |c|
             c.ensure_connected_cluster_scoped(retryable: false) do
-              c.call('ASKING') if @asking
-              c.call('WATCH', *keys)
+              c.call('asking') if @asking
+              c.call('watch', *keys)
               begin
                 yield(c, slot, @asking)
               rescue ::RedisClient::ConnectionError
                 # No need to unwatch on a connection error.
                 raise
               rescue StandardError
-                c.call('UNWATCH')
+                c.call('unwatch')
                 raise
               end
             rescue ::RedisClient::CommandError => e

data/lib/redis_client/cluster/pipeline.rb

@@ -283,14 +283,14 @@ class RedisClient
         args = timeout.nil? ? [] : [timeout]
 
         if block.nil?
-          @router.try_send(node, method, command, args)
+          @router.send_command_to_node(node, method, command, args)
         else
-          @router.try_send(node, method, command, args, &block)
+          @router.send_command_to_node(node, method, command, args, &block)
         end
       end
 
       def try_asking(node)
-        node.call('ASKING') == 'OK'
+        node.call('asking') == 'OK'
       rescue StandardError
         false
       end

data/lib/redis_client/cluster/pub_sub.rb

@@ -2,7 +2,6 @@
 
 require 'redis_client'
 require 'redis_client/cluster/errors'
-require 'redis_client/cluster/normalized_cmd_name'
 
 class RedisClient
   class Cluster
@@ -108,12 +107,21 @@ class RedisClient
 
       private
 
-      def _call(command)
-        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
-        when 'subscribe', 'psubscribe', 'ssubscribe' then call_to_single_state(command)
-        when 'unsubscribe', 'punsubscribe' then call_to_all_states(command)
-        when 'sunsubscribe' then call_for_sharded_states(command)
-        else call_to_single_state(command)
+      def _call(command) # rubocop:disable Metrics/AbcSize
+        if command.first.casecmp('subscribe').zero?
+          call_to_single_state(command)
+        elsif command.first.casecmp('psubscribe').zero?
+          call_to_single_state(command)
+        elsif command.first.casecmp('ssubscribe').zero?
+          call_to_single_state(command)
+        elsif command.first.casecmp('unsubscribe').zero?
+          call_to_all_states(command)
+        elsif command.first.casecmp('punsubscribe').zero?
+          call_to_all_states(command)
+        elsif command.first.casecmp('sunsubscribe').zero?
+          call_for_sharded_states(command)
+        else
+          call_to_single_state(command)
         end
       end
 

data/lib/redis_client/cluster/router.rb

@@ -7,7 +7,6 @@ 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'
 require 'redis_client/cluster/transaction'
 require 'redis_client/cluster/optimistic_locking'
 require 'redis_client/cluster/pipeline'
@@ -23,6 +22,13 @@ class RedisClient
 
       attr_reader :config
 
+      Action = Struct.new(
+        'RedisCommandRoutingAction',
+        :method_name,
+        :reply_transformer,
+        keyword_init: true
+      )
+
       def initialize(config, concurrent_worker, pool: nil, **kwargs)
         @config = config
         @concurrent_worker = concurrent_worker
@@ -32,42 +38,20 @@ class RedisClient
         @node.reload!
         @command = ::RedisClient::Cluster::Command.load(@node.replica_clients.shuffle, slow_command_timeout: config.slow_command_timeout)
         @command_builder = @config.command_builder
+        @dedicated_actions = build_dedicated_actions
       rescue ::RedisClient::Cluster::InitialSetupError => e
         e.with_config(config)
         raise
       end
 
       def send_command(method, command, *args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        cmd = ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
-        case cmd
-        when 'ping'     then @node.send_ping(method, command, args).first.then(&TSF.call(block))
-        when 'wait'     then send_wait_command(method, command, args, &block)
-        when 'keys'     then @node.call_replicas(method, command, args).flatten.sort_by(&:to_s).then(&TSF.call(block))
-        when 'dbsize'   then @node.call_replicas(method, command, args).select { |e| e.is_a?(Integer) }.sum.then(&TSF.call(block))
-        when 'scan'     then scan(command, seed: 1)
-        when 'lastsave' then @node.call_all(method, command, args).sort_by(&:to_i).then(&TSF.call(block))
-        when 'role'     then @node.call_all(method, command, args, &block)
-        when 'config'   then send_config_command(method, command, args, &block)
-        when 'client'   then send_client_command(method, command, args, &block)
-        when 'cluster'  then send_cluster_command(method, command, args, &block)
-        when 'memory'   then send_memory_command(method, command, args, &block)
-        when 'script'   then send_script_command(method, command, args, &block)
-        when 'pubsub'   then send_pubsub_command(method, command, args, &block)
-        when 'watch'    then send_watch_command(command, &block)
-        when 'mset', 'mget', 'del'
-          send_multiple_keys_command(cmd, method, command, args, &block)
-        when 'acl', 'auth', 'bgrewriteaof', 'bgsave', 'quit', 'save'
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
-        when 'flushall', 'flushdb'
-          @node.call_primaries(method, command, args).first.then(&TSF.call(block))
-        when 'readonly', 'readwrite', 'shutdown'
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(cmd).with_config(@config)
-        when 'discard', 'exec', 'multi', 'unwatch'
-          raise ::RedisClient::Cluster::AmbiguousNodeError.from_command(cmd).with_config(@config)
-        else
-          node = assign_node(command)
-          try_send(node, method, command, args, &block)
-        end
+        return assign_node_and_send_command(method, command, args, &block) unless @dedicated_actions.key?(command.first)
+
+        action = @dedicated_actions[command.first]
+        return send(action.method_name, method, command, args, &block) if action.reply_transformer.nil?
+
+        reply = send(action.method_name, method, command, args)
+        action.reply_transformer.call(reply).then(&TSF.call(block))
       rescue ::RedisClient::CircuitBreaker::OpenCircuitError
         raise
       rescue ::RedisClient::Cluster::Node::ReloadNeeded
@@ -93,7 +77,12 @@ class RedisClient
       end
 
       # @see https://redis.io/docs/reference/cluster-spec/#redirection-and-resharding Redirection and resharding
-      def try_send(node, method, command, args, retry_count: 3, &block)
+      def assign_node_and_send_command(method, command, args, retry_count: 3, &block)
+        node = assign_node(command)
+        send_command_to_node(node, method, command, args, retry_count: retry_count, &block)
+      end
+
+      def send_command_to_node(node, method, command, args, retry_count: 3, &block)
         handle_redirection(node, command, retry_count: retry_count) do |on_node|
           if args.empty?
             # prevent memory allocation for variable-length args
@@ -118,7 +107,7 @@ class RedisClient
         elsif e.message.start_with?('ASK')
           node = assign_asking_node(e.message)
           if retry_count >= 0
-            node.call('ASKING')
+            node.call('asking')
             retry
           end
         elsif e.message.start_with?('CLUSTERDOWN')
@@ -268,6 +257,81 @@ class RedisClient
 
       private
 
+      def build_dedicated_actions # rubocop:disable Metrics/AbcSize
+        pick_first = ->(reply) { reply.first } # rubocop:disable Style/SymbolProc
+        multiple_key_action = Action.new(method_name: :send_multiple_keys_command)
+        all_node_first_action = Action.new(method_name: :send_command_to_all_nodes, reply_transformer: pick_first)
+        primary_first_action = Action.new(method_name: :send_command_to_primaries, reply_transformer: pick_first)
+        not_supported_action = Action.new(method_name: :fail_not_supported_command)
+        keyless_action = Action.new(method_name: :fail_keyless_command)
+        actions = {
+          'ping' => Action.new(method_name: :send_ping_command, reply_transformer: pick_first),
+          'wait' => Action.new(method_name: :send_wait_command),
+          'keys' => Action.new(method_name: :send_command_to_replicas, reply_transformer: ->(reply) { reply.flatten.sort_by(&:to_s) }),
+          'dbsize' => Action.new(method_name: :send_command_to_replicas, reply_transformer: ->(reply) { reply.select { |e| e.is_a?(Integer) }.sum }),
+          'scan' => Action.new(method_name: :send_scan_command),
+          'lastsave' => Action.new(method_name: :send_command_to_all_nodes, reply_transformer: ->(reply) { reply.sort_by(&:to_i) }),
+          'role' => Action.new(method_name: :send_command_to_all_nodes),
+          'config' => Action.new(method_name: :send_config_command),
+          'client' => Action.new(method_name: :send_client_command),
+          'cluster' => Action.new(method_name: :send_cluster_command),
+          'memory' => Action.new(method_name: :send_memory_command),
+          'script' => Action.new(method_name: :send_script_command),
+          'pubsub' => Action.new(method_name: :send_pubsub_command),
+          'watch' => Action.new(method_name: :send_watch_command),
+          'mget' => multiple_key_action,
+          'mset' => multiple_key_action,
+          'del' => multiple_key_action,
+          'acl' => all_node_first_action,
+          'auth' => all_node_first_action,
+          'bgrewriteaof' => all_node_first_action,
+          'bgsave' => all_node_first_action,
+          'quit' => all_node_first_action,
+          'save' => all_node_first_action,
+          'flushall' => primary_first_action,
+          'flushdb' => primary_first_action,
+          'readonly' => not_supported_action,
+          'readwrite' => not_supported_action,
+          'shutdown' => not_supported_action,
+          'discard' => keyless_action,
+          'exec' => keyless_action,
+          'multi' => keyless_action,
+          'unwatch' => keyless_action
+        }.freeze
+        actions.each_with_object({}) do |(k, v), acc|
+          acc[k] = v
+          acc[k.upcase] = v
+        end.freeze
+      end
+
+      def send_command_to_all_nodes(method, command, args, &block)
+        @node.call_all(method, command, args, &block)
+      end
+
+      def send_command_to_primaries(method, command, args, &block)
+        @node.call_primaries(method, command, args, &block)
+      end
+
+      def send_command_to_replicas(method, command, args, &block)
+        @node.call_replicas(method, command, args, &block)
+      end
+
+      def send_ping_command(method, command, args, &block)
+        @node.send_ping(method, command, args, &block)
+      end
+
+      def send_scan_command(_method, command, _args, &_block)
+        scan(command, seed: 1)
+      end
+
+      def fail_not_supported_command(_method, command, _args, &_block)
+        raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(command.first).with_config(@config)
+      end
+
+      def fail_keyless_command(_method, command, _args, &_block)
+        raise ::RedisClient::Cluster::AmbiguousNodeError.from_command(command.first).with_config(@config)
+      end
+
       def send_wait_command(method, command, args, retry_count: 1, &block) # rubocop:disable Metrics/AbcSize
         @node.call_primaries(method, command, args).select { |r| r.is_a?(Integer) }.sum.then(&TSF.call(block))
       rescue ::RedisClient::Cluster::ErrorCollection => e
@@ -280,79 +344,110 @@ class RedisClient
         retry
       end
 
-      def send_config_command(method, command, args, &block)
-        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
-        when 'resetstat', 'rewrite', 'set'
+      def send_config_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize
+        if command[1].casecmp('resetstat').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
-        else assign_node(command).public_send(method, *args, command, &block)
+        elsif command[1].casecmp('rewrite').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
+        elsif command[1].casecmp('set').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
+        else
+          assign_node(command).public_send(method, *args, command, &block)
         end
       end
 
       def send_memory_command(method, command, args, &block)
-        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).first.then(&TSF.call(block))
-        else assign_node(command).public_send(method, *args, command, &block)
+        if command[1].casecmp('stats').zero?
+          @node.call_all(method, command, args, &block)
+        elsif command[1].casecmp('purge').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
+        else
+          assign_node(command).public_send(method, *args, command, &block)
         end
       end
 
-      def send_client_command(method, command, args, &block)
-        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
-        when 'list' then @node.call_all(method, command, args, &block).flatten
-        when 'pause', 'reply', 'setname'
+      def send_client_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize
+        if command[1].casecmp('list').zero?
+          @node.call_all(method, command, args, &block).flatten
+        elsif command[1].casecmp('pause').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
-        else assign_node(command).public_send(method, *args, command, &block)
+        elsif command[1].casecmp('reply').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
+        elsif command[1].casecmp('setname').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
+        else
+          assign_node(command).public_send(method, *args, command, &block)
         end
       end
 
-      def send_cluster_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize
-        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.from_command(['cluster', subcommand]).with_config(@config)
-        when 'saveconfig' then @node.call_all(method, command, args).first.then(&TSF.call(block))
-        when 'getkeysinslot'
+      def send_cluster_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        if command[1].casecmp('addslots').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('delslots').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('failover').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('forget').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('meet').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('replicate').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('reset').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('set-config-epoch').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('setslot').zero?
+          fail_not_supported_command(method, command, args, &block)
+        elsif command[1].casecmp('saveconfig').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
+        elsif command[1].casecmp('getkeysinslot').zero?
           raise ArgumentError, command.join(' ') if command.size != 4
 
           handle_node_reload_error do
             node_key = @node.find_node_key_of_replica(command[2])
             @node.find_by(node_key).public_send(method, *args, command, &block)
           end
-        else assign_node(command).public_send(method, *args, command, &block)
+        else
+          assign_node(command).public_send(method, *args, command, &block)
         end
       end
 
-      def send_script_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize
-        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
-        when 'debug', 'kill'
+      def send_script_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        if command[1].casecmp('debug').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
-        when 'flush', 'load'
+        elsif command[1].casecmp('kill').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
+        elsif command[1].casecmp('flush').zero?
+          @node.call_primaries(method, command, args).first.then(&TSF.call(block))
+        elsif command[1].casecmp('load').zero?
           @node.call_primaries(method, command, args).first.then(&TSF.call(block))
-        when 'exists'
+        elsif command[1].casecmp('exists').zero?
           @node.call_all(method, command, args).transpose.map { |arr| arr.any?(&:zero?) ? 0 : 1 }.then(&TSF.call(block))
-        else assign_node(command).public_send(method, *args, command, &block)
+        else
+          assign_node(command).public_send(method, *args, command, &block)
         end
       end
 
       def send_pubsub_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
-        when 'channels'
+        if command[1].casecmp('channels').zero?
           @node.call_all(method, command, args).flatten.uniq.sort_by(&:to_s).then(&TSF.call(block))
-        when 'shardchannels'
+        elsif command[1].casecmp('shardchannels').zero?
           @node.call_replicas(method, command, args).flatten.uniq.sort_by(&:to_s).then(&TSF.call(block))
-        when 'numpat'
+        elsif command[1].casecmp('numpat').zero?
           @node.call_all(method, command, args).select { |e| e.is_a?(Integer) }.sum.then(&TSF.call(block))
-        when 'numsub'
+        elsif command[1].casecmp('numsub').zero?
           @node.call_all(method, command, args).reject(&:empty?).map { |e| Hash[*e] }
                .reduce({}) { |a, e| a.merge(e) { |_, v1, v2| v1 + v2 } }.then(&TSF.call(block))
-        when 'shardnumsub'
+        elsif command[1].casecmp('shardnumsub').zero?
           @node.call_replicas(method, command, args).reject(&:empty?).map { |e| Hash[*e] }
                .reduce({}) { |a, e| a.merge(e) { |_, v1, v2| v1 + v2 } }.then(&TSF.call(block))
-        else assign_node(command).public_send(method, *args, command, &block)
+        else
+          assign_node(command).public_send(method, *args, command, &block)
         end
       end
 
-      def send_watch_command(command)
+      def send_watch_command(_method, command, _args, &_block)
         unless block_given?
           msg = 'A block required. And you need to use the block argument as a client for the transaction.'
           raise ::RedisClient::Cluster::Transaction::ConsistencyError.new(msg).with_config(@config)
@@ -367,22 +462,23 @@ class RedisClient
         end
       end
 
-      def send_multiple_keys_command(cmd, method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def send_multiple_keys_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         # This implementation is prioritized performance rather than readability or so.
-        case cmd
-        when 'mget'
+        cmd = command.first
+        if cmd.casecmp('mget').zero?
           single_key_cmd = 'get'
           keys_step = 1
-        when 'mset'
+        elsif cmd.casecmp('mset').zero?
           single_key_cmd = 'set'
           keys_step = 2
-        when 'del'
+        elsif cmd.casecmp('del').zero?
           single_key_cmd = 'del'
           keys_step = 1
-        else raise NotImplementedError, cmd
+        else
+          raise NotImplementedError, cmd
         end
 
-        return try_send(assign_node(command), method, command, args, &block) if command.size <= keys_step + 1 || ::RedisClient::Cluster::KeySlotConverter.hash_tag_included?(command[1])
+        return assign_node_and_send_command(method, command, args, &block) if command.size <= keys_step + 1 || ::RedisClient::Cluster::KeySlotConverter.hash_tag_included?(command[1])
 
         seed = @config.use_replica? && @config.replica_affinity == :random ? nil : Random.new_seed
         pipeline = ::RedisClient::Cluster::Pipeline.new(self, @command_builder, @concurrent_worker, exception: true, seed: seed)
@@ -402,10 +498,12 @@ class RedisClient
         end
 
         replies = pipeline.execute
-        result = case cmd
-                 when 'mset' then replies.first
-                 when 'del' then replies.sum
-                 else replies
+        result = if cmd.casecmp('mset').zero?
+                   replies.first
+                 elsif cmd.casecmp('del').zero?
+                   replies.sum
+                 else
+                   replies
                  end
         block_given? ? yield(result) : result
       end

data/lib/redis_client/cluster/transaction.rb

@@ -93,24 +93,24 @@ class RedisClient
       end
 
       def prepare_tx
-        @pipeline.call('MULTI')
+        @pipeline.call('multi')
         @pending_commands.each(&:call)
         @pending_commands.clear
       end
 
       def commit
-        @pipeline.call('EXEC')
+        @pipeline.call('exec')
         settle
       end
 
       def cancel
-        @pipeline.call('DISCARD')
+        @pipeline.call('discard')
         settle
       end
 
       def settle
         # If we needed ASKING on the watch, we need ASKING on the multi as well.
-        @node.call('ASKING') if @asking
+        @node.call('asking') if @asking
         # Don't handle redirections at this level if we're in a watch (the watcher handles redirections
         # at the whole-transaction level.)
         send_transaction(@node, redirect: !!@watching_slot ? 0 : MAX_REDIRECTION)
@@ -189,7 +189,7 @@ class RedisClient
       end
 
       def try_asking(node)
-        node.call('ASKING') == 'OK'
+        node.call('asking') == 'OK'
       rescue StandardError
         false
       end

data/lib/redis_client/cluster.rb

@@ -64,7 +64,7 @@ class RedisClient
     def scan(*args, **kwargs, &block)
       return to_enum(__callee__, *args, **kwargs) unless block_given?
 
-      command = @command_builder.generate(['SCAN', ZERO_CURSOR_FOR_SCAN] + args, kwargs)
+      command = @command_builder.generate(['scan', ZERO_CURSOR_FOR_SCAN] + args, kwargs)
       seed = Random.new_seed
       loop do
         cursor, keys = router.scan(command, seed: seed)
@@ -77,21 +77,21 @@ class RedisClient
     def sscan(key, *args, **kwargs, &block)
       return to_enum(__callee__, key, *args, **kwargs) unless block_given?
 
-      command = @command_builder.generate(['SSCAN', key, ZERO_CURSOR_FOR_SCAN] + args, kwargs)
+      command = @command_builder.generate(['sscan', key, ZERO_CURSOR_FOR_SCAN] + args, kwargs)
       router.scan_single_key(command, arity: 1, &block)
     end
 
     def hscan(key, *args, **kwargs, &block)
       return to_enum(__callee__, key, *args, **kwargs) unless block_given?
 
-      command = @command_builder.generate(['HSCAN', key, ZERO_CURSOR_FOR_SCAN] + args, kwargs)
+      command = @command_builder.generate(['hscan', key, ZERO_CURSOR_FOR_SCAN] + args, kwargs)
       router.scan_single_key(command, arity: 2, &block)
     end
 
     def zscan(key, *args, **kwargs, &block)
       return to_enum(__callee__, key, *args, **kwargs) unless block_given?
 
-      command = @command_builder.generate(['ZSCAN', key, ZERO_CURSOR_FOR_SCAN] + args, kwargs)
+      command = @command_builder.generate(['zscan', key, ZERO_CURSOR_FOR_SCAN] + args, kwargs)
       router.scan_single_key(command, arity: 2, &block)
     end
 
@@ -152,8 +152,9 @@ class RedisClient
     end
 
     def method_missing(name, *args, **kwargs, &block)
-      if router.command_exists?(name)
-        args.unshift(name)
+      cmd = name.respond_to?(:name) ? name.name : name.to_s
+      if router.command_exists?(cmd)
+        args.unshift(cmd)
         command = @command_builder.generate(args, kwargs)
         return router.send_command(:call_v, command, &block)
       end

data/lib/redis_client/cluster_config.rb

@@ -19,7 +19,7 @@ class RedisClient
     VALID_NODES_KEYS = %i[ssl username password host port db].freeze
     MERGE_CONFIG_KEYS = %i[ssl username password].freeze
     IGNORE_GENERIC_CONFIG_KEYS = %i[url host port path].freeze
-    MAX_WORKERS = Integer(ENV.fetch('REDIS_CLIENT_MAX_THREADS', 5))
+    MAX_WORKERS = Integer(ENV.fetch('REDIS_CLIENT_MAX_THREADS', -1)) # for backward compatibility
     # It's used with slow queries of fetching meta data like CLUSTER NODES, COMMAND and so on.
     SLOW_COMMAND_TIMEOUT = Float(ENV.fetch('REDIS_CLIENT_SLOW_COMMAND_TIMEOUT', -1))
     # It affects to strike a balance between load and stability in initialization or changed states.
@@ -47,7 +47,6 @@ class RedisClient
       max_startup_sample: MAX_STARTUP_SAMPLE,
       **client_config
     )
-
       @replica = true & replica
       @replica_affinity = replica_affinity.to_s.to_sym
       @fixed_hostname = fixed_hostname.to_s
@@ -110,12 +109,16 @@ class RedisClient
     private
 
     def merge_concurrency_option(option)
-      case option
-      when Hash
-        option = option.transform_keys(&:to_sym)
-        { size: MAX_WORKERS }.merge(option)
-      else { size: MAX_WORKERS }
+      opts = {}
+
+      if MAX_WORKERS.positive?
+        opts[:model] = :on_demand
+        opts[:size] = MAX_WORKERS
       end
+
+      opts.merge!(option.transform_keys(&:to_sym)) if option.is_a?(Hash)
+      opts[:model] = :none if opts.empty?
+      opts.freeze
     end
 
     def build_node_configs(addrs)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.1
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -49,7 +49,6 @@ files:
 - lib/redis_client/cluster/node/random_replica_or_primary.rb
 - lib/redis_client/cluster/node_key.rb
 - lib/redis_client/cluster/noop_command_builder.rb
-- lib/redis_client/cluster/normalized_cmd_name.rb
 - lib/redis_client/cluster/optimistic_locking.rb
 - lib/redis_client/cluster/pipeline.rb
 - lib/redis_client/cluster/pub_sub.rb

data/lib/redis_client/cluster/normalized_cmd_name.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-require 'singleton'
-
-class RedisClient
-  class Cluster
-    class NormalizedCmdName
-      include Singleton
-
-      EMPTY_STRING = ''
-
-      private_constant :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 }
-        true
-      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] || name.to_s.downcase if @cache.key?(name)
-        return name.to_s.downcase if @mutex.locked?
-
-        str = name.to_s.downcase
-        @mutex.synchronize { @cache[name] = str }
-        str
-      end
-    end
-  end
-end