redis-cluster-client 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24c43fc85a464dd886dfd38358b05fbd281247e8ab2b5420aa262003419c4d3
-  data.tar.gz: d0080c21c84bf7827bd352aac12a31fb84ba14b57e293f8275ccbb6efa96b326
+  metadata.gz: 62e1530467814b16db0fe9ddb99097a561a606d79558d199ea2c313638d1e19f
+  data.tar.gz: d45ab68ff666bfd2926e46ec69558cf31624525139dda7b706816461a74618a3
 SHA512:
-  metadata.gz: 2b23b9967900f0ea14db0c4c2049389db73ed083304ad13641e55268a0278028fc4e231d495d65d0658125116bfd31dd47cd07394d487d7a83b0a97262d30c30
-  data.tar.gz: 55df5f327713a8d8597dcdd63e7803b40e99610e51792f1628aa4bc2ccc6f1e0da95579a246232b328c09061d51cd448dc4a7e9f8abf97d2f06b85e7a659fe88
+  metadata.gz: bc22746886b90abceb446c90feab84c2c44e6ea7e7c3ff4a49c7d82192de4b9adbe0a7f17d299a2aaa2ca8e6a0c7b24b32ca4108be86d2ec2b3f2624f1922bc0
+  data.tar.gz: 94eec624fe7ddc302acdcc21b15923504f6ef38181d6173b77f57b4d2b1b00cafe6b341c77d444251fc557d7c0901d4a7248141ac571747c028ed59f2cb4a1fa

data/lib/redis_client/cluster/node.rb

@@ -17,6 +17,7 @@ class RedisClient
       MIN_SLOT = 0
       MAX_SLOT = SLOT_SIZE - 1
       MAX_STARTUP_SAMPLE = Integer(ENV.fetch('REDIS_CLIENT_MAX_STARTUP_SAMPLE', 3))
+      USE_CHAR_ARRAY_SLOT = Integer(ENV.fetch('REDIS_CLIENT_USE_CHAR_ARRAY_SLOT', 1)) == 1 # less memory consumption, but slow
       IGNORE_GENERIC_CONFIG_KEYS = %i[url host port path].freeze
       DEAD_FLAGS = %w[fail? fail handshake noaddr noflags].freeze
       ROLE_FLAGS = %w[master slave].freeze
@@ -310,7 +311,7 @@ class RedisClient
       end
 
       def make_array_for_slot_node_mappings(node_info_list)
-        return Array.new(SLOT_SIZE) if node_info_list.count(&:primary?) > 256
+        return Array.new(SLOT_SIZE) if !USE_CHAR_ARRAY_SLOT || node_info_list.count(&:primary?) > 256
 
         primary_node_keys = node_info_list.select(&:primary?).map(&:node_key)
         ::RedisClient::Cluster::Node::CharArray.new(SLOT_SIZE, primary_node_keys)

data/lib/redis_client/cluster/pub_sub.rb

@@ -52,10 +52,12 @@ class RedisClient
 
       def call(*args, **kwargs)
         _call(@command_builder.generate(args, kwargs))
+        nil
       end
 
       def call_v(command)
         _call(@command_builder.generate(command))
+        nil
       end
 
       def close
@@ -86,10 +88,31 @@ class RedisClient
       private
 
       def _call(command)
+        case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_command(command)
+        when 'subscribe', 'psubscribe', 'ssubscribe' then call_to_single_state(command)
+        when 'unsubscribe', 'punsubscribe' then call_to_all_states(command)
+        when 'sunsubscribe' then call_for_sharded_states(command)
+        else call_to_single_state(command)
+        end
+      end
+
+      def call_to_single_state(command)
         node_key = @router.find_node_key(command)
         try_call(node_key, command)
       end
 
+      def call_to_all_states(command)
+        @state_dict.each_value { |s| s.call_v(command) }
+      end
+
+      def call_for_sharded_states(command)
+        if command.size == 1
+          call_to_all_states(command)
+        else
+          call_to_single_state(command)
+        end
+      end
+
       def try_call(node_key, command, retry_count: 1)
         add_state(node_key).call(command)
       rescue ::RedisClient::CommandError => e

data/lib/redis_client/cluster/router.rb

@@ -288,11 +288,18 @@ class RedisClient
 
       def send_pubsub_command(method, command, args, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         case ::RedisClient::Cluster::NormalizedCmdName.instance.get_by_subcommand(command)
-        when 'channels' then @node.call_all(method, command, args).flatten.uniq.sort_by(&:to_s).then(&TSF.call(block))
+        when 'channels'
+          @node.call_all(method, command, args).flatten.uniq.sort_by(&:to_s).then(&TSF.call(block))
+        when 'shardchannels'
+          @node.call_replicas(method, command, args).flatten.uniq.sort_by(&:to_s).then(&TSF.call(block))
+        when 'numpat'
+          @node.call_all(method, command, args).select { |e| e.is_a?(Integer) }.sum.then(&TSF.call(block))
         when 'numsub'
           @node.call_all(method, command, args).reject(&:empty?).map { |e| Hash[*e] }
                .reduce({}) { |a, e| a.merge(e) { |_, v1, v2| v1 + v2 } }.then(&TSF.call(block))
-        when 'numpat' then @node.call_all(method, command, args).select { |e| e.is_a?(Integer) }.sum.then(&TSF.call(block))
+        when 'shardnumsub'
+          @node.call_replicas(method, command, args).reject(&:empty?).map { |e| Hash[*e] }
+               .reduce({}) { |a, e| a.merge(e) { |_, v1, v2| v1 + v2 } }.then(&TSF.call(block))
         else assign_node(command).public_send(method, *args, command, &block)
         end
       end

data/lib/redis_client/cluster/transaction.rb

@@ -33,11 +33,12 @@ class RedisClient
         ensure_node_key(command)
       end
 
-      def find_node
+      def execute(watch: nil, &block)
         yield self
         raise ArgumentError, 'empty transaction' if @node_key.nil?
 
-        @router.find_node(@node_key)
+        node = @router.find_node(@node_key)
+        @router.try_delegate(node, :multi, watch: watch, &block)
       end
 
       private

data/lib/redis_client/cluster.rb

@@ -90,10 +90,7 @@ class RedisClient
     end
 
     def multi(watch: nil, &block)
-      ::RedisClient::Cluster::Transaction
-        .new(@router, @command_builder)
-        .find_node(&block)
-        .multi(watch: watch, &block)
+      ::RedisClient::Cluster::Transaction.new(@router, @command_builder).execute(watch: watch, &block)
     end
 
     def pubsub

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client