redis-cluster-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374dde2480377552fd2178d4940d0f9f9b4473c4308c89fa210e2b0ac8f36d6d
-  data.tar.gz: 5b22559b68cd287904a17f853a4cfd6a0fc0bf53418eeca3988987a585a55b71
+  metadata.gz: 7a4668f3eaba9c3053d1464bdf1dc85524e2ba43fdbb2ffbbadc46fb4759d5e6
+  data.tar.gz: eba5280f698fe559a69cdeba28cef2c0fff87023fa78e7d098042d9cc6c036ac
 SHA512:
-  metadata.gz: da95dc7179899376c736d6e5b75a04b9f8d91d0b97095b2478c9b96879f0f4ff01d75ffe86bf3efdebb2af0e13b6397a3afd41a1e6857fc41097f53ac8cdacf2
-  data.tar.gz: 6759c62ea25c92e8160540b5edb354a03253d7d43199ccbf0479d1b19070b90cb17877b376012186ff063316f28f16157d8fbd1e0bb3b67c3168ed92d6afa31a
+  metadata.gz: 989fd1b82d429ae6450a8c9e1555fc3635c1592c4d68744ad33df9cb26f5d222666fbeb077af99757c6305956936f44b8e38aef405c1a275c10e501559337934
+  data.tar.gz: c0e88ca74a4d0ff70116969ea0722d1659858587c1cfe8a404edf41658c0b9a87e0f3651db02fe88ad6d099b2948814fcc9415aa793394fb4e75ebc5eef0acec

data/lib/redis_client/cluster/node.rb

@@ -12,6 +12,8 @@ class RedisClient
       SLOT_SIZE = 16_384
       MIN_SLOT = 0
       MAX_SLOT = SLOT_SIZE - 1
+      IGNORE_GENERIC_CONFIG_KEYS = %i[url host port path].freeze
+
       ReloadNeeded = Class.new(::RedisClient::Error)
 
       class Config < ::RedisClient::Config
@@ -127,11 +129,6 @@ class RedisClient
         end.values
       end
 
-      # TODO: impl
-      def process_all(commands, &block)
-        try_map { |_, client| client.process(commands, &block) }.values
-      end
-
       def scale_reading_clients
         clients = @clients.select do |node_key, _|
           replica_disabled? ? primary?(node_key) : replica?(node_key)
@@ -207,7 +204,10 @@ class RedisClient
         options.filter_map do |node_key, option|
           next if replica_disabled? && replica?(node_key)
 
-          config = ::RedisClient::Cluster::Node::Config.new(scale_read: replica?(node_key), **option.merge(kwargs))
+          config = ::RedisClient::Cluster::Node::Config.new(
+            scale_read: replica?(node_key),
+            **option.merge(kwargs.reject { |k, _| IGNORE_GENERIC_CONFIG_KEYS.include?(k) })
+          )
           client = pool.nil? ? config.new_client : config.new_pool(**pool)
 
           [node_key, client]

data/lib/redis_client/cluster/node_key.rb

@@ -19,7 +19,7 @@ class RedisClient
         pos = node_key&.rindex(DELIMITER, -1)
         return [node_key, nil] if pos.nil?
 
-        [node_key[0, pos], node_key[pos + 1, node_key.size - pos - 1]]
+        [node_key[0, pos], node_key[(pos + 1)..]]
       end
 
       def build_from_uri(uri)

data/lib/redis_client/cluster.rb

@@ -20,19 +20,19 @@ class RedisClient
       end
 
       def call(*command, **kwargs)
-        node_key = @client.send(:find_node_key, command, primary_only: true)
+        node_key = @client.send(:find_node_key, *command, primary_only: true)
         @grouped[node_key] += [[@size, :call, command, kwargs]]
         @size += 1
       end
 
       def call_once(*command, **kwargs)
-        node_key = @client.send(:find_node_key, command, primary_only: true)
+        node_key = @client.send(:find_node_key, *command, primary_only: true)
         @grouped[node_key] += [[@size, :call_once, command, kwargs]]
         @size += 1
       end
 
       def blocking_call(timeout, *command, **kwargs)
-        node_key = @client.send(:find_node_key, command, primary_only: true)
+        node_key = @client.send(:find_node_key, *command, primary_only: true)
         @grouped[node_key] += [[@size, :blocking_call, timeout, command, kwargs]]
         @size += 1
       end
@@ -65,7 +65,37 @@ class RedisClient
       end
     end
 
+    class PubSub
+      def initialize(client)
+        @client = client
+        @pubsub = nil
+      end
+
+      def call(*command, **kwargs)
+        close
+        @pubsub = @client.send(:assign_node, *command).pubsub
+        @pubsub.call(*command, **kwargs)
+      end
+
+      def close
+        @pubsub&.close
+        @pubsub = nil
+      end
+
+      def next_event(timeout = nil)
+        @pubsub&.next_event(timeout)
+      end
+    end
+
     ZERO_CURSOR_FOR_SCAN = '0'
+    CMD_SCAN = 'SCAN'
+    CMD_SSCAN = 'SSCAN'
+    CMD_HSCAN = 'HSCAN'
+    CMD_ZSCAN = 'ZSCAN'
+    CMD_ASKING = 'ASKING'
+    REPLY_OK = 'OK'
+    REPLY_MOVED = 'MOVED'
+    REPLY_ASK = 'ASK'
 
     def initialize(config, pool: nil, **kwargs)
       @config = config.dup
@@ -97,35 +127,27 @@ class RedisClient
 
       cursor = ZERO_CURSOR_FOR_SCAN
       loop do
-        cursor, keys = _scan('SCAN', cursor, *args, **kwargs)
+        cursor, keys = _scan(CMD_SCAN, cursor, *args, **kwargs)
         keys.each(&block)
         break if cursor == ZERO_CURSOR_FOR_SCAN
       end
     end
 
     def sscan(key, *args, **kwargs, &block)
-      node = assign_node('SSCAN', key)
+      node = assign_node(CMD_SSCAN, key)
       try_send(node, :sscan, key, *args, **kwargs, &block)
     end
 
     def hscan(key, *args, **kwargs, &block)
-      node = assign_node('HSCAN', key)
+      node = assign_node(CMD_HSCAN, key)
       try_send(node, :hscan, key, *args, **kwargs, &block)
     end
 
     def zscan(key, *args, **kwargs, &block)
-      node = assign_node('ZSCAN', key)
+      node = assign_node(CMD_ZSCAN, key)
       try_send(node, :zscan, key, *args, **kwargs, &block)
     end
 
-    def mset
-      # TODO: impl
-    end
-
-    def mget
-      # TODO: impl
-    end
-
     def pipelined
       pipeline = ::RedisClient::Cluster::Pipeline.new(self)
       yield pipeline
@@ -135,17 +157,8 @@ class RedisClient
     end
 
     def pubsub
-      # TODO: impl
-    end
-
-    def size
-      # TODO: impl
-    end
-
-    def with(options = {})
-      # TODO: impl
+      ::RedisClient::Cluster::PubSub.new(self)
     end
-    alias then with
 
     def close
       @node.each(&:close)
@@ -253,17 +266,17 @@ class RedisClient
     def try_send(node, method, *args, retry_count: 3, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       node.send(method, *args, **kwargs, &block)
     rescue ::RedisClient::CommandError => e
-      if e.message.start_with?('MOVED')
+      if e.message.start_with?(REPLY_MOVED)
         raise if retry_count <= 0
 
         node = assign_redirection_node(e.message)
         retry_count -= 1
         retry
-      elsif e.message.start_with?('ASK')
+      elsif e.message.start_with?(REPLY_ASK)
         raise if retry_count <= 0
 
         node = assign_asking_node(e.message)
-        node.call('ASKING')
+        node.call(CMD_ASKING)
         retry_count -= 1
         retry
       else
@@ -309,11 +322,11 @@ class RedisClient
     end
 
     def assign_node(*command)
-      node_key = find_node_key(command)
+      node_key = find_node_key(*command)
       find_node(node_key)
     end
 
-    def find_node_key(command, primary_only: false)
+    def find_node_key(*command, primary_only: false)
       key = @command.extract_first_key(command)
       return if key.empty?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client