solid-redis 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a8d7e4c46fd3443d3eda55582111998c1c2f1cfa1d97745f53a8d39494d1dbf
-  data.tar.gz: bbd7f6c8da3509f605d20daf2ace8439e4d0f3ffc16bd4d4405a8e6d3f880723
+  metadata.gz: e1a92b96853d5d381ae812b7440c9b50a718f9b67fc678e0cbee1d0c8014fc16
+  data.tar.gz: 679a2723c695c95b68f95432006fe93e111c2318106b0384e7a409eca475b480
 SHA512:
-  metadata.gz: 3744b1d0cecccd3e286445f5224852d27220afb7cbcfe763d4cf500ddea03976a4e7a73586276219446cfcb590ca09f174510f9f426063f868d5e0d8bf797d41
-  data.tar.gz: d3ae71c56576195f4067db3d3384c7aa19a6c0fad306dbd588cb1562d09289bb0fc39957f80149184eec63ce3e415b169956e1bde816209209e454e85725330f
+  metadata.gz: 2ea6594459de7d81b8e8fbe1f0f323a397a6c99ff145489ecba44e0ff6ecb8c2409236283a0d21add112033377ceaab4ce787e7021afbfd6c79d18ffc1991f92
+  data.tar.gz: 4ddc0772aeb012163fced9a0bdca65c8da9d21019e82f25b36254fe2c0c3b32312052de47e707b1bcdf64fc35663363db4775155dcc4143ba9c44db93cdc6d48

data/CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to this project are documented in this file. The format
 follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and the
 project adheres to [Semantic Versioning](https://semver.org/).
 
+## [1.0.3] - 2026-09-27
+
+### Fixed
+
+- Consume complete RESP arrays, maps, sets, pushes, and attributes before
+  raising nested Redis errors, preventing connection desynchronization.
+- Handle `:wait_writable` during non-blocking reads and discard connections
+  after protocol errors without replaying commands.
+- Retry `TRYAGAIN` and `CLUSTERDOWN` pipeline replies consistently with direct
+  Cluster calls, and clear `ASKING` state before refreshing the topology.
+- Route `MEMORY USAGE` to the node owning its key.
+- Preserve an explicitly configured `db` when a Redis URL is also provided.
+
+### Changed
+
+- Clarify that Cluster commands are grouped into per-node pipelines rather
+  than sent concurrently.
+
 ## [1.0.2] - 2026-09-27
 
 ### Added
@@ -73,6 +91,7 @@ project adheres to [Semantic Versioning](https://semver.org/).
   TLS, reconnection), `Pool` owned by a single Ractor, pipelines, and
   lifecycle callbacks via `callback-collection`.
 
+[1.0.3]: https://github.com/nicolasva/solid-redis/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/nicolasva/solid-redis/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/nicolasva/solid-redis/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/nicolasva/solid-redis/compare/v0.2.1...v1.0.0

data/README.md

@@ -272,9 +272,9 @@ client.call("GET", "user:1")
 client.call("MGET", "{user:1}.name", "{user:1}.email") # same slot via hash tag
 
 client.pipelined do |pipeline|
-  pipeline.call("GET", "a")   # commands are grouped per node,
-  pipeline.call("GET", "b")   # sent in parallel pipelines,
-  pipeline.call("PING")       # and results come back in order
+  pipeline.call("GET", "a")   # commands are grouped into one pipeline
+  pipeline.call("GET", "b")   # per node, and results come back
+  pipeline.call("PING")       # in their original order
 end
 
 pool = CLUSTER.new_pool(size: 5) # a pool of cluster clients
@@ -308,6 +308,10 @@ Direct Redis options:
 | `ssl` | `false` | Enable TLS |
 | `ssl_params` | | Immutable `OpenSSL::SSL::SSLContext` attributes |
 
+An explicit `db:` option takes precedence over a database selected by the URL
+path or `?db=` query parameter. When neither specifies a database, it defaults
+to `0`.
+
 Sentinel additionally requires `name` and `sentinels`, and accepts `role`,
 `sentinel_username`, `sentinel_password`, `sentinel_ssl`, and
 `sentinel_ssl_params`. Sentinel defaults to two reconnect attempts.

data/lib/solid_redis/client.rb

@@ -44,10 +44,8 @@ module SolidRedis
       begin
         write(RESP.encode(command))
         @reader.with_timeout(read_timeout) { @reader.read }
-      rescue ConnectionError, IO::WaitReadable, IO::WaitWritable, SystemCallError => error
-        close
-        config.reset if config.sentinel?
-        config.notify(:connection_error, error.class.name, error.message)
+      rescue ProtocolError, ConnectionError, IO::WaitReadable, IO::WaitWritable, SystemCallError => error
+        handle_connection_failure(error)
         raise error if error.is_a?(Error)
 
         raise ConnectionError, error.message, cause: error
@@ -96,10 +94,11 @@ module SolidRedis
       begin
         connect unless connected?
         yield
+      rescue ProtocolError => error
+        handle_connection_failure(error)
+        raise
       rescue ConnectionError, IO::WaitReadable, IO::WaitWritable, SystemCallError => error
-        close
-        config.reset if config.sentinel?
-        config.notify(:connection_error, error.class.name, error.message)
+        handle_connection_failure(error)
         if attempts < config.reconnect_attempts
           attempts += 1
           retry
@@ -110,6 +109,12 @@ module SolidRedis
       end
     end
 
+    def handle_connection_failure(error)
+      close
+      config.reset if config.sentinel?
+      config.notify(:connection_error, error.class.name, error.message)
+    end
+
     def connect
       @target = config.sentinel? ? config.resolve : config
       @socket = open_socket(@target)

data/lib/solid_redis/cluster/command_key.rb

@@ -8,7 +8,7 @@ module SolidRedis
       KEYLESS = Ractor.make_shareable(
         %w[
           ACL ASKING AUTH BGREWRITEAOF BGSAVE CLIENT CLUSTER COMMAND CONFIG DBSIZE DEBUG DISCARD ECHO EXEC
-          FAILOVER FLUSHALL FLUSHDB FUNCTION HELLO INFO LASTSAVE LATENCY LOLWUT MEMORY MODULE MONITOR MULTI PING
+          FAILOVER FLUSHALL FLUSHDB FUNCTION HELLO INFO LASTSAVE LATENCY LOLWUT MODULE MONITOR MULTI PING
           PSUBSCRIBE PUBLISH PUBSUB PUNSUBSCRIBE QUIT RANDOMKEY READONLY READWRITE REPLICAOF RESET ROLE SAVE
           SCAN SCRIPT SELECT SHUTDOWN SLAVEOF SLOWLOG SUBSCRIBE SWAPDB SYNC TIME UNSUBSCRIBE UNWATCH WAIT
         ].to_h { |name| [name, true] },
@@ -42,6 +42,7 @@ module SolidRedis
         end
 
         case name
+        when "MEMORY" then command[1].to_s.casecmp?("USAGE") ? command[2] : nil
         when "XGROUP", "XINFO", "OBJECT" then command[2]
         when "MIGRATE" then command[3].to_s.empty? ? nil : command[3]
         else command[1]

data/lib/solid_redis/cluster_client.rb

@@ -7,6 +7,7 @@ module SolidRedis
   class ClusterClient
     REDIRECTION = /\A(MOVED|ASK) (\d+) (\S+):(\d+)\z/
     RETRY_DELAY = 0.05
+    TRANSIENT_ERRORS = %w[TRYAGAIN CLUSTERDOWN].freeze
 
     attr_reader :config
 
@@ -49,7 +50,8 @@ module SolidRedis
       end
 
       results.each_with_index do |result, index|
-        next unless result.is_a?(CommandError) && result.message.match?(REDIRECTION)
+        next unless result.is_a?(CommandError)
+        next unless result.message.match?(REDIRECTION) || transient_error?(result)
 
         results[index] = begin
           call_v(commands[index])
@@ -107,6 +109,7 @@ module SolidRedis
           redirections += 1
           raise FailoverError, "Cluster unavailable: #{error.message}" if redirections > config.max_redirections
 
+          asking = false
           sleep RETRY_DELAY
           config.state.refresh
           node = node_for(command)
@@ -129,6 +132,10 @@ module SolidRedis
       key ? config.state.node_for_slot(Cluster::KeySlot.for(key)) : config.state.any_node
     end
 
+    def transient_error?(error)
+      error.message.start_with?(*TRANSIENT_ERRORS)
+    end
+
     def client_for(node)
       @clients[node.server_key] ||= node.new_client(name: @name)
     end

data/lib/solid_redis/config.rb

@@ -6,6 +6,7 @@ module SolidRedis
   class Config
     DEFAULT_TIMEOUT = 1.0
     DEFAULT_PORT = 6379
+    UNSPECIFIED = Object.new.freeze
 
     attr_reader :host, :port, :path, :username, :password, :db,
       :connect_timeout, :read_timeout, :write_timeout, :reconnect_attempts,
@@ -18,7 +19,7 @@ module SolidRedis
       path: nil,
       username: nil,
       password: nil,
-      db: 0,
+      db: UNSPECIFIED,
       timeout: DEFAULT_TIMEOUT,
       connect_timeout: timeout,
       read_timeout: timeout,
@@ -35,9 +36,10 @@ module SolidRedis
         path = values[:path]
         username ||= values[:username]
         password ||= values[:password]
-        db = values[:db] unless values[:db].nil?
+        db = values[:db] if db.equal?(UNSPECIFIED) && !values[:db].nil?
         ssl ||= values[:ssl]
       end
+      db = 0 if db.equal?(UNSPECIFIED)
 
       @host = String(host).dup.freeze unless path
       @port = Integer(port) unless path
@@ -140,10 +142,10 @@ module SolidRedis
     end
 
     def query_db(uri)
-      return 0 unless uri.query
+      return unless uri.query
 
       value = URI.decode_www_form(uri.query).to_h["db"]
-      value ? Integer(value) : 0
+      Integer(value) if value
     end
 
     def decoded(value)

data/lib/solid_redis/resp.rb

@@ -72,7 +72,7 @@ module SolidRedis
         when "~", ">" then read_collection(exception)
         when "=" then read_verbatim
         when "!" then error_response(read_sized_string, exception)
-        when "|" then read_map(exception) && read(exception: exception)
+        when "|" then read_attribute(exception)
         else raise ProtocolError, "Unknown RESP type byte: #{type.inspect}"
         end
       rescue EOFError
@@ -94,18 +94,46 @@ module SolidRedis
         length = Integer(read_line)
         return if length == -1
 
-        Array.new(length) { read(exception: exception) }
+        finish_collection(Array.new(length) { read(exception: false) }, exception)
       end
 
       def read_collection(exception)
         length = Integer(read_line)
-        Array.new(length) { read(exception: exception) }
+        finish_collection(Array.new(length) { read(exception: false) }, exception)
       end
 
       def read_map(exception)
         length = Integer(read_line)
-        {}.tap do |map|
-          length.times { map[read(exception: exception)] = read(exception: exception) }
+        map = {}.tap do |result|
+          length.times { result[read(exception: false)] = read(exception: false) }
+        end
+        finish_collection(map, exception)
+      end
+
+      def read_attribute(exception)
+        attributes = read_map(false)
+        value = read(exception: false)
+        raise_nested_error(attributes) if exception
+        raise_nested_error(value) if exception
+        value
+      end
+
+      def finish_collection(value, exception)
+        raise_nested_error(value) if exception
+        value
+      end
+
+      def raise_nested_error(value)
+        case value
+        when CommandError
+          raise value
+        when Array
+          value.each { |element| raise_nested_error(element) }
+        when Hash
+          value.each do |key, element|
+            raise_nested_error(key)
+            raise_nested_error(element)
+          end
         end
       end
 
@@ -140,9 +168,12 @@ module SolidRedis
       end
 
       def fill_buffer
+        wait_for = :readable
         loop do
           if @io.respond_to?(:to_io)
-            unless IO.select([@io], nil, nil, @read_timeout)
+            readers = wait_for == :readable ? [@io] : nil
+            writers = wait_for == :writable ? [@io] : nil
+            unless IO.select(readers, writers, nil, @read_timeout)
               raise TimeoutError, "Redis read timed out after #{@read_timeout}s"
             end
 
@@ -151,7 +182,10 @@ module SolidRedis
             chunk = @io.read(16_384)
           end
 
-          next if chunk == :wait_readable
+          if chunk == :wait_readable || chunk == :wait_writable
+            wait_for = chunk == :wait_readable ? :readable : :writable
+            next
+          end
           raise EOFError if chunk.nil?
 
           @buffer << chunk

data/lib/solid_redis/subscription.rb

@@ -75,6 +75,9 @@ module SolidRedis
         return unless @reader.wait_readable(timeout)
 
         return decode(@reader.read)
+      rescue ProtocolError => error
+        handle_error(error)
+        raise
       rescue ConnectionError, IO::WaitReadable, IO::WaitWritable, SystemCallError => error
         handle_error(error)
         raise error if attempts >= config.reconnect_attempts
@@ -123,6 +126,9 @@ module SolidRedis
       loop do
         ensure_connected
         return write(RESP.encode(yield))
+      rescue ProtocolError => error
+        handle_error(error)
+        raise
       rescue ConnectionError, IO::WaitReadable, IO::WaitWritable, SystemCallError => error
         handle_error(error)
         raise error if attempts >= config.reconnect_attempts

data/lib/solid_redis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidRedis
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid-redis
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nicolas Vandenbogaerde
@@ -104,7 +104,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  documentation_uri: https://www.rubydoc.info/gems/solid-redis/1.0.2
+  documentation_uri: https://www.rubydoc.info/gems/solid-redis/1.0.3
   source_code_uri: https://github.com/nicolasva/solid-redis
   changelog_uri: https://github.com/nicolasva/solid-redis/blob/main/CHANGELOG.md
 rdoc_options: []