redis-cluster-client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fde84481c2ca9680670f252a002391a34ae793148a21a8e02086d199412a53ab
-  data.tar.gz: 5af188432f9ae5e76c13d0dd174c25cde4b98d1de49efeb97e2a809bd111a9a6
+  metadata.gz: aff938c0517542c32f98206c28f1f605a52751e2e2e9a1bd10f5576285f568ee
+  data.tar.gz: 8a3d45fba93334959b1ee67504d2703bb116a8133ef8dac2aa8f314fdb74b268
 SHA512:
-  metadata.gz: f26dc7bb447ee70742efc90344758ad3058cd0d1506ad8576637b7e9ad296a806d7e15e3b824cead0fb2313140dea00f6f579a15803399c16257ac347c45085f
-  data.tar.gz: 06f43e223a53d9ada0803f7292bc1ca58505fb3c341fd7643eb6cf0eff73bebe4ecd2022b0a1b59af81dda879a9d8a9b078107181ff45037773382dada321597
+  metadata.gz: 63dec0155a50a0dbb7a17763c43291d371abe4e3df407340ba8edf125cf2c2bb338f607026a1d004dca489761cb2e6b5450e68a468f18799e5c3443b52a21be7
+  data.tar.gz: 4de6c4688ca120d7f4b636bd884195b3cddc3bf8d217ea662a1f382ced46de2c9e24b0e967a801d175f0572a083b9e5ea835d54797422cf60ce799cda3002f74

data/lib/redis_client/cluster/errors.rb

@@ -29,7 +29,7 @@ class RedisClient
     end
 
     # Raised when error occurs on any node of cluster.
-    class CommandErrorCollection < ::RedisClient::Error
+    class ErrorCollection < ::RedisClient::Error
       attr_reader :errors
 
       def initialize(errors)

data/lib/redis_client/cluster/node.rb

@@ -118,7 +118,7 @@ class RedisClient
         try_map { |_, client| client.send(method, *command, **kwargs, &block) }.values
       end
 
-      def call_primary(method, *command, **kwargs, &block)
+      def call_primaries(method, *command, **kwargs, &block)
         try_map do |node_key, client|
           next if replica?(node_key)
 
@@ -126,8 +126,8 @@ class RedisClient
         end.values
       end
 
-      def call_replica(method, *command, **kwargs, &block)
-        return call_primary(method, *command, **kwargs, &block) if replica_disabled?
+      def call_replicas(method, *command, **kwargs, &block)
+        return call_primaries(method, *command, **kwargs, &block) if replica_disabled?
 
         replica_node_keys = @replications.values.map(&:sample)
         try_map do |node_key, client|
@@ -228,14 +228,14 @@ class RedisClient
       end
 
       def try_map # rubocop:disable Metrics/MethodLength
-        errors = {}
         results = {}
+        errors = {}
         threads = @clients.map do |k, v|
           Thread.new(k, v) do |node_key, client|
             Thread.pass
             reply = yield(node_key, client)
             results[node_key] = reply unless reply.nil?
-          rescue ::RedisClient::CommandError => e
+          rescue StandardError => e
             errors[node_key] = e
           end
         end
@@ -243,7 +243,7 @@ class RedisClient
         threads.each(&:join)
         return results if errors.empty?
 
-        raise ::RedisClient::Cluster::CommandErrorCollection, errors
+        raise ::RedisClient::Cluster::ErrorCollection, errors
       end
     end
   end

data/lib/redis_client/cluster.rb

@@ -40,9 +40,10 @@ class RedisClient
         @size.zero?
       end
 
-      # TODO: https://github.com/redis-rb/redis-cluster-client/issues/37
-      def execute # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # TODO: https://github.com/redis-rb/redis-cluster-client/issues/37 handle redirections
+      def execute # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         all_replies = Array.new(@size)
+        errors = {}
         threads = @grouped.map do |k, v|
           Thread.new(@client, k, v) do |client, node_key, rows|
             Thread.pass
@@ -60,11 +61,15 @@ class RedisClient
             raise ReplySizeError, "commands: #{rows.size}, replies: #{replies.size}" if rows.size != replies.size
 
             rows.each_with_index { |row, idx| all_replies[row.first] = replies[idx] }
+          rescue StandardError => e
+            errors[node_key] = e
           end
         end
 
         threads.each(&:join)
-        all_replies
+        return all_replies if errors.empty?
+
+        raise ::RedisClient::Cluster::ErrorCollection, errors
       end
     end
 
@@ -185,10 +190,10 @@ class RedisClient
       when 'acl', 'auth', 'bgrewriteaof', 'bgsave', 'quit', 'save', 'ping'
         @node.call_all(method, *command, **kwargs, &block).first
       when 'flushall', 'flushdb'
-        @node.call_primary(method, *command, **kwargs, &block).first
+        @node.call_primaries(method, *command, **kwargs, &block).first
       when 'wait'     then send_wait_command(method, *command, **kwargs, &block)
-      when 'keys'     then @node.call_replica(method, *command, **kwargs, &block).flatten.sort
-      when 'dbsize'   then @node.call_replica(method, *command, **kwargs, &block).sum
+      when 'keys'     then @node.call_replicas(method, *command, **kwargs, &block).flatten.sort
+      when 'dbsize'   then @node.call_replicas(method, *command, **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)
@@ -206,14 +211,14 @@ class RedisClient
         node = assign_node(*command)
         try_send(node, method, *command, **kwargs, &block)
       end
-    rescue RedisClient::Cluster::CommandErrorCollection => e
+    rescue RedisClient::Cluster::ErrorCollection => e
       update_cluster_info! if e.errors.values.map(&:class).any?(::RedisClient::ConnectionError)
       raise
     end
 
     def send_wait_command(method, *command, retry_count: 3, **kwargs, &block)
-      @node.call_primary(method, *command, **kwargs, &block).sum
-    rescue RedisClient::Cluster::CommandErrorCollection => e
+      @node.call_primaries(method, *command, **kwargs, &block).sum
+    rescue RedisClient::Cluster::ErrorCollection => e
       raise if retry_count <= 0 || e.errors.values.map(&:message).grep(/ERR WAIT cannot be used with replica instances/).empty?
 
       update_cluster_info!
@@ -246,13 +251,17 @@ class RedisClient
       end
     end
 
-    def send_cluster_command(method, *command, **kwargs, &block)
+    def send_cluster_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/MethodLength
       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 '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)
       end
     end
@@ -262,7 +271,7 @@ class RedisClient
       when 'debug', 'kill'
         @node.call_all(method, *command, **kwargs, &block).first
       when 'flush', 'load'
-        @node.call_primary(method, *command, **kwargs, &block).first
+        @node.call_primaries(method, *command, **kwargs, &block).first
       else assign_node(*command).send(method, *command, **kwargs, &block)
       end
     end

metadata

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