From 8611b68272324341a8ca87b3afad2c3592c819e2 Mon Sep 17 00:00:00 2001 From: Taishi Kasuga Date: Tue, 4 Jun 2024 07:22:39 +0900 Subject: [PATCH] Fix a memoization bug for cluster client --- cluster/lib/redis/cluster/client.rb | 8 ++++---- cluster/redis-clustering.gemspec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/lib/redis/cluster/client.rb b/cluster/lib/redis/cluster/client.rb index 016101794..b7ff69801 100644 --- a/cluster/lib/redis/cluster/client.rb +++ b/cluster/lib/redis/cluster/client.rb @@ -54,11 +54,11 @@ def initialize(*) ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true) def id - @router.node_keys.join(' ') + server_url.join(' ') end def server_url - @router.node_keys + @router.nil? ? @config.startup_nodes.keys : router.node_keys end def connected? @@ -115,9 +115,9 @@ def watch(*keys, &block) end handle_errors do - RedisClient::Cluster::OptimisticLocking.new(@router).watch(keys) do |c, slot, asking| + RedisClient::Cluster::OptimisticLocking.new(router).watch(keys) do |c, slot, asking| transaction = Redis::Cluster::TransactionAdapter.new( - self, @router, @command_builder, node: c, slot: slot, asking: asking + self, router, @command_builder, node: c, slot: slot, asking: asking ) result = yield transaction diff --git a/cluster/redis-clustering.gemspec b/cluster/redis-clustering.gemspec index 05194217b..5e45a7a67 100644 --- a/cluster/redis-clustering.gemspec +++ b/cluster/redis-clustering.gemspec @@ -47,5 +47,5 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.7.0' s.add_runtime_dependency('redis', s.version) - s.add_runtime_dependency('redis-cluster-client', '>= 0.7.11') + s.add_runtime_dependency('redis-cluster-client', '>= 0.10.0') end