redis-cluster-client 0.17.0 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df1ba6006c9d3c3e7c242e9406f6443a95aa371c7e77244b73565058f476435
-  data.tar.gz: 5613bf92dc543482c1bcb2e74d61096092c299ef84877b8c06da1174db82c6d4
+  metadata.gz: 359726530c2640f2ceb9c6c06322c4608fec64338c33d3b29f675b1e152c6700
+  data.tar.gz: ec32116a8cde689a6ea78cc029159174404288c63b452d797ff3646669b5141e
 SHA512:
-  metadata.gz: 58e9ecaa1aecf6bfb298cba78e08d349f742439a2f5a53e19cd55bb49c8a600b4e4f47a54af1798ef0afe51cb56cf5cf292eda3bdf75e522ed180fa065e37954
-  data.tar.gz: c158336f83f4453e27798a2521c4e282a867db446dfa7e74e988af9e568567235b321b59386bf79ac5d0e32dee0698137755e9c416ceeb3acb150ebfc60d5208
+  metadata.gz: f4b810aa80374e5720533c82846ac0485682c6b8bcd5902c6a71a9b4d2c830914a3d97cfb8c378a402b3cd44cd5a96361067d461f177d8672b918a3b6911a38d
+  data.tar.gz: 4614bba3d265eeedf3ebe72fa75ab10ca2543a48aa0e622b530fa54ad1701af158a77819e4d0cd6aa7ce1f913df139169497caf084186eb6875a49e312b84d94

data/lib/redis_client/cluster/pipeline.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'set'
 require 'redis_client'
 require 'redis_client/cluster/errors'
 require 'redis_client/cluster/noop_command_builder'
@@ -44,6 +45,19 @@ class RedisClient
         def get_block(inner_index)
           @blocks.is_a?(Array) ? @blocks[inner_index] : nil
         end
+
+        def coerce_except!(replies, indices)
+          return replies unless @blocks.is_a?(Array)
+
+          skipped = Set.new(indices)
+          @blocks.each_with_index do |block, index|
+            next if block.nil? || skipped.include?(index)
+
+            replies[index] = block.call(replies[index])
+          end
+
+          replies
+        end
       end
 
       ::RedisClient::ConnectionMixin.module_eval do
@@ -209,6 +223,7 @@ class RedisClient
 
           all_replies ||= Array.new(@size)
           pipeline = @pipelines[node_key]
+          pipeline.coerce_except!(v.replies, v.indices)
           v.indices.each { |i| v.replies[i] = handle_redirection(v.replies[i], pipeline, i) }
           pipeline.outer_indices.each_with_index { |outer, inner| all_replies[outer] = v.replies[inner] }
         end
@@ -217,7 +232,9 @@ class RedisClient
           raise v.first_exception if v.first_exception
 
           all_replies ||= Array.new(@size)
-          @pipelines[node_key].outer_indices.each_with_index { |outer, inner| all_replies[outer] = v.replies[inner] }
+          pipeline = @pipelines[node_key]
+          pipeline._coerce!(v.replies)
+          pipeline.outer_indices.each_with_index { |outer, inner| all_replies[outer] = v.replies[inner] }
         end
 
         all_replies

data/lib/redis_client/cluster/router/routing_table.rb

@@ -33,6 +33,7 @@ class RedisClient
             'keys' => RoutingAction.new(method_name: :send_command_to_replicas, reply_transformer: FLATTEN_STRINGS),
             'dbsize' => RoutingAction.new(method_name: :send_command_to_replicas, reply_transformer: SUM_NUM),
             'scan' => RoutingAction.new(method_name: :send_scan_command),
+            'bless' => RoutingAction.new(method_name: :send_bless_command),
             'lastsave' => RoutingAction.new(method_name: :send_command_to_all_nodes, reply_transformer: SORT_NUMBERS),
             'role' => RoutingAction.new(method_name: :send_command_to_all_nodes),
             'config' => RoutingAction.new(method_name: :send_config_command),

data/lib/redis_client/cluster/router.rb

@@ -133,9 +133,9 @@ class RedisClient
         retry
       end
 
-      def scan(command, seed: nil) # rubocop:disable Metrics/AbcSize
-        command[1] = ZERO_CURSOR_FOR_SCAN if command.size == 1
-        input_cursor = Integer(command[1])
+      def scan(command, seed: nil, cursor_index: 1) # rubocop:disable Metrics/AbcSize
+        command[cursor_index] = ZERO_CURSOR_FOR_SCAN if command.size == cursor_index
+        input_cursor = Integer(command[cursor_index])
 
         client_index = input_cursor % 256
         raw_cursor = input_cursor >> 8
@@ -145,7 +145,7 @@ class RedisClient
         client = clients[client_index]
         return [ZERO_CURSOR_FOR_SCAN, []] unless client
 
-        command[1] = raw_cursor.to_s
+        command[cursor_index] = raw_cursor.to_s
 
         result_cursor, result_keys = client.call_v(command)
         result_cursor = Integer(result_cursor)
@@ -327,6 +327,14 @@ class RedisClient
         end
       end
 
+      def send_bless_command(method, command, args, &block)
+        if command[1].casecmp('scan').zero?
+          scan(command, seed: 1, cursor_index: 2).then(&TSF.call(block))
+        else
+          assign_node(command).public_send(method, *args, command, &block)
+        end
+      end
+
       def send_memory_command(method, command, args, &block)
         if command[1].casecmp('stats').zero?
           @node.call_all(method, command, args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.2
 platform: ruby
 authors:
 - Taishi Kasuga
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Redis cluster-aware client for Ruby
 test_files: []