More tests.

Author: ioquatix

cluster/test/async/redis/cluster_client.rb

@@ -22,13 +22,27 @@
 
 	let(:cluster) {subject.new(endpoints)}
 
-	let(:key) {"sentinel-test:#{SecureRandom.hex(8)}"}
-	let(:value) {"sentinel-test-value"}
+	let(:key) {"cluster-test:#{SecureRandom.hex(8)}"}
+	let(:value) {"cluster-test-value"}
+	
+	it "can get a client for a given key" do
+		slot = cluster.slot_for(key)
+		client = cluster.client_for(slot)
+		
+		expect(client).not.to be_nil
+	end
 
 	it "can get and set values" do
+		result = nil
+		
+		pp key: key, slot: cluster.slot_for(key)
+		
 		cluster.clients_for(key) do |client, key|
 			client.set(key, value)
-			expect(client.get(key)).to be == value
+			
+			result = client.get(key)
 		end
+		
+		expect(result).to be == value
 	end
 end

lib/async/redis/cluster_client.rb

@@ -57,35 +57,45 @@ def initialize(endpoints, **options)
 				@shards = nil
 			end
 
-			def clients_for(*keys, attempts: 3)
+			def clients_for(*keys, role: :master, attempts: 3)
 				slots = slots_for(keys)
 
-				slots.map do |slot, keys|
-					yield client_for(slot), keys
+				slots.each do |slot, keys|
+					yield client_for(slot, role), keys
 				end
 			rescue ServerError => error
+				Console.warn(self, error)
+				
 				if error.message =~ /MOVED|ASK/
 					reload_cluster!
 
 					attempts -= 1
 
 					retry if attempts > 0
+					
+					raise
 				else
 					raise
 				end
 			end
 
 			def client_for(slot, role = :master)
-				unless @nodes
+				unless @shards
 					reload_cluster!
 				end
 
 				nodes = @shards.find(slot)
 
+				pp slot: slot, nodes: nodes
+				
 				nodes = nodes.select{|node| node.role == role}
 
+				pp filtered_nodes: nodes
+				
 				if node = nodes.sample
-					node.client ||= Client.new(node.endpoint)
+					pp sampled_node: node
+					
+					return (node.client ||= Client.new(node.endpoint))
 				end
 			end
 
@@ -117,6 +127,7 @@ def reload_cluster!(endpoints = @endpoints)
 						shards.add(range, nodes)
 					end
 
+					pp shards: shards
 					@shards = shards
 					# @endpoints = @endpoints | endpoints
 
@@ -166,17 +177,19 @@ def reload_cluster!(endpoints = @endpoints)
 			# This is the CRC16 algorithm used by Redis Cluster to hash keys.
 			# Copied from https://github.com/antirez/redis-rb-cluster/blob/master/crc16.rb
 			def crc16(bytes)
-				crc = 0
+				sum = 0
 
-				bytes.each_byte do |b|
-					crc = ((crc << 8) & 0xffff) ^ XMODEM_CRC16_LOOKUP[((crc >> 8) ^ b) & 0xff]
+				bytes.each_byte do |byte|
+					sum = ((sum << 8) & 0xffff) ^ XMODEM_CRC16_LOOKUP[((sum >> 8) ^ byte) & 0xff]
 				end
 
-				return crc
+				return sum
 			end
 
 			HASH_SLOTS = 16_384
 
+			public
+			
 			# Return Redis::Client for a given key.
 			# Modified from https://github.com/antirez/redis-rb-cluster/blob/master/cluster.rb#L104-L117
 			def slot_for(key)

test/async/redis/cluster_client.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require 'async/redis/cluster_client'
+require 'sus/fixtures/async'
+require 'securerandom'
+
+describe Async::Redis::ClusterClient do
+	let(:client) {subject.new([])}
+	
+	with "#slot_for" do
+		it "can compute the correct slot for a given key" do
+			expect(client.slot_for("helloworld")).to be == 2739
+			expect(client.slot_for("test1234")).to be == 15785
+		end
+	end
+end