redis-cluster-client 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa9148e1dedc8ccb5087590b5b693ff2d32ab1b4a16bf25227ab0d030bea56c
-  data.tar.gz: f8d699a826f263cb5ff1d99f08fd1be1cec551f4306759e14165f800a7ffec57
+  metadata.gz: 2bc3348020af7012ab193ef18128f2cd37028c9225f1e7fa9555d3609ff92362
+  data.tar.gz: 3c08890f1c50f297f0d60f0503bd268742bbcd242a32ac73df733496a013660e
 SHA512:
-  metadata.gz: 4630e1a9819484cf9675b4d6b77bcf39d437cd821ff3875c5717cfaccc827fc8482f71a6da41e5032227a02b19c214c339956d865ffa942eb8f901d329f3ffea
-  data.tar.gz: 3e2a2424421543b08623e76dcea06d2a646c3cfadbace64b6dce0adfd8bead2b24d78aa568d1ee36c45bc80c3cdcf473c7fa74e7f30976b0005f1d34791d6707
+  metadata.gz: 8a4036ef8be3c29c747abc7deb59698fbf5d5e581ab9913fd3e06d530a9bae7eba13a397929bb9e3eaf611d5ee01960378ffef54bc6f69706aaf672bc9f38f89
+  data.tar.gz: '08897fd0c13bb175399b9118783e812f20555e0e09d021cf24fab236168d8ffd5a3ad4599f2ba1db56ccebaf501f9319c605940069c963f54b2268e1acad5dae'

data/lib/redis_client/cluster/command.rb

@@ -46,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?
+
+            # 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: row[3],
+              first_key_position: pos,
               key_step: row[5],
-              write?: row[2].include?('write'),
+              write?: writable,
               readonly?: row[2].include?('readonly')
             )
           end.freeze || EMPTY_HASH
@@ -90,42 +104,29 @@ class RedisClient
       end
 
       def determine_first_key_position(command) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
-        if command.first.casecmp('get').zero?
-          find_command_info(command.first)&.first_key_position.to_i
-        elsif command.first.casecmp('mget').zero?
-          find_command_info(command.first)&.first_key_position.to_i
-        elsif command.first.casecmp('set').zero?
-          find_command_info(command.first)&.first_key_position.to_i
-        elsif command.first.casecmp('mset').zero?
-          find_command_info(command.first)&.first_key_position.to_i
-        elsif command.first.casecmp('del').zero?
-          find_command_info(command.first)&.first_key_position.to_i
-        elsif command.first.casecmp('eval').zero?
-          3
-        elsif command.first.casecmp('evalsha').zero?
-          3
-        elsif command.first.casecmp('zinterstore').zero?
-          3
-        elsif command.first.casecmp('zunionstore').zero?
-          3
-        elsif command.first.casecmp('object').zero?
-          2
-        elsif command.first.casecmp('memory').zero?
-          command[1].to_s.casecmp('usage').zero? ? 2 : 0
-        elsif command.first.casecmp('migrate').zero?
-          command[3].empty? ? determine_optional_key_position(command, 'keys') : 3
-        elsif command.first.casecmp('xread').zero?
+        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 command.first.casecmp('xreadgroup').zero?
+        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
-          find_command_info(command.first)&.first_key_position.to_i
+          i
         end
       end
 
       def determine_optional_key_position(command, option_name)
-        idx = command.map { |e| e.to_s.downcase(:ascii) }.index(option_name)
-        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/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
@@ -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/pipeline.rb

@@ -283,9 +283,9 @@ 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
 

data/lib/redis_client/cluster/router.rb

@@ -22,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
@@ -31,87 +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, Metrics/MethodLength
-        cmd_name = command.first
-        if cmd_name.casecmp('get').zero?
-          node = assign_node(command)
-          try_send(node, method, command, args, &block)
-        elsif cmd_name.casecmp('mget').zero?
-          send_multiple_keys_command(command.first, method, command, args, &block)
-        elsif cmd_name.casecmp('set').zero?
-          node = assign_node(command)
-          try_send(node, method, command, args, &block)
-        elsif cmd_name.casecmp('mset').zero?
-          send_multiple_keys_command(command.first, method, command, args, &block)
-        elsif cmd_name.casecmp('del').zero?
-          send_multiple_keys_command(command.first, method, command, args, &block)
-        elsif cmd_name.casecmp('ping').zero?
-          @node.send_ping(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('wait').zero?
-          send_wait_command(method, command, args, &block)
-        elsif cmd_name.casecmp('keys').zero?
-          @node.call_replicas(method, command, args).flatten.sort_by(&:to_s).then(&TSF.call(block))
-        elsif cmd_name.casecmp('dbsize').zero?
-          @node.call_replicas(method, command, args).select { |e| e.is_a?(Integer) }.sum.then(&TSF.call(block))
-        elsif cmd_name.casecmp('scan').zero?
-          scan(command, seed: 1)
-        elsif cmd_name.casecmp('lastsave').zero?
-          @node.call_all(method, command, args).sort_by(&:to_i).then(&TSF.call(block))
-        elsif cmd_name.casecmp('role').zero?
-          @node.call_all(method, command, args, &block)
-        elsif cmd_name.casecmp('config').zero?
-          send_config_command(method, command, args, &block)
-        elsif cmd_name.casecmp('client').zero?
-          send_client_command(method, command, args, &block)
-        elsif cmd_name.casecmp('cluster').zero?
-          send_cluster_command(method, command, args, &block)
-        elsif cmd_name.casecmp('memory').zero?
-          send_memory_command(method, command, args, &block)
-        elsif cmd_name.casecmp('script').zero?
-          send_script_command(method, command, args, &block)
-        elsif cmd_name.casecmp('pubsub').zero?
-          send_pubsub_command(method, command, args, &block)
-        elsif cmd_name.casecmp('watch').zero?
-          send_watch_command(command, &block)
-        elsif cmd_name.casecmp('acl').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('auth').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('bgrewriteaof').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('bgsave').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('quit').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('save').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('flushall').zero?
-          @node.call_primaries(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('flushdb').zero?
-          @node.call_primaries(method, command, args).first.then(&TSF.call(block))
-        elsif cmd_name.casecmp('readonly').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(command.first).with_config(@config)
-        elsif cmd_name.casecmp('readwrite').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(command.first).with_config(@config)
-        elsif cmd_name.casecmp('shutdown').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(command.first).with_config(@config)
-        elsif cmd_name.casecmp('discard').zero?
-          raise ::RedisClient::Cluster::AmbiguousNodeError.from_command(command.first).with_config(@config)
-        elsif cmd_name.casecmp('exec').zero?
-          raise ::RedisClient::Cluster::AmbiguousNodeError.from_command(command.first).with_config(@config)
-        elsif cmd_name.casecmp('multi').zero?
-          raise ::RedisClient::Cluster::AmbiguousNodeError.from_command(command.first).with_config(@config)
-        elsif cmd_name.casecmp('unwatch').zero?
-          raise ::RedisClient::Cluster::AmbiguousNodeError.from_command(command.first).with_config(@config)
-        else
-          node = assign_node(command)
-          try_send(node, method, command, args, &block)
-        end
+      def send_command(method, command, *args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        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
@@ -137,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
@@ -312,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
@@ -362,23 +382,23 @@ class RedisClient
 
       def send_cluster_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         if command[1].casecmp('addslots').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('delslots').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('failover').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('forget').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('meet').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('replicate').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('reset').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('set-config-epoch').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          fail_not_supported_command(method, command, args, &block)
         elsif command[1].casecmp('setslot').zero?
-          raise ::RedisClient::Cluster::OrchestrationCommandNotSupported.from_command(['cluster', command[1]]).with_config(@config)
+          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?
@@ -427,7 +447,7 @@ class RedisClient
         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)
@@ -442,8 +462,9 @@ 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.
+        cmd = command.first
         if cmd.casecmp('mget').zero?
           single_key_cmd = 'get'
           keys_step = 1
@@ -457,7 +478,7 @@ class RedisClient
           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)

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
 

data/lib/redis_client/cluster_config.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client