redis-cluster-client 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa2c8f0e32f5e18ea48cd9ceffa81fa084d8634481aa9362d1c5572231ef6491
-  data.tar.gz: ad6f608804f372a6488db63e0182d585c72954f9654590cacdcdc3d116602096
+  metadata.gz: a24c43fc85a464dd886dfd38358b05fbd281247e8ab2b5420aa262003419c4d3
+  data.tar.gz: d0080c21c84bf7827bd352aac12a31fb84ba14b57e293f8275ccbb6efa96b326
 SHA512:
-  metadata.gz: 025a8f3d1359eb027cd07effc689f00bf466aee783563b2552a489f24dcdffeb88aa7863f7158af922f61f20987a93205865e7d46ab695b8aa1b194fba0af449
-  data.tar.gz: 67e46fc5427a5f29d4d90e65662591ddb1ca354f333831ac3f908a8b23fd5ef1d0bf30c11195d26391783b11f6ca56f8eb92ad70622da47da63b7520adffdc81
+  metadata.gz: 2b23b9967900f0ea14db0c4c2049389db73ed083304ad13641e55268a0278028fc4e231d495d65d0658125116bfd31dd47cd07394d487d7a83b0a97262d30c30
+  data.tar.gz: 55df5f327713a8d8597dcdd63e7803b40e99610e51792f1628aa4bc2ccc6f1e0da95579a246232b328c09061d51cd448dc4a7e9f8abf97d2f06b85e7a659fe88

data/lib/redis_client/cluster/concurrent_worker/none.rb

@@ -7,7 +7,7 @@ class RedisClient
         def new_group(size:)
           ::RedisClient::Cluster::ConcurrentWorker::Group.new(
             worker: self,
-            queue: Array.new(size),
+            queue: [],
             size: size
           )
         end
@@ -17,6 +17,10 @@ class RedisClient
         end
 
         def close; end
+
+        def inspect
+          "#<#{self.class.name} main thread only>"
+        end
       end
     end
   end

data/lib/redis_client/cluster/concurrent_worker/on_demand.rb

@@ -26,6 +26,10 @@ class RedisClient
           nil
         end
 
+        def inspect
+          "#<#{self.class.name} active: #{@q.size}, max: #{@q.max}>"
+        end
+
         private
 
         def spawn_worker(task, queue)

data/lib/redis_client/cluster/concurrent_worker/pooled.rb

@@ -38,6 +38,10 @@ class RedisClient
           nil
         end
 
+        def inspect
+          "#<#{self.class.name} tasks: #{@q.size}, workers: #{@size}>"
+        end
+
         private
 
         def setup
@@ -52,13 +56,15 @@ class RedisClient
         end
 
         def ensure_workers
-          @workers.size.times do |i|
+          @size.times do |i|
             @workers[i] = spawn_worker unless @workers[i]&.alive?
           end
         end
 
         def spawn_worker
-          Thread.new(@q) { |q| loop { q.pop.exec } }
+          Thread.new(@q) do |q|
+            loop { q.pop.exec }
+          end
         end
       end
     end

data/lib/redis_client/cluster/concurrent_worker.rb

@@ -7,7 +7,7 @@ require 'redis_client/cluster/concurrent_worker/none'
 class RedisClient
   class Cluster
     module ConcurrentWorker
-      InvalidNumberOfTasks = Class.new(::RedisClient::Error)
+      InvalidNumberOfTasks = Class.new(StandardError)
 
       class Group
         Task = Struct.new(
@@ -63,6 +63,10 @@ class RedisClient
           @count = 0
           nil
         end
+
+        def inspect
+          "#<#{self.class.name} size: #{@count}, max: #{@size}, worker: #{@worker.class.name}>"
+        end
       end
 
       module_function

data/lib/redis_client/cluster/router.rb

@@ -179,6 +179,12 @@ class RedisClient
         end
       end
 
+      def find_primary_node_key(command)
+        key = @command.extract_first_key(command)
+        slot = key.empty? ? nil : ::RedisClient::Cluster::KeySlotConverter.convert(key)
+        @node.find_node_key_of_primary(slot)
+      end
+
       def find_node(node_key, retry_count: 3)
         @node.find_by(node_key)
       rescue ::RedisClient::Cluster::Node::ReloadNeeded

data/lib/redis_client/cluster/transaction.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'redis_client'
+
+class RedisClient
+  class Cluster
+    class Transaction
+      ConsistencyError = Class.new(::RedisClient::Error)
+
+      def initialize(router, command_builder)
+        @router = router
+        @command_builder = command_builder
+        @node_key = nil
+      end
+
+      def call(*command, **kwargs, &_)
+        command = @command_builder.generate(command, kwargs)
+        ensure_node_key(command)
+      end
+
+      def call_v(command, &_)
+        command = @command_builder.generate(command)
+        ensure_node_key(command)
+      end
+
+      def call_once(*command, **kwargs, &_)
+        command = @command_builder.generate(command, kwargs)
+        ensure_node_key(command)
+      end
+
+      def call_once_v(command, &_)
+        command = @command_builder.generate(command)
+        ensure_node_key(command)
+      end
+
+      def find_node
+        yield self
+        raise ArgumentError, 'empty transaction' if @node_key.nil?
+
+        @router.find_node(@node_key)
+      end
+
+      private
+
+      def ensure_node_key(command)
+        node_key = @router.find_primary_node_key(command)
+        raise ConsistencyError, "Client couldn't determine the node to be executed the transaction by: #{command}" if node_key.nil?
+
+        @node_key ||= node_key
+        raise ConsistencyError, "The transaction should be done for single node: #{@node_key}, #{node_key}" if node_key != @node_key
+
+        nil
+      end
+    end
+  end
+end

data/lib/redis_client/cluster.rb

@@ -4,6 +4,7 @@ require 'redis_client/cluster/concurrent_worker'
 require 'redis_client/cluster/pipeline'
 require 'redis_client/cluster/pub_sub'
 require 'redis_client/cluster/router'
+require 'redis_client/cluster/transaction'
 
 class RedisClient
   class Cluster
@@ -88,6 +89,13 @@ class RedisClient
       pipeline.execute
     end
 
+    def multi(watch: nil, &block)
+      ::RedisClient::Cluster::Transaction
+        .new(@router, @command_builder)
+        .find_node(&block)
+        .multi(watch: watch, &block)
+    end
+
     def pubsub
       ::RedisClient::Cluster::PubSub.new(@router, @command_builder)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -51,6 +51,7 @@ files:
 - lib/redis_client/cluster/pipeline.rb
 - lib/redis_client/cluster/pub_sub.rb
 - lib/redis_client/cluster/router.rb
+- lib/redis_client/cluster/transaction.rb
 - lib/redis_client/cluster_config.rb
 - lib/redis_cluster_client.rb
 homepage: https://github.com/redis-rb/redis-cluster-client