redis-cluster-client 0.17.1 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dbfbaf304e900620662da7b8b5e6af36dfda8dc62a27d3e9a1efb975f5bd07f
-  data.tar.gz: 8080422513db9f7edcbad4d3eafc4fb0472d5a754ee2a0bc64eaacfda8e283e0
+  metadata.gz: ee9d2adeb89553bf3e1bfdb3d98f1dabed5a9e4347bee756776081036a1d4341
+  data.tar.gz: 9576cdbb916ee5b1ea82b722bb41a8144f46bbd4641620c41822c89be85bcf34
 SHA512:
-  metadata.gz: 980a40227b929c64632ff903ad4334942489d3c2af13ef0ec09006be856ae7c06a2e96c1a4c8c9a976b38091f53aa2e87833a5d6d04c07a0426129da20924838
-  data.tar.gz: b7915e5337c66a3a0423ebcb206e7be0b3794ce1ccac40a1a99e08b8f305a594c9594d6a670f3679d1df081e80527fde4a153ac6949c7ca832bbb149fc0dcfee
+  metadata.gz: 99ba847297a711cb7f1af1c05da9cf4222d00c3c89a91e4ba92b8e7eb5078275db448b46ce573b97e9fa03e40fd7cb69deac0987a43fc6be3dc3b53ea9779024
+  data.tar.gz: 8755ce77dfad1fc86fdb17ce63a31aa5eb71fa8aba44a84eea3194c29d2df2045dfeab48d60137d9e1032ec1cfc42a66aef732c48ba005f38da4a687c084ec8a

data/lib/redis_client/cluster/router/routing_table.rb

@@ -33,6 +33,7 @@ class RedisClient
             'keys' => RoutingAction.new(method_name: :send_command_to_replicas, reply_transformer: FLATTEN_STRINGS),
             'dbsize' => RoutingAction.new(method_name: :send_command_to_replicas, reply_transformer: SUM_NUM),
             'scan' => RoutingAction.new(method_name: :send_scan_command),
+            'bless' => RoutingAction.new(method_name: :send_bless_command),
             'lastsave' => RoutingAction.new(method_name: :send_command_to_all_nodes, reply_transformer: SORT_NUMBERS),
             'role' => RoutingAction.new(method_name: :send_command_to_all_nodes),
             'config' => RoutingAction.new(method_name: :send_config_command),

data/lib/redis_client/cluster/router.rb

@@ -39,16 +39,9 @@ class RedisClient
 
       def send_command(method, command, *args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         action = @dedicated_actions[command.first]
-        if action.nil?
-          cmd_spec = @command.get_spec(command)
-          action = find_policy_action(cmd_spec)
-          return assign_node_and_send_command(method, command, args, cmd_spec: cmd_spec, &block) if action.nil?
-        end
-
-        return send(action.method_name, method, command, args, &block) if action.reply_transformer.nil?
+        return send_command_by_spec(method, command, args, &block) if action.nil?
 
-        reply = send(action.method_name, method, command, args)
-        action.reply_transformer.call(reply).then(&TSF.call(block))
+        send_command_by_action(action, method, command, args, &block)
       rescue ::RedisClient::CircuitBreaker::OpenCircuitError
         raise
       rescue ::RedisClient::Cluster::Node::ReloadNeeded
@@ -133,9 +126,9 @@ class RedisClient
         retry
       end
 
-      def scan(command, seed: nil) # rubocop:disable Metrics/AbcSize
-        command[1] = ZERO_CURSOR_FOR_SCAN if command.size == 1
-        input_cursor = Integer(command[1])
+      def scan(command, seed: nil, cursor_index: 1) # rubocop:disable Metrics/AbcSize
+        command[cursor_index] = ZERO_CURSOR_FOR_SCAN if command.size == cursor_index
+        input_cursor = Integer(command[cursor_index])
 
         client_index = input_cursor % 256
         raw_cursor = input_cursor >> 8
@@ -145,7 +138,7 @@ class RedisClient
         client = clients[client_index]
         return [ZERO_CURSOR_FOR_SCAN, []] unless client
 
-        command[1] = raw_cursor.to_s
+        command[cursor_index] = raw_cursor.to_s
 
         result_cursor, result_keys = client.call_v(command)
         result_cursor = Integer(result_cursor)
@@ -258,6 +251,22 @@ class RedisClient
 
       private
 
+      # Follows the command tips which the server reports, or the routing by the key.
+      def send_command_by_spec(method, command, args, &block)
+        cmd_spec = @command.get_spec(command)
+        action = find_policy_action(cmd_spec)
+        return assign_node_and_send_command(method, command, args, cmd_spec: cmd_spec, &block) if action.nil?
+
+        send_command_by_action(action, method, command, args, &block)
+      end
+
+      def send_command_by_action(action, method, command, args, &block)
+        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))
+      end
+
       def find_policy_action(cmd_spec)
         return if cmd_spec.nil?
 
@@ -327,6 +336,15 @@ class RedisClient
         end
       end
 
+      def send_bless_command(method, command, args, &block)
+        if command[1].casecmp('scan').zero?
+          scan(command, seed: 1, cursor_index: 2).then(&TSF.call(block))
+        else
+          # The other subcommands keep the default routing with the redirection handling.
+          send_command_by_spec(method, command, args, &block)
+        end
+      end
+
       def send_memory_command(method, command, args, &block)
         if command[1].casecmp('stats').zero?
           @node.call_all(method, command, args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.3
 platform: ruby
 authors:
 - Taishi Kasuga
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Redis cluster-aware client for Ruby
 test_files: []