redis-cluster-client 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aec24d7a41cc222cf5fdec13b063d0ce2a68df59c05049a4719f71b6ac07391
-  data.tar.gz: 00b0eebd7da92305fbf2512f660721ad0976cfb1e33fb72037a673fe65899ce1
+  metadata.gz: 367df4e02bcd425f14da73b2ff243dfdb7fd44c6cb565bcc46952b939057904f
+  data.tar.gz: bfdb8033d0695fe0389563ad563c8445f9624e99ef6315e7374ee7f2e440fe40
 SHA512:
-  metadata.gz: 28d31d104bd1f2100c0f61c765783e86fea745910c748510bdc7b4985f779df4e8d8240a38afc043504cc36ad33a00273288762defcdcd03e7486cece5351882
-  data.tar.gz: 82a6c2b2e786f27183cc000ca202e4d6bf29b6260dc00a2659eb18660e6e4b3d60946d170606938242dc9340b4ae644aaa15de7369c23e2f9cda0c2bab604fe8
+  metadata.gz: 278740e8829a1def72a411552ed7c17d0d265930c81dfc2b967cfa325a74cdbdbd0adb832dacc77e4c86c8316648695b94044cb6fdf3dd3267617d5f18b95ec1
+  data.tar.gz: 007bf587198b7575dabee128c0500700ef0d10c7b699a632023ce4d80fa788d2a88e851748f041ab5f6453350d7de6f9d8c96bcbc798deec7acbf37b2700ea6a

data/lib/redis_client/cluster/command.rb

@@ -55,6 +55,10 @@ class RedisClient
         dig_details(command, :readonly)
       end
 
+      def exists?(name)
+        @details.key?(name.to_s.downcase)
+      end
+
       private
 
       def pick_details(details)

data/lib/redis_client/cluster/pipeline.rb

@@ -15,19 +15,19 @@ class RedisClient
       end
 
       def call(*command, **kwargs)
-        node_key = @router.find_node_key(*command, primary_only: true)
+        node_key = @router.find_node_key(*command, primary_only: true, **kwargs)
         @grouped[node_key] += [[@size, :call, command, kwargs]]
         @size += 1
       end
 
       def call_once(*command, **kwargs)
-        node_key = @router.find_node_key(*command, primary_only: true)
+        node_key = @router.find_node_key(*command, primary_only: true, **kwargs)
         @grouped[node_key] += [[@size, :call_once, command, kwargs]]
         @size += 1
       end
 
       def blocking_call(timeout, *command, **kwargs)
-        node_key = @router.find_node_key(*command, primary_only: true)
+        node_key = @router.find_node_key(*command, primary_only: true, **kwargs)
         @grouped[node_key] += [[@size, :blocking_call, timeout, command, kwargs]]
         @size += 1
       end

data/lib/redis_client/cluster/pub_sub.rb

@@ -10,7 +10,7 @@ class RedisClient
 
       def call(*command, **kwargs)
         close
-        @pubsub = @router.assign_node(*command).pubsub
+        @pubsub = @router.assign_node(*command, **kwargs).pubsub
         @pubsub.call(*command, **kwargs)
       end
 

data/lib/redis_client/cluster/router.rb

@@ -20,11 +20,13 @@ class RedisClient
         @client_kwargs = kwargs
         @node = fetch_cluster_info(@config, pool: @pool, **@client_kwargs)
         @command = ::RedisClient::Cluster::Command.load(@node)
+        @command_builder = @config.command_builder
         @mutex = Mutex.new
       end
 
       def send_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         cmd = command.first.to_s.downcase
         case cmd
@@ -95,6 +97,8 @@ class RedisClient
       end
 
       def scan(*command, **kwargs) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        command = @command_builder.generate!(command, kwargs)
+
         command[1] = ZERO_CURSOR_FOR_SCAN if command.size == 1
         input_cursor = Integer(command[1])
 
@@ -116,12 +120,14 @@ class RedisClient
         [((result_cursor << 8) + client_index).to_s, result_keys]
       end
 
-      def assign_node(*command)
-        node_key = find_node_key(*command)
+      def assign_node(*command, **kwargs)
+        node_key = find_node_key(*command, **kwargs)
         find_node(node_key)
       end
 
-      def find_node_key(*command, primary_only: false)
+      def find_node_key(*command, primary_only: false, **kwargs)
+        command = @command_builder.generate!(command, kwargs)
+
         key = @command.extract_first_key(command)
         slot = key.empty? ? nil : ::RedisClient::Cluster::KeySlotConverter.convert(key)
 
@@ -142,6 +148,10 @@ class RedisClient
         retry
       end
 
+      def command_exists?(name)
+        @command.exists?(name)
+      end
+
       private
 
       def send_wait_command(method, *args, retry_count: 3, **kwargs, &block)
@@ -159,6 +169,7 @@ class RedisClient
 
       def send_config_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'resetstat', 'rewrite', 'set'
@@ -169,6 +180,7 @@ class RedisClient
 
       def send_memory_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'stats' then @node.call_all(method, *args, **kwargs, &block)
@@ -179,6 +191,7 @@ class RedisClient
 
       def send_client_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'list' then @node.call_all(method, *args, **kwargs, &block).flatten
@@ -190,6 +203,7 @@ class RedisClient
 
       def send_cluster_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
         subcommand = command[1].to_s.downcase
 
         case subcommand
@@ -207,6 +221,7 @@ class RedisClient
 
       def send_script_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'debug', 'kill'
@@ -219,6 +234,7 @@ class RedisClient
 
       def send_pubsub_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'channels' then @node.call_all(method, *args, **kwargs, &block).flatten.uniq.sort_by(&:to_s)

data/lib/redis_client/cluster.rb

@@ -17,16 +17,16 @@ class RedisClient
       "#<#{self.class.name} #{@router.node.node_keys.join(', ')}>"
     end
 
-    def call(*command, **kwargs)
-      @router.send_command(:call, *command, **kwargs)
+    def call(*command, **kwargs, &block)
+      @router.send_command(:call, *command, **kwargs, &block)
     end
 
-    def call_once(*command, **kwargs)
-      @router.send_command(:call_once, *command, **kwargs)
+    def call_once(*command, **kwargs, &block)
+      @router.send_command(:call_once, *command, **kwargs, &block)
     end
 
-    def blocking_call(timeout, *command, **kwargs)
-      @router.send_command(:blocking_call, timeout, *command, **kwargs)
+    def blocking_call(timeout, *command, **kwargs, &block)
+      @router.send_command(:blocking_call, timeout, *command, **kwargs, &block)
     end
 
     def scan(*args, **kwargs, &block)
@@ -71,5 +71,22 @@ class RedisClient
       @router.node.call_all(:close)
       nil
     end
+
+    private
+
+    def method_missing(name, *args, **kwargs, &block)
+      if @router.command_exists?(name)
+        args.unshift(name)
+        return @router.send_command(:call, *args, **kwargs, &block)
+      end
+
+      super
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      return true if @router.command_exists?(name)
+
+      super
+    end
   end
 end

data/lib/redis_client/cluster_config.rb

@@ -4,6 +4,7 @@ require 'uri'
 require 'redis_client'
 require 'redis_client/cluster'
 require 'redis_client/cluster/node_key'
+require 'redis_client/command_builder'
 
 class RedisClient
   class ClusterConfig
@@ -19,11 +20,14 @@ class RedisClient
 
     InvalidClientConfigError = Class.new(::RedisClient::Error)
 
+    attr_reader :command_builder
+
     def initialize(nodes: DEFAULT_NODES, replica: false, fixed_hostname: '', **client_config)
       @replica = true & replica
       @fixed_hostname = fixed_hostname.to_s
       @node_configs = build_node_configs(nodes.dup)
       client_config = client_config.reject { |k, _| IGNORE_GENERIC_CONFIG_KEYS.include?(k) }
+      @command_builder = client_config.fetch(:command_builder, ::RedisClient::CommandBuilder)
       @client_config = merge_generic_config(client_config, @node_configs)
       @mutex = Mutex.new
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Taishi Kasuga