redis-cluster-client 0.17.2 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 359726530c2640f2ceb9c6c06322c4608fec64338c33d3b29f675b1e152c6700
-  data.tar.gz: ec32116a8cde689a6ea78cc029159174404288c63b452d797ff3646669b5141e
+  metadata.gz: d99c93a4972ec806a5152ec5f550c5bb6c6e40a42932359ca0093e03cd6f6404
+  data.tar.gz: 72b055252677077791916fa85bd3c12bc566c0acba36afcd218f8e4691efeaee
 SHA512:
-  metadata.gz: f4b810aa80374e5720533c82846ac0485682c6b8bcd5902c6a71a9b4d2c830914a3d97cfb8c378a402b3cd44cd5a96361067d461f177d8672b918a3b6911a38d
-  data.tar.gz: 4614bba3d265eeedf3ebe72fa75ab10ca2543a48aa0e622b530fa54ad1701af158a77819e4d0cd6aa7ce1f913df139169497caf084186eb6875a49e312b84d94
+  metadata.gz: 1e9d299dff3df85e3181d8a949e348985307d09d4ec2fa4d3de2795e11425ac2b988df0fecd1681af70974d6c315df3541d97aed53e449cc9839df252ce0a85d
+  data.tar.gz: 1f565bcc5c5e299b721309a1ba9273bc56016f4a62cf0a153cc4ecec4b7e355c4fc54488329537e1fe8733d09969ad34866d5998cfa6043667051dafc8d1884b

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
@@ -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?
 
@@ -331,7 +340,8 @@ class RedisClient
         if command[1].casecmp('scan').zero?
           scan(command, seed: 1, cursor_index: 2).then(&TSF.call(block))
         else
-          assign_node(command).public_send(method, *args, command, &block)
+          # The other subcommands keep the default routing with the redirection handling.
+          send_command_by_spec(method, command, args, &block)
         end
       end
 
@@ -341,7 +351,8 @@ class RedisClient
         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)
+          # The other subcommands keep the default routing with the redirection handling.
+          send_command_by_spec(method, command, args, &block)
         end
       end
 
@@ -350,12 +361,15 @@ class RedisClient
           @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))
+        elsif command[1].casecmp('unpause').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(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)
+          # The other subcommands keep the default routing with the command tips.
+          send_command_by_spec(method, command, args, &block)
         end
       end
 
@@ -366,8 +380,15 @@ class RedisClient
            command[1].casecmp('slots').zero? ||
            command[1].casecmp('shards').zero? ||
            command[1].casecmp('count-failure-reports').zero? ||
-           command[1].casecmp('slaves').zero?
+           command[1].casecmp('slaves').zero? ||
+           command[1].casecmp('replicas').zero? ||
+           command[1].casecmp('myid').zero? ||
+           command[1].casecmp('myshardid').zero? ||
+           command[1].casecmp('links').zero?
           assign_node(command).public_send(method, *args, command, &block)
+        elsif command[1].casecmp('slot-stats').zero?
+          # Each primary replies with the statistics of its own slots only.
+          @node.call_primaries(method, command, args).flatten(1).then(&TSF.call(block))
         elsif command[1].casecmp('saveconfig').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('countkeysinslot').zero? || command[1].casecmp('getkeysinslot').zero?
@@ -384,15 +405,18 @@ class RedisClient
         if command[1].casecmp('debug').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('kill').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
+          # The primaries without any running script reply with the NOTBUSY error.
+          @node.call_primaries_leniently(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))
+          # The redis 7.0 or later doesn't propagate the scripts to the replicas.
+          @node.call_all(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))
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
         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)
+          # The other subcommands keep the default routing with the redirection handling.
+          send_command_by_spec(method, command, args, &block)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.4
 platform: ruby
 authors:
 - Taishi Kasuga