hiredis-client 0.22.2 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd9b778e1204bac29d3ca9ebea612bf117a1c60a3423d9a2ca8af95525ca081
-  data.tar.gz: b24b71653afb4da0b6733f61272edb161983a2baedb48554a39be671056fb896
+  metadata.gz: 119463fcaf132ff2c8f57dee7ea75253b56f7b1550c61a8d2d533655054459df
+  data.tar.gz: 0e0ee26428dbad181242270ffa21bbf6f1f48071737af9d5f47896ad082908bb
 SHA512:
-  metadata.gz: 73280748aba20c1794d0e7cc1e8f92d62a5fe7495eb0284f9a38f766af1bf45e6fd2165b1dac0ef9ab035ca17466133d7fec8b326911eb64872837953ef2ce57
-  data.tar.gz: c4f6ca4d2b079c1f022d83849c2efb6052b8157afb16349a297df1d1edb8baf40994d354bc271bbe8af137b67df5c2ca4b962f853da610bf7d5b44e8e09782c8
+  metadata.gz: 394d49dbed0c4479237125656b4e8c75fe6b35189fb3e28279f18cd05873e91a1cea88185834a77065be750d4edc8c0c7f071dd0daae51471f5cbacbfb666362
+  data.tar.gz: 9ee93b3a4815bcdf51f07991ffecb3a00c5db4bd699c620f1cf53221975fbde8b33a03c20216be2b07c3a2952176cc356db7d1618c1cc35ee1829e01bbd311af

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -321,6 +321,7 @@ typedef struct {
     struct timeval connect_timeout;
     struct timeval read_timeout;
     struct timeval write_timeout;
+    hiredis_reader_state_t reader_state;
 } hiredis_connection_t;
 
 static void hiredis_connection_free(void *ptr) {
@@ -719,74 +720,47 @@ static VALUE hiredis_flush(VALUE self) {
 
 static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply) {
     void *redis_reply = NULL;
-    int wdone = 0;
 
-    // This struct being on the stack, the GC won't move nor collect that `stack` RArray.
+    // This array being on the stack, the GC won't move nor collect it.
     // We use that to avoid having to have a `mark` function with write barriers.
     // Not that it would be too hard, but if we mark the response objects, we'll likely end up
     // promoting them to the old generation which isn't desirable.
     VALUE stack = rb_ary_new();
-    hiredis_reader_state_t reader_state = {
-        .stack = stack,
-        .task_index = &connection->context->reader->ridx,
-    };
-    connection->context->reader->privdata = &reader_state;
+    connection->reader_state.stack = stack;
+    connection->reader_state.task_index = &connection->context->reader->ridx;
+    connection->context->reader->privdata = &connection->reader_state;
 
     /* Try to read pending replies */
     if (redisGetReplyFromReader(connection->context, &redis_reply) == REDIS_ERR) {
         return HIREDIS_FATAL_CONNECTION_ERROR; // Protocol error
     }
 
-    if (redis_reply == NULL) {
-        /* Write until the write buffer is drained */
-        while (!wdone) {
-            errno = 0;
-
-            if (hiredis_buffer_write_nogvl(connection->context, &wdone) == REDIS_ERR) {
-                return HIREDIS_FATAL_CONNECTION_ERROR; // Socket error
-            }
-
-            if (errno == EAGAIN) {
-                int writable = 0;
-
-                if (hiredis_wait_writable(connection->context->fd, &connection->write_timeout, &writable) < 0) {
-                    return HIREDIS_CLIENT_TIMEOUT;
-                }
+    /* Read until there is a full reply */
+    while (redis_reply == NULL) {
+        errno = 0;
 
-                if (!writable) {
-                    errno = EAGAIN;
-                    return HIREDIS_CLIENT_TIMEOUT;
-                }
-            }
+        if (hiredis_buffer_read_nogvl(connection->context) == REDIS_ERR) {
+            return HIREDIS_FATAL_CONNECTION_ERROR; // Socket error
         }
 
-        /* Read until there is a full reply */
-        while (redis_reply == NULL) {
-            errno = 0;
+        if (errno == EAGAIN) {
+            int readable = 0;
 
-            if (hiredis_buffer_read_nogvl(connection->context) == REDIS_ERR) {
-                return HIREDIS_FATAL_CONNECTION_ERROR; // Socket error
+            if (hiredis_wait_readable(connection->context->fd, &connection->read_timeout, &readable) < 0) {
+                return HIREDIS_CLIENT_TIMEOUT;
             }
 
-            if (errno == EAGAIN) {
-                int readable = 0;
-
-                if (hiredis_wait_readable(connection->context->fd, &connection->read_timeout, &readable) < 0) {
-                    return HIREDIS_CLIENT_TIMEOUT;
-                }
-
-                if (!readable) {
-                    errno = EAGAIN;
-                    return HIREDIS_CLIENT_TIMEOUT;
-                }
-
-                /* Retry */
-                continue;
+            if (!readable) {
+                errno = EAGAIN;
+                return HIREDIS_CLIENT_TIMEOUT;
             }
 
-            if (redisGetReplyFromReader(connection->context, &redis_reply) == REDIS_ERR) {
-                return HIREDIS_FATAL_CONNECTION_ERROR; // Protocol error
-            }
+            /* Retry */
+            continue;
+        }
+
+        if (redisGetReplyFromReader(connection->context, &redis_reply) == REDIS_ERR) {
+            return HIREDIS_FATAL_CONNECTION_ERROR; // Protocol error
         }
     }
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hiredis-client
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.23.1
 platform: ruby
 authors:
 - Jean Boussier
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -16,15 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.2
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.2
-description:
+        version: 0.23.1
 email:
 - jean.boussier@gmail.com
 executables: []
@@ -79,7 +77,6 @@ files:
 - ext/redis_client/hiredis/vendor/test.c
 - ext/redis_client/hiredis/vendor/test.sh
 - ext/redis_client/hiredis/vendor/win32.h
-- hiredis-client.gemspec
 - lib/hiredis-client.rb
 - lib/redis_client/hiredis_connection.rb
 homepage: https://github.com/redis-rb/redis-client
@@ -90,7 +87,6 @@ metadata:
   homepage_uri: https://github.com/redis-rb/redis-client
   source_code_uri: https://github.com/redis-rb/redis-client
   changelog_uri: https://github.com/redis-rb/redis-client/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Hiredis binding for redis-client
 test_files: []

data/hiredis-client.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../lib/redis_client/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "hiredis-client"
-  spec.version = RedisClient::VERSION
-  spec.authors = ["Jean Boussier"]
-  spec.email = ["jean.boussier@gmail.com"]
-
-  spec.summary = "Hiredis binding for redis-client"
-  spec.homepage = "https://github.com/redis-rb/redis-client"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = File.join(spec.homepage, "blob/master/CHANGELOG.md")
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features|benchmark)/|\.(?:git|rubocop))})
-    end
-  end
-  spec.require_paths = ["lib"]
-  spec.extensions = ["ext/redis_client/hiredis/extconf.rb"]
-
-  spec.add_runtime_dependency "redis-client", RedisClient::VERSION
-end