redis-cluster-client 0.16.4 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b5e1d6525a06ecf8747239269b110528bf9efc99ff3424108033c85cdc011a
-  data.tar.gz: 35b5aba54bc61e3731509c7ba3959289ddcfb30e40193f365fc26f62f4c7e60d
+  metadata.gz: ee5d5f4c7bb89d0899ef2c3aec48503580d01a1e84a369f1e9ee0c1f60011f15
+  data.tar.gz: b17966f3f4c74ce89005b49188d769c4e8b6e399d6d65e0c4d68e14868cee9c7
 SHA512:
-  metadata.gz: ab546dc6dc75d1ec1733c5cd5f29a451881d71db8c21e587be92ab77c2f12f602100468626b742a1d87caa98aa27699906f9aefd7d9cff02512c3be1e355bdd4
-  data.tar.gz: 741326d16416834940e08c7084019080188d3e6b252c6dafdf3037bb9a40e2f9aafc0dc771fce7ac4edbb50af6d630067fb3646f4e7f1016ab72d7ceafb04940
+  metadata.gz: 580dbda062e93296be5869169a3f8f4d389f7bc7aba34cb473cc1a1877cd8a552a29617bf6e09cc2bea8e372cbf895f28ffd086bf75ce986a2dd448bd7170dae
+  data.tar.gz: d3abefad63034a97613319637fe617b66f64b2053f67ed8c6de7d81350976645c0eec250037fd100b0a4d5e518c3674c96e07fb043c56ffd327a8e918626405d

data/lib/redis_client/cluster/command.rb

@@ -109,7 +109,7 @@ class RedisClient
               key_step: row[5],
               write?: writable,
               readonly?: row[2].include?('readonly')
-            )
+            ).freeze
           end.freeze || EMPTY_HASH
         end
       end

data/lib/redis_client/cluster/node.rb

@@ -53,15 +53,10 @@ class RedisClient
       end
 
       class CharArray
-        BASE = ''
-        PADDING = '0'
-
-        private_constant :BASE, :PADDING
-
         def initialize(size, elements)
           @elements = elements
-          @string = String.new(BASE, encoding: Encoding::BINARY, capacity: size)
-          size.times { @string << PADDING }
+          @string = String.new('', encoding: Encoding::BINARY, capacity: size)
+          size.times { @string << 0xff }
         end
 
         def [](index)
@@ -314,7 +309,6 @@ class RedisClient
             e
           ensure
             client.read_timeout = regular_timeout
-            client&.close
           end
         end
 
@@ -378,7 +372,7 @@ class RedisClient
             config_epoch: fields[6],
             link_state: fields[7],
             slots: slots
-          )
+          ).freeze
         end
       end
 
@@ -398,7 +392,7 @@ class RedisClient
               role: role,
               primary_id: role == 'master' ? EMPTY_STRING : primary_id,
               slots: role == 'master' ? slots : EMPTY_ARRAY
-            )
+            ).freeze
           end
         end
       end
@@ -422,7 +416,7 @@ class RedisClient
               role: role == 'master' ? role : 'slave',
               primary_id: role == 'master' ? EMPTY_STRING : primary_id,
               slots: role == 'master' ? shard.fetch('slots').each_slice(2).to_a.freeze : EMPTY_ARRAY
-            )
+            ).freeze
           end
         end
       end

data/lib/redis_client/cluster/optimistic_locking.rb

@@ -2,6 +2,7 @@
 
 require 'redis_client'
 require 'redis_client/cluster/transaction'
+require 'redis_client/cluster/error_identification'
 
 class RedisClient
   class Cluster
@@ -54,7 +55,7 @@ class RedisClient
       rescue ::RedisClient::ConnectionError
         # Deduct the number of retries that happened _inside_ router#handle_redirection from our remaining
         # _external_ retries. Always deduct at least one in case handle_redirection raises without trying the block.
-        retry_count -= times_block_executed == 0 ? 1 : [times_block_executed, 1].min
+        retry_count -= times_block_executed > 1 ? times_block_executed : 1
         raise if retry_count < 0
 
         retry

data/lib/redis_client/cluster/pipeline.rb

@@ -23,10 +23,6 @@ class RedisClient
           @outer_indices << index
         end
 
-        def get_inner_index(outer_index)
-          @outer_indices&.find_index(outer_index)
-        end
-
         def get_callee_method(inner_index)
           if @timeouts.is_a?(Array) && !@timeouts[inner_index].nil?
             :blocking_call_v
@@ -66,6 +62,7 @@ class RedisClient
             if result.is_a?(::RedisClient::Error)
               result._set_command(commands[index])
               result._set_config(config)
+              result._set_retry_attempt(@retry_attempt)
 
               if result.is_a?(::RedisClient::CommandError) && result.message.start_with?('MOVED', 'ASK')
                 redirection_indices ||= []

data/lib/redis_client/cluster/pub_sub.rb

@@ -61,17 +61,7 @@ class RedisClient
       end
 
       BUF_SIZE = Integer(ENV.fetch('REDIS_CLIENT_PUBSUB_BUF_SIZE', 1024))
-      RECOVERY_BASE_INTERVAL = Float(ENV.fetch('REDIS_CLIENT_PUBSUB_RECOVERY_INTERVAL_SEC', 1.0))
-      RECOVERY_MAX_INTERVAL = Float(ENV.fetch('REDIS_CLIENT_PUBSUB_RECOVERY_MAX_INTERVAL_SEC', 30.0))
-      RECOVERY_MAX_ATTEMPTS = Integer(ENV.fetch('REDIS_CLIENT_PUBSUB_RECOVERY_MAX_ATTEMPTS', 10))
-      SUBSCRIBE_COMMANDS = %w[subscribe psubscribe ssubscribe].freeze
-      UNSUBSCRIBE_TO_SUBSCRIBE = {
-        'unsubscribe' => 'subscribe',
-        'punsubscribe' => 'psubscribe',
-        'sunsubscribe' => 'ssubscribe'
-      }.freeze
-      private_constant :BUF_SIZE, :RECOVERY_BASE_INTERVAL, :RECOVERY_MAX_INTERVAL, :RECOVERY_MAX_ATTEMPTS,
-                       :SUBSCRIBE_COMMANDS, :UNSUBSCRIBE_TO_SUBSCRIBE
+      private_constant :BUF_SIZE
 
       def initialize(router, command_builder)
         @router = router
@@ -84,14 +74,14 @@ class RedisClient
       def call(*args, **kwargs)
         command = @command_builder.generate(args, kwargs)
         _call(command)
-        remember(command)
+        remember_subscription(command)
         nil
       end
 
       def call_v(command)
         command = @command_builder.generate(command)
         _call(command)
-        remember(command)
+        remember_subscription(command)
         nil
       end
 
@@ -128,35 +118,6 @@ class RedisClient
 
       private
 
-      def remember(command)
-        cmd = command.first.to_s.downcase
-        if SUBSCRIBE_COMMANDS.include?(cmd)
-          @commands << command
-        elsif (subscribe_cmd = UNSUBSCRIBE_TO_SUBSCRIBE[cmd])
-          forget_subscriptions(subscribe_cmd, command[1..])
-        else
-          @commands << command
-        end
-      end
-
-      def forget_subscriptions(subscribe_cmd, channels)
-        if channels.nil? || channels.empty?
-          @commands.reject! { |c| c.first.to_s.casecmp(subscribe_cmd).zero? }
-        else
-          @commands.reject! { |c| prune_entry(c, subscribe_cmd, channels) }
-        end
-      end
-
-      def prune_entry(entry, subscribe_cmd, channels)
-        return false unless entry.first.to_s.casecmp(subscribe_cmd).zero?
-
-        remaining = entry[1..] - channels
-        return true if remaining.empty?
-
-        entry.replace([entry.first, *remaining])
-        false
-      end
-
       def _call(command) # rubocop:disable Metrics/AbcSize
         if command.first.casecmp('subscribe').zero?
           call_to_single_state(command)
@@ -227,14 +188,44 @@ class RedisClient
           break
         rescue ::RedisClient::ConnectionError, ::RedisClient::Cluster::NodeMightBeDown
           attempt += 1
-          raise if attempt >= RECOVERY_MAX_ATTEMPTS
+          raise if attempt >= 10
 
           sleep recovery_interval(attempt)
         end
       end
 
       def recovery_interval(attempt)
-        [RECOVERY_BASE_INTERVAL * (2**(attempt - 1)), RECOVERY_MAX_INTERVAL].min
+        [1.0 * (2**(attempt - 1)), 30.0].min
+      end
+
+      def remember_subscription(command) # rubocop:disable Metrics/AbcSize
+        if command.first.casecmp('subscribe').zero?
+          @commands << command
+        elsif command.first.casecmp('psubscribe').zero?
+          @commands << command
+        elsif command.first.casecmp('ssubscribe').zero?
+          @commands << command
+        elsif command.first.casecmp('unsubscribe').zero?
+          forget_subscriptions('subscribe', command[1, command.size])
+        elsif command.first.casecmp('punsubscribe').zero?
+          forget_subscriptions('psubscribe', command[1, command.size])
+        elsif command.first.casecmp('sunsubscribe').zero?
+          forget_subscriptions('ssubscribe', command[1, command.size])
+        end
+      end
+
+      def forget_subscriptions(subscribe_cmd, channels)
+        @commands.map! do |command|
+          next command unless command.first.casecmp(subscribe_cmd).zero?
+          next if channels.nil? || channels.empty?
+
+          remaining = command[1, command.size] - channels
+          next if remaining.empty?
+
+          [command.first, *remaining]
+        end
+
+        @commands.compact!
       end
     end
   end

data/lib/redis_client/cluster/router.rb

@@ -167,19 +167,20 @@ class RedisClient
         raise unless ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(e, node)
 
         renew_cluster_state
-        retry_count -= 1
+        raise if command.nil? || command.empty?
 
-        if retry_count >= 0
-          # Find the node to use for this command - if this fails for some reason, though, re-use
-          # the old node.
-          begin
-            node = find_node(find_node_key(command)) if command
-          rescue StandardError # rubocop:disable Lint/SuppressedException
-          end
-          retry
+        retry_count -= 1
+        raise if retry_count < 0
+
+        # Find the node to use for this command - if this fails for some reason, though, re-use
+        # the old node.
+        begin
+          node = find_node(find_node_key(command))
+        rescue StandardError
+          raise e
         end
 
-        raise
+        retry
       end
 
       def scan(command, seed: nil) # rubocop:disable Metrics/AbcSize
@@ -227,7 +228,7 @@ class RedisClient
       def find_node_key_by_key(key, seed: nil, primary: false)
         if key && !key.empty?
           slot = ::RedisClient::Cluster::KeySlotConverter.convert(key)
-          node_key = primary ? @node.find_node_key_of_primary(slot) : @node.find_node_key_of_replica(slot)
+          node_key = primary ? @node.find_node_key_of_primary(slot) : @node.find_node_key_of_replica(slot, seed: seed)
           if node_key.nil?
             renew_cluster_state
             raise ::RedisClient::Cluster::NodeMightBeDown.new.with_config(@config)

data/lib/redis_client/cluster/transaction.rb

@@ -171,7 +171,7 @@ class RedisClient
           send_transaction(node, redirect: redirect - 1)
         elsif err.message.start_with?('ASK')
           node = @router.assign_asking_node(err.message)
-          try_asking(node) ? send_transaction(node, redirect: redirect - 1) : err
+          try_asking(node) ? send_transaction(node, redirect: redirect - 1) : raise(err)
         elsif err.message.start_with?('CLUSTERDOWN')
           @router.renew_cluster_state if @watching_slot.nil?
           raise err

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.16.5
 platform: ruby
 authors:
 - Taishi Kasuga
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Redis cluster-aware client for Ruby
 test_files: []