refactor: slot-node mappings implementation (#186)

Author: supercaracal

.github/workflows/test.yaml

@@ -43,8 +43,6 @@ jobs:
           - '6.2.7'
         ruby:
           - '3.2'
-          - '3.1'
-          - '3.0'
           - '2.7'
         driver:
           - 'ruby'
@@ -365,7 +363,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mode: ['single', 'excessive_pipelining', 'pipelining_in_moderation']
+        mode:
+          - single
+          - excessive_pipelining
+          - pipelining_in_moderation
     runs-on: ubuntu-latest
     env:
       REDIS_VERSION: '7.0.5'

lib/redis_client/cluster/node.rb

@@ -18,7 +18,6 @@ class Node
       MAX_STARTUP_SAMPLE = 37
       MAX_THREADS = Integer(ENV.fetch('REDIS_CLIENT_MAX_THREADS', 5))
       IGNORE_GENERIC_CONFIG_KEYS = %i[url host port path].freeze
-      SLOT_OPTIMIZATION_STRING = '0' * SLOT_SIZE
 
       ReloadNeeded = Class.new(::RedisClient::Error)
 
@@ -37,27 +36,36 @@ def replica?
         end
       end
 
-      Slot = Struct.new('StringArray', :string, :elements, keyword_init: true) do
+      class CharArray
+        BASE = ''
+        PADDING = '0'
+
+        def initialize(size, elements)
+          @elements = elements
+          @string = String.new(BASE, encoding: Encoding::BINARY, capacity: size)
+          size.times { @string << PADDING }
+        end
+
         def [](index)
           raise IndexError if index < 0
-          return if index >= string.bytesize
+          return if index >= @string.bytesize
 
-          elements[string.getbyte(index)]
+          @elements[@string.getbyte(index)]
         end
 
         def []=(index, element)
           raise IndexError if index < 0
-          return if index >= string.bytesize
+          return if index >= @string.bytesize
 
-          pos = elements.find_index(element) # O(N)
+          pos = @elements.find_index(element) # O(N)
           if pos.nil?
-            raise(RangeError, 'full of elements') if elements.size >= 256
+            raise(RangeError, 'full of elements') if @elements.size >= 256
 
-            pos = elements.size
-            elements << element
+            pos = @elements.size
+            @elements << element
           end
 
-          string.setbyte(index, pos)
+          @string.setbyte(index, pos)
         end
       end
 
@@ -268,10 +276,8 @@ def build_slot_node_mappings(node_info_list)
       def make_array_for_slot_node_mappings(node_info_list)
         return Array.new(SLOT_SIZE) if node_info_list.count(&:primary?) > 256
 
-        ::RedisClient::Cluster::Node::Slot.new(
-          string: String.new(SLOT_OPTIMIZATION_STRING, encoding: Encoding::BINARY, capacity: SLOT_SIZE),
-          elements: node_info_list.select(&:primary?).map(&:node_key)
-        )
+        primary_node_keys = node_info_list.select(&:primary?).map(&:node_key)
+        ::RedisClient::Cluster::Node::CharArray.new(SLOT_SIZE, primary_node_keys)
       end
 
       def build_replication_mappings(node_info_list) # rubocop:disable Metrics/AbcSize

test/cluster_controller.rb

@@ -145,6 +145,8 @@ def finish_resharding(slot:, src_node_key:, dest_node_key:) # rubocop:disable Me
       raise if e.message != 'ERR Please use SETSLOT only with masters.'
       # how weird, ignore
     end
+
+    wait_replication_delay(@clients, replica_size: @replica_size, timeout: @timeout)
   end
 
   def scale_out(primary_url:, replica_url:) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

test/redis_client/cluster/test_node.rb

@@ -382,7 +382,7 @@ def test_make_array_for_slot_node_mappings_optimized
 
         want = node_info_list.first.node_key
         got = @test_node.send(:make_array_for_slot_node_mappings, node_info_list)
-        assert_instance_of(Struct::StringArray, got)
+        assert_instance_of(::RedisClient::Cluster::Node::CharArray, got)
         ::RedisClient::Cluster::Node::SLOT_SIZE.times do |i|
           got[i] = want
           assert_equal(want, got[i], "Case: #{i}")
@@ -415,7 +415,7 @@ def test_make_array_for_slot_node_mappings_max_shard_size
         end
 
         got = @test_node.send(:make_array_for_slot_node_mappings, node_info_list)
-        assert_instance_of(Struct::StringArray, got)
+        assert_instance_of(::RedisClient::Cluster::Node::CharArray, got)
 
         ::RedisClient::Cluster::Node::SLOT_SIZE.times { |i| got[i] = node_info_list.first.node_key }