redis-cluster-client 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bc3348020af7012ab193ef18128f2cd37028c9225f1e7fa9555d3609ff92362
-  data.tar.gz: 3c08890f1c50f297f0d60f0503bd268742bbcd242a32ac73df733496a013660e
+  metadata.gz: 96ad21a33077fd4809c93c017d75c5f0c257a666a741f329c1e61cf55f6c1cfe
+  data.tar.gz: 11c6d1f81a0b529682887266c0b1f0cfec305aff1f289b6d3a7b9aff6ed2151c
 SHA512:
-  metadata.gz: 8a4036ef8be3c29c747abc7deb59698fbf5d5e581ab9913fd3e06d530a9bae7eba13a397929bb9e3eaf611d5ee01960378ffef54bc6f69706aaf672bc9f38f89
-  data.tar.gz: '08897fd0c13bb175399b9118783e812f20555e0e09d021cf24fab236168d8ffd5a3ad4599f2ba1db56ccebaf501f9319c605940069c963f54b2268e1acad5dae'
+  metadata.gz: 0fa59538e10f1b37b9ef4c02173b4a3a58baf7abc41cd67d18c18f94fad236aac5ffa0e51bfffc33a17a8a116f0c49aef3744b54f91f9a032a7c57d04a0d0c38
+  data.tar.gz: 858ade5da894495cd5c72b036be79ba58775a78ce21184d3d0425d2ad30e2d73ad501a9580bbf1ed658eebe04fac8a24d8b9b2e2b8c37d719012df0ae7c027fa

data/lib/redis_client/cluster/command.rb

@@ -122,11 +122,8 @@ class RedisClient
       end
 
       def determine_optional_key_position(command, option_name)
-        command.each_with_index do |e, i|
-          return i + 1 if e.to_s.downcase(:ascii) == option_name
-        end
-
-        0
+        i = command.index { |v| v.to_s.casecmp(option_name).zero? }
+        i.nil? ? 0 : i + 1
       end
     end
   end

data/lib/redis_client/cluster/router.rb

@@ -17,18 +17,57 @@ class RedisClient
     class Router
       ZERO_CURSOR_FOR_SCAN = '0'
       TSF = ->(f, x) { f.nil? ? x : f.call(x) }.curry
+      DEDICATED_ACTIONS = lambda do # rubocop:disable Metrics/BlockLength
+        action = Struct.new('RedisCommandRoutingAction', :method_name, :reply_transformer, keyword_init: true)
+        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)
+        {
+          '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
+        }.each_with_object({}) do |(k, v), acc|
+          acc[k] = v
+          acc[k.upcase] = v
+        end
+      end.call.freeze
 
-      private_constant :ZERO_CURSOR_FOR_SCAN, :TSF
+      private_constant :ZERO_CURSOR_FOR_SCAN, :TSF, :DEDICATED_ACTIONS
 
       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
@@ -38,16 +77,15 @@ 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
-        return assign_node_and_send_command(method, command, args, &block) unless @dedicated_actions.key?(command.first)
+        return assign_node_and_send_command(method, command, args, &block) unless DEDICATED_ACTIONS.key?(command.first)
 
-        action = @dedicated_actions[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)
@@ -257,53 +295,6 @@ 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

data/lib/redis_client/cluster.rb

@@ -19,7 +19,6 @@ class RedisClient
       @config = config.nil? ? ClusterConfig.new(**kwargs) : config
       @concurrent_worker = ::RedisClient::Cluster::ConcurrentWorker.create(**(concurrency || {}))
       @command_builder = @config.command_builder
-
       @pool = pool
       @kwargs = kwargs
       @router = nil

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Taishi Kasuga
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-08 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -24,7 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
-description: 
 email:
 - proxy0721@gmail.com
 executables: []
@@ -62,7 +60,6 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -77,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
-summary: A Redis cluster client for Ruby
+summary: Redis cluster-aware client for Ruby
 test_files: []