redis-cluster-client 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c3e9a3b764d9e5fc52670d17c175ee9ccda2dcd56b4a977b0e9a1e0b71d972
-  data.tar.gz: 191e1fe163f6f2fd111e4b2f69638aa28462d74e002f1ff0a11fc0f52cc740cd
+  metadata.gz: 2aec24d7a41cc222cf5fdec13b063d0ce2a68df59c05049a4719f71b6ac07391
+  data.tar.gz: 00b0eebd7da92305fbf2512f660721ad0976cfb1e33fb72037a673fe65899ce1
 SHA512:
-  metadata.gz: a42c6a871302686e33026ed570575d5b51637b707501609fdf9e574a5a976e06af388bc69bebd5bb22a58a30741c4b3e43d883d154782675446ce88c49ac2b37
-  data.tar.gz: e2ae0a6dd3af75407cc4d795492afff75e5bc7c01fee84be2ef0761e67dda0d9f93cc103b99219bd1b5e8df9dc3ff1dc86b3406c3a23dc1d011b649c363ab163
+  metadata.gz: 28d31d104bd1f2100c0f61c765783e86fea745910c748510bdc7b4985f779df4e8d8240a38afc043504cc36ad33a00273288762defcdcd03e7486cece5351882
+  data.tar.gz: 82a6c2b2e786f27183cc000ca202e4d6bf29b6260dc00a2659eb18660e6e4b3d60946d170606938242dc9340b4ae644aaa15de7369c23e2f9cda0c2bab604fe8

data/lib/redis_client/cluster/router.rb

@@ -23,7 +23,7 @@ class RedisClient
         @mutex = Mutex.new
       end
 
-      def send_command(method, *args, **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, Metrics/PerceivedComplexity
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
 
         cmd = command.first.to_s.downcase
@@ -34,10 +34,10 @@ class RedisClient
           @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 'keys'     then @node.call_replicas(method, *args, **kwargs, &block).flatten.sort_by(&:to_s)
+        when 'dbsize'   then @node.call_replicas(method, *args, **kwargs, &block).select { |e| e.is_a?(Integer) }.sum
         when 'scan'     then scan(*command, **kwargs)
-        when 'lastsave' then @node.call_all(method, *args, **kwargs, &block).sort
+        when 'lastsave' then @node.call_all(method, *args, **kwargs, &block).sort_by(&:to_i)
         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)
@@ -56,6 +56,11 @@ class RedisClient
       rescue ::RedisClient::Cluster::Node::ReloadNeeded
         update_cluster_info!
         raise ::RedisClient::Cluster::NodeMightBeDown
+      rescue ::RedisClient::Cluster::ErrorCollection => e
+        update_cluster_info! if e.errors.values.any? do |err|
+          err.message.start_with?('CLUSTERDOWN Hash slot not served')
+        end
+        raise
       end
 
       # @see https://redis.io/topics/cluster-spec#redirection-and-resharding
@@ -74,6 +79,10 @@ class RedisClient
           node.call('ASKING')
           retry_count -= 1
           retry
+        elsif e.message.start_with?('CLUSTERDOWN Hash slot not served')
+          update_cluster_info!
+          retry_count -= 1
+          retry
         else
           raise
         end
@@ -212,11 +221,11 @@ class RedisClient
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
 
         case command[1].to_s.downcase
-        when 'channels' then @node.call_all(method, *args, **kwargs, &block).flatten.uniq.sort
+        when 'channels' then @node.call_all(method, *args, **kwargs, &block).flatten.uniq.sort_by(&:to_s)
         when 'numsub'
           @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, *args, **kwargs, &block).sum
+        when 'numpat' then @node.call_all(method, *args, **kwargs, &block).select { |e| e.is_a?(Integer) }.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.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client