redis-clustering 5.0.7 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c77b6a607098a0fe869f6cd243da1751b964be61972881ab5b07b83763f776
-  data.tar.gz: 964e18a67593790e58dd1300474d6b384190cff5875e34a00e986d69bed64e6a
+  metadata.gz: 48b10241c3e0f41500b8ce224013546591a034dfbc6a0fbbcbb9bef136eeca9e
+  data.tar.gz: 7acea63bfa0f3eab6f4c570ddb9a164f6901090964cf5988b54a913e4becc794
 SHA512:
-  metadata.gz: ba01fc739cfc44fcafe6fcbe33a43801cb30e536adb199f56a6a67a0e6afd44d9fdeeea4cb8cd622b369e4fbcc8edc7269717ca3625cc0fad307888c8e7d21e2
-  data.tar.gz: 5f92a9ece6a5ea63ffc66f02b9a7909b05ff53e393850689220a31f286d099cae9d34275b95456f1cd58e5dee951a49191f7d2a783354ea99fbc2322d4548ae4
+  metadata.gz: b7631f15ef1ce8b13d1af35f98e17f83a27b9dbd80ae8fd95c592010ed0d94dfcb3112bc1aed2e69044d9572e2cc4abe525bb88ae7bc44e72914cb66bb597a10
+  data.tar.gz: ce47057bada6b051033e3ca8f9338c62388b0efa530cabf8aca5210243c21deb336a7de459f7c8ce0aa638a0645eb9d1b5ec82edc6075bc73a5670bd67c2107f

data/lib/redis/cluster/client.rb

@@ -9,8 +9,10 @@ class Redis
         RedisClient::Cluster::InitialSetupError => Redis::Cluster::InitialSetupError,
         RedisClient::Cluster::OrchestrationCommandNotSupported => Redis::Cluster::OrchestrationCommandNotSupported,
         RedisClient::Cluster::AmbiguousNodeError => Redis::Cluster::AmbiguousNodeError,
-        RedisClient::Cluster::ErrorCollection => Redis::Cluster::CommandErrorCollection
-      ).freeze
+        RedisClient::Cluster::ErrorCollection => Redis::Cluster::CommandErrorCollection,
+        RedisClient::Cluster::Transaction::ConsistencyError => Redis::Cluster::TransactionConsistencyError,
+        RedisClient::Cluster::NodeMightBeDown => Redis::Cluster::NodeMightBeDown,
+      )
 
       class << self
         def config(**kwargs)
@@ -20,6 +22,29 @@ class Redis
         def sentinel(**kwargs)
           super(protocol: 2, **kwargs)
         end
+
+        def translate_error!(error, mapping: ERROR_MAPPING)
+          case error
+          when RedisClient::Cluster::ErrorCollection
+            error.errors.each do |_node, node_error|
+              if node_error.is_a?(RedisClient::AuthenticationError)
+                raise mapping.fetch(node_error.class), node_error.message, node_error.backtrace
+              end
+            end
+
+            remapped_node_errors = error.errors.map do |node_key, node_error|
+              remapped = mapping.fetch(node_error.class, node_error.class).new(node_error.message)
+              remapped.set_backtrace node_error.backtrace
+              [node_key, remapped]
+            end.to_h
+
+            raise(Redis::Cluster::CommandErrorCollection.new(remapped_node_errors, error.message).tap do |remapped|
+              remapped.set_backtrace error.backtrace
+            end)
+          else
+            Redis::Client.translate_error!(error, mapping: mapping)
+          end
+        end
       end
 
       def initialize(*)
@@ -28,11 +53,11 @@ class Redis
       ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
 
       def id
-        @router.node.node_keys.join(' ')
+        @router.node_keys.join(' ')
       end
 
       def server_url
-        @router.node.node_keys
+        @router.node_keys
       end
 
       def connected?
@@ -69,23 +94,16 @@ class Redis
         handle_errors { super(&block) }
       end
 
-      def multi(&block)
-        handle_errors { super(&block) }
+      def multi(watch: nil, &block)
+        handle_errors { super(watch: watch, &block) }
       end
 
       private
 
       def handle_errors
         yield
-      rescue RedisClient::Cluster::ErrorCollection => error
-        error.errors.each do |_node, node_error|
-          if node_error.is_a?(RedisClient::AuthenticationError)
-            raise ERROR_MAPPING.fetch(node_error.class), node_error.message, node_error.backtrace
-          end
-        end
-        raise ERROR_MAPPING.fetch(error.class), error.message, error.backtrace
       rescue ::RedisClient::Error => error
-        raise ERROR_MAPPING.fetch(error.class), error.message, error.backtrace
+        Redis::Cluster::Client.translate_error!(error)
       end
     end
   end

data/lib/redis/cluster.rb

@@ -38,6 +38,12 @@ class Redis
     class AmbiguousNodeError < BaseError
     end
 
+    class TransactionConsistencyError < BaseError
+    end
+
+    class NodeMightBeDown < BaseError
+    end
+
     def connection
       raise NotImplementedError, "Redis::Cluster doesn't implement #connection"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-clustering
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.1.0
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -24,28 +24,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: redis-cluster-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.7.0
 description: |2
     A Ruby client that tries to match Redis' Cluster API one-to-one, while still
       providing an idiomatic interface.
@@ -68,9 +68,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/redis/redis-rb/issues
   changelog_uri: https://github.com/redis/redis-rb/blob/master/cluster/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/redis/5.0.7
+  documentation_uri: https://www.rubydoc.info/gems/redis/5.1.0
   homepage_uri: https://github.com/redis/redis-rb/blob/master/cluster
-  source_code_uri: https://github.com/redis/redis-rb/tree/v5.0.7/cluster
+  source_code_uri: https://github.com/redis/redis-rb/tree/v5.1.0/cluster
 post_install_message:
 rdoc_options: []
 require_paths: