redis-cluster-client 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13300ba8c7f294d3e4c86932d13775ad22060c172900c01d521b1ed8c2278d6
-  data.tar.gz: d5b457978bb312a718ba57b48b56fac1ceb07a463889835c8190794007ecbf7d
+  metadata.gz: 032431ff16773725b9cb68482bc5df78affdf23e66b6bbd91b6ddbabdd9da921
+  data.tar.gz: dc789f59f6509e35ab23df03a70867b5e8414ee3bb327462fbcd5d63be4c6744
 SHA512:
-  metadata.gz: 37fb06428eed5a9cca5b42d27c034f057dd7d6f0c5d0c17e4b42c60a8fa3711127c5ed81f06e0565331f64aa762ccc30ee6674fb541e56a8b322ee50ab7a75ce
-  data.tar.gz: 06d46f93c8c7b7116378d2ef9e4380ccce3aac74c071b709cbacd677ec0b302302b52160c04b2c3523771f69446b96d84e8b4f729765073386c5e5f1f3f27f5b
+  metadata.gz: 6013ff65d8dc06b776b7b201244d75eaf62993368f5285d823472f78bec2c81639734f23c32793bc1b8d1981905e5794e35e4e353696d70f1d66930434e6104f
+  data.tar.gz: 0e1dc5f17a9706c2fc64bdd03e74ee457f9b9aea81740cdeb5459bd9bbc769b6353047b64ef008b6d34b950fbc7cb8cf57e66c9deb41d33edbacaba78ca2a12e

data/lib/redis_client/cluster/node.rb

@@ -129,9 +129,9 @@ class RedisClient
         @clients.fetch(node_key)
       end
 
-      def call_all(method, *command, **kwargs, &block)
+      def call_all(method, *args, **kwargs, &block)
         results, errors = try_map do |_, client|
-          client.send(method, *command, **kwargs, &block)
+          client.send(method, *args, **kwargs, &block)
         end
 
         return results.values if errors.empty?
@@ -139,11 +139,11 @@ class RedisClient
         raise ::RedisClient::Cluster::ErrorCollection, errors
       end
 
-      def call_primaries(method, *command, **kwargs, &block)
+      def call_primaries(method, *args, **kwargs, &block)
         results, errors = try_map do |node_key, client|
           next if replica?(node_key)
 
-          client.send(method, *command, **kwargs, &block)
+          client.send(method, *args, **kwargs, &block)
         end
 
         return results.values if errors.empty?
@@ -151,14 +151,14 @@ class RedisClient
         raise ::RedisClient::Cluster::ErrorCollection, errors
       end
 
-      def call_replicas(method, *command, **kwargs, &block)
-        return call_primaries(method, *command, **kwargs, &block) if replica_disabled?
+      def call_replicas(method, *args, **kwargs, &block)
+        return call_primaries(method, *args, **kwargs, &block) if replica_disabled?
 
         replica_node_keys = @replications.values.map(&:sample)
         results, errors = try_map do |node_key, client|
           next if primary?(node_key) || !replica_node_keys.include?(node_key)
 
-          client.send(method, *command, **kwargs, &block)
+          client.send(method, *args, **kwargs, &block)
         end
 
         return results.values if errors.empty?
@@ -166,9 +166,9 @@ class RedisClient
         raise ::RedisClient::Cluster::ErrorCollection, errors
       end
 
-      def send_ping(method, *command, **kwargs, &block)
+      def send_ping(method, *args, **kwargs, &block)
         results, errors = try_map do |_, client|
-          client.send(method, *command, **kwargs, &block)
+          client.send(method, *args, **kwargs, &block)
         end
 
         return results.values if errors.empty?

data/lib/redis_client/cluster.rb

@@ -127,8 +127,7 @@ class RedisClient
     end
 
     def blocking_call(timeout, *command, **kwargs)
-      node = assign_node(*command)
-      try_send(node, :blocking_call, timeout, *command, **kwargs)
+      send_command(:blocking_call, timeout, *command, **kwargs)
     end
 
     def scan(*args, **kwargs, &block)
@@ -186,41 +185,43 @@ class RedisClient
                                        node_info: node_info, pool: pool, with_replica: config.use_replica?, **kwargs)
     end
 
-    def send_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+    def send_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      command = method == :blocking_call && args.size > 1 ? args[1..] : args
+
       cmd = command.first.to_s.downcase
       case cmd
       when 'acl', 'auth', 'bgrewriteaof', 'bgsave', 'quit', 'save'
-        @node.call_all(method, *command, **kwargs, &block).first
+        @node.call_all(method, *args, **kwargs, &block).first
       when 'flushall', 'flushdb'
-        @node.call_primaries(method, *command, **kwargs, &block).first
-      when 'ping'     then @node.send_ping(method, *command, **kwargs, &block).first
-      when 'wait'     then send_wait_command(method, *command, **kwargs, &block)
-      when 'keys'     then @node.call_replicas(method, *command, **kwargs, &block).flatten.sort
-      when 'dbsize'   then @node.call_replicas(method, *command, **kwargs, &block).sum
+        @node.call_primaries(method, *args, **kwargs, &block).first
+      when 'ping'     then @node.send_ping(method, *args, **kwargs, &block).first
+      when 'wait'     then send_wait_command(method, *args, **kwargs, &block)
+      when 'keys'     then @node.call_replicas(method, *args, **kwargs, &block).flatten.sort
+      when 'dbsize'   then @node.call_replicas(method, *args, **kwargs, &block).sum
       when 'scan'     then _scan(*command, **kwargs)
-      when 'lastsave' then @node.call_all(method, *command, **kwargs, &block).sort
-      when 'role'     then @node.call_all(method, *command, **kwargs, &block)
-      when 'config'   then send_config_command(method, *command, **kwargs, &block)
-      when 'client'   then send_client_command(method, *command, **kwargs, &block)
-      when 'cluster'  then send_cluster_command(method, *command, **kwargs, &block)
+      when 'lastsave' then @node.call_all(method, *args, **kwargs, &block).sort
+      when 'role'     then @node.call_all(method, *args, **kwargs, &block)
+      when 'config'   then send_config_command(method, *args, **kwargs, &block)
+      when 'client'   then send_client_command(method, *args, **kwargs, &block)
+      when 'cluster'  then send_cluster_command(method, *args, **kwargs, &block)
       when 'readonly', 'readwrite', 'shutdown'
         raise ::RedisClient::Cluster::OrchestrationCommandNotSupported, cmd
-      when 'memory'   then send_memory_command(method, *command, **kwargs, &block)
-      when 'script'   then send_script_command(method, *command, **kwargs, &block)
-      when 'pubsub'   then send_pubsub_command(method, *command, **kwargs, &block)
+      when 'memory'   then send_memory_command(method, *args, **kwargs, &block)
+      when 'script'   then send_script_command(method, *args, **kwargs, &block)
+      when 'pubsub'   then send_pubsub_command(method, *args, **kwargs, &block)
       when 'discard', 'exec', 'multi', 'unwatch'
         raise ::RedisClient::Cluster::AmbiguousNodeError, cmd
       else
         node = assign_node(*command)
-        try_send(node, method, *command, **kwargs, &block)
+        try_send(node, method, *args, **kwargs, &block)
       end
     rescue RedisClient::Cluster::Node::ReloadNeeded
       update_cluster_info!
       raise ::RedisClient::Cluster::NodeMightBeDown
     end
 
-    def send_wait_command(method, *command, retry_count: 3, **kwargs, &block)
-      @node.call_primaries(method, *command, **kwargs, &block).sum
+    def send_wait_command(method, *args, retry_count: 3, **kwargs, &block)
+      @node.call_primaries(method, *args, **kwargs, &block).sum
     rescue RedisClient::Cluster::ErrorCollection => e
       raise if retry_count <= 0
       raise if e.errors.values.none? do |err|
@@ -232,64 +233,76 @@ class RedisClient
       retry
     end
 
-    def send_config_command(method, *command, **kwargs, &block)
+    def send_config_command(method, *args, **kwargs, &block)
+      command = method == :blocking_call && args.size > 1 ? args[1..] : args
+
       case command[1].to_s.downcase
       when 'resetstat', 'rewrite', 'set'
-        @node.call_all(method, *command, **kwargs, &block).first
-      else assign_node(*command).send(method, *command, **kwargs, &block)
+        @node.call_all(method, *args, **kwargs, &block).first
+      else assign_node(*command).send(method, *args, **kwargs, &block)
       end
     end
 
-    def send_memory_command(method, *command, **kwargs, &block)
+    def send_memory_command(method, *args, **kwargs, &block)
+      command = method == :blocking_call && args.size > 1 ? args[1..] : args
+
       case command[1].to_s.downcase
-      when 'stats' then @node.call_all(method, *command, **kwargs, &block)
-      when 'purge' then @node.call_all(method, *command, **kwargs, &block).first
-      else assign_node(*command).send(method, *command, **kwargs, &block)
+      when 'stats' then @node.call_all(method, *args, **kwargs, &block)
+      when 'purge' then @node.call_all(method, *args, **kwargs, &block).first
+      else assign_node(*command).send(method, *args, **kwargs, &block)
       end
     end
 
-    def send_client_command(method, *command, **kwargs, &block)
+    def send_client_command(method, *args, **kwargs, &block)
+      command = method == :blocking_call && args.size > 1 ? args[1..] : args
+
       case command[1].to_s.downcase
-      when 'list' then @node.call_all(method, *command, **kwargs, &block).flatten
+      when 'list' then @node.call_all(method, *args, **kwargs, &block).flatten
       when 'pause', 'reply', 'setname'
-        @node.call_all(method, *command, **kwargs, &block).first
-      else assign_node(*command).send(method, *command, **kwargs, &block)
+        @node.call_all(method, *args, **kwargs, &block).first
+      else assign_node(*command).send(method, *args, **kwargs, &block)
       end
     end
 
-    def send_cluster_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/MethodLength
+    def send_cluster_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      command = method == :blocking_call && args.size > 1 ? args[1..] : args
       subcommand = command[1].to_s.downcase
+
       case subcommand
       when 'addslots', 'delslots', 'failover', 'forget', 'meet', 'replicate',
            'reset', 'set-config-epoch', 'setslot'
         raise ::RedisClient::Cluster::OrchestrationCommandNotSupported, ['cluster', subcommand]
-      when 'saveconfig' then @node.call_all(method, *command, **kwargs, &block).first
+      when 'saveconfig' then @node.call_all(method, *args, **kwargs, &block).first
       when 'getkeysinslot'
         raise ArgumentError, command.join(' ') if command.size != 4
 
-        find_node(@node.find_node_key_of_replica(command[2])).send(method, *command, **kwargs, &block)
-      else assign_node(*command).send(method, *command, **kwargs, &block)
+        find_node(@node.find_node_key_of_replica(command[2])).send(method, *args, **kwargs, &block)
+      else assign_node(*command).send(method, *args, **kwargs, &block)
       end
     end
 
-    def send_script_command(method, *command, **kwargs, &block)
+    def send_script_command(method, *args, **kwargs, &block)
+      command = method == :blocking_call && args.size > 1 ? args[1..] : args
+
       case command[1].to_s.downcase
       when 'debug', 'kill'
-        @node.call_all(method, *command, **kwargs, &block).first
+        @node.call_all(method, *args, **kwargs, &block).first
       when 'flush', 'load'
-        @node.call_primaries(method, *command, **kwargs, &block).first
-      else assign_node(*command).send(method, *command, **kwargs, &block)
+        @node.call_primaries(method, *args, **kwargs, &block).first
+      else assign_node(*command).send(method, *args, **kwargs, &block)
       end
     end
 
-    def send_pubsub_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def send_pubsub_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      command = method == :blocking_call && args.size > 1 ? args[1..] : args
+
       case command[1].to_s.downcase
-      when 'channels' then @node.call_all(method, *command, **kwargs, &block).flatten.uniq.sort
+      when 'channels' then @node.call_all(method, *args, **kwargs, &block).flatten.uniq.sort
       when 'numsub'
-        @node.call_all(method, *command, **kwargs, &block).reject(&:empty?).map { |e| Hash[*e] }
+        @node.call_all(method, *args, **kwargs, &block).reject(&:empty?).map { |e| Hash[*e] }
              .reduce({}) { |a, e| a.merge(e) { |_, v1, v2| v1 + v2 } }
-      when 'numpat' then @node.call_all(method, *command, **kwargs, &block).sum
-      else assign_node(*command).send(method, *command, **kwargs, &block)
+      when 'numpat' then @node.call_all(method, *args, **kwargs, &block).sum
+      else assign_node(*command).send(method, *args, **kwargs, &block)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client