hiredis-client 0.5.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba2a16ce75c627a3bdf88b08b484718e32d352c03a21c5d3d7c96201453952b8
-  data.tar.gz: 4d75701dadbf783d8426bd0225e35e3388845c4303a61e1b28122aac664c4f47
+  metadata.gz: 4a1e6c581e8cdaf2e39e684939f9747503d80f2573065d18a43b9002a83005f3
+  data.tar.gz: d3a82df8aa27552818f25757fadc2e9789cecd2e149051a05379f6361f618bab
 SHA512:
-  metadata.gz: 92aa71bb1f4b460b06278fb026b0b12edfbc8bb8f2edb4a8a7e006d1afdfbd9f34e665c8592b0245b2355742b4922c37ea42412adbf0ee36b188c0a7817f07f4
-  data.tar.gz: f8af4f856b5e48bc75ef12520a62c0010e02976ea6961cdb9d50087cdf7b654f8b7c58b267aef4d1fa3535c0449c08f17fcf163c6abcdfdf8fad9f81086d8092
+  metadata.gz: b06e2e1ace5bac902ce44d25e1739f4597ef2b22604c34ba769b79c261fb0e72f31b6e94fe7c7dbd7d950f3bed692bac113cf60bdb7fc11f21c8ac28ae2a8a0f
+  data.tar.gz: 714b5eb43dfd5236ace702d9ed47301720c422db22ee501678e30ad143d1d1a9d187d66d2e555b31442bb4e3dbbdc4dbae03faca6a6277e9e84315e6869b9a3c

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -31,6 +31,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ruby.h"
+#include "ruby/thread.h"
 #include "ruby/encoding.h"
 #include <errno.h>
 #include <sys/socket.h>
@@ -45,15 +46,15 @@ static inline VALUE rb_hash_new_capa(long capa)
 }
 #endif
 
-static VALUE rb_cSet, rb_eRedisClientCommandError, rb_eRedisClientConnectionError;
-static VALUE rb_eRedisClientConnectTimeoutError, rb_eRedisClientReadTimeoutError, rb_eRedisClientWriteTimeoutError;
-static ID id_parse, id_add, id_new;
+static VALUE rb_eRedisClientCommandError, rb_eRedisClientConnectionError, rb_eRedisClientCannotConnectError, rb_eRedisClientProtocolError;
+static VALUE rb_eRedisClientReadTimeoutError, rb_eRedisClientWriteTimeoutError;
+static ID id_parse;
 
 typedef struct {
     redisSSLContext *context;
 } hiredis_ssl_context_t;
 
-#define ENSURE_CONNECTED(connection) if (!connection->context) rb_raise(rb_eRuntimeError, "[BUG] not connected");
+#define ENSURE_CONNECTED(connection) if (!connection->context) rb_raise(rb_eRedisClientConnectionError, "Not connected");
 
 #define SSL_CONTEXT(from, name) \
     hiredis_ssl_context_t *name = NULL; \
@@ -126,6 +127,7 @@ static void *reply_append(const redisReadTask *task, VALUE value) {
 
         switch (task->parent->type) {
             case REDIS_REPLY_ARRAY:
+            case REDIS_REPLY_SET:
             case REDIS_REPLY_PUSH:
                 rb_ary_store(parent, task->idx, value);
                 break;
@@ -138,9 +140,6 @@ static void *reply_append(const redisReadTask *task, VALUE value) {
                     task->parent->privdata = (void*)value;
                 }
                 break;
-            case REDIS_REPLY_SET:
-                rb_funcall(parent, id_add, 1, value);
-                break;
             default:
                 rb_bug("[hiredis] Unexpected task parent type %d", task->parent->type);
                 break;
@@ -150,6 +149,12 @@ static void *reply_append(const redisReadTask *task, VALUE value) {
 }
 
 static void *reply_create_string(const redisReadTask *task, char *cstr, size_t len) {
+    if (len >= 4 && task->type == REDIS_REPLY_VERB) {
+        // Skip 4 bytes of verbatim type header.
+        cstr += 4;
+        len -= 4;
+    }
+
     VALUE string = rb_external_str_new(cstr, len);
     if (rb_enc_str_coderange(string) == ENC_CODERANGE_BROKEN) {
         rb_enc_associate(string, rb_ascii8bit_encoding());
@@ -170,14 +175,12 @@ static void *reply_create_array(const redisReadTask *task, size_t elements) {
     switch (task->type) {
         case REDIS_REPLY_PUSH:
         case REDIS_REPLY_ARRAY:
+        case REDIS_REPLY_SET:
             value = rb_ary_new_capa(elements);
             break;
         case REDIS_REPLY_MAP:
             value = rb_hash_new_capa(elements / 2);
             break;
-        case REDIS_REPLY_SET:
-            value = rb_funcallv(rb_cSet, id_new, 0, NULL);
-            break;
         default:
             rb_bug("[hiredis] Unexpected create array type %d", task->parent->type);
             break;
@@ -325,6 +328,8 @@ static inline void redis_raise_error_and_disconnect(redisContext *context, VALUE
     case REDIS_ERR_IO:
         rb_sys_fail(0);
         break;
+    case REDIS_ERR_PROTOCOL:
+        rb_raise(rb_eRedisClientProtocolError, "%s", errstr);
     default:
         /* Raise something else */
         rb_raise(rb_eRedisClientConnectionError, "%s", errstr);
@@ -420,7 +425,7 @@ static int hiredis_wait_writable(int fd, const struct timeval *timeout, int *iss
 
 static VALUE hiredis_connect_finish(hiredis_connection_t *connection, redisContext *context) {
     if (context->err) {
-        redis_raise_error_and_disconnect(context, rb_eRedisClientConnectTimeoutError);
+        redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     int writable = 0;
@@ -429,23 +434,23 @@ static VALUE hiredis_connect_finish(hiredis_connection_t *connection, redisConte
 
     /* Wait for socket to become writable */
     if (hiredis_wait_writable(context->fd, &connection->connect_timeout, &writable) < 0) {
-        redis_raise_error_and_disconnect(context, rb_eRedisClientConnectTimeoutError);
+        redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     if (!writable) {
         errno = ETIMEDOUT;
-        redis_raise_error_and_disconnect(context, rb_eRedisClientConnectTimeoutError);
+        redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     /* Check for socket error */
     if (getsockopt(context->fd, SOL_SOCKET, SO_ERROR, &optval, &optlen) < 0) {
         context->err = REDIS_ERR_IO;
-        redis_raise_error_and_disconnect(context, rb_eRedisClientConnectTimeoutError);
+        redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     if (optval) {
         errno = optval;
-        redis_raise_error_and_disconnect(context, rb_eRedisClientConnectTimeoutError);
+        redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     context->reader->fn = &reply_functions;
@@ -477,7 +482,7 @@ static VALUE hiredis_init_ssl(VALUE self, VALUE ssl_param) {
     SSL_CONTEXT(ssl_param, ssl_context)
 
     if (redisInitiateSSLWithContext(connection->context, ssl_context->context) != REDIS_OK) {
-        hiredis_raise_error_and_disconnect(connection, rb_eRedisClientConnectTimeoutError);
+        hiredis_raise_error_and_disconnect(connection, rb_eRedisClientCannotConnectError);
     }
 
     redisSSL *redis_ssl = redisGetSSLSocket(connection->context);
@@ -485,15 +490,15 @@ static VALUE hiredis_init_ssl(VALUE self, VALUE ssl_param) {
     if (redis_ssl->wantRead) {
         int readable = 0;
         if (hiredis_wait_readable(connection->context->fd, &connection->connect_timeout, &readable) < 0) {
-            hiredis_raise_error_and_disconnect(connection, rb_eRedisClientConnectTimeoutError);
+            hiredis_raise_error_and_disconnect(connection, rb_eRedisClientCannotConnectError);
         }
         if (!readable) {
             errno = EAGAIN;
-            hiredis_raise_error_and_disconnect(connection, rb_eRedisClientConnectTimeoutError);
+            hiredis_raise_error_and_disconnect(connection, rb_eRedisClientCannotConnectError);
         }
 
         if (redisInitiateSSLContinue(connection->context) != REDIS_OK) {
-            hiredis_raise_error_and_disconnect(connection, rb_eRedisClientConnectTimeoutError);
+            hiredis_raise_error_and_disconnect(connection, rb_eRedisClientCannotConnectError);
         };
     }
 
@@ -530,6 +535,44 @@ static VALUE hiredis_write(VALUE self, VALUE command) {
     return Qnil;
 }
 
+typedef struct {
+    redisContext *context;
+    int return_value;
+} hiredis_buffer_read_args_t;
+
+void *hiredis_buffer_read_safe(void *_args) {
+    hiredis_buffer_read_args_t *args = _args;
+    args->return_value = redisBufferRead(args->context);
+    return NULL;
+}
+int hiredis_buffer_read_nogvl(redisContext *context) {
+    hiredis_buffer_read_args_t args = {
+        .context = context,
+    };
+    rb_thread_call_without_gvl(hiredis_buffer_read_safe, &args, RUBY_UBF_IO, 0);
+    return args.return_value;
+}
+
+typedef struct {
+    redisContext *context;
+    int *done;
+    int return_value;
+} hiredis_buffer_write_args_t;
+
+void *hiredis_buffer_write_safe(void *_args) {
+    hiredis_buffer_write_args_t *args = _args;
+    args->return_value = redisBufferWrite(args->context, args->done);
+    return NULL;
+}
+int hiredis_buffer_write_nogvl(redisContext *context, int *done) {
+    hiredis_buffer_write_args_t args = {
+        .context = context,
+        .done = done,
+    };
+    rb_thread_call_without_gvl(hiredis_buffer_write_safe, &args, RUBY_UBF_IO, 0);
+    return args.return_value;
+}
+
 static VALUE hiredis_flush(VALUE self) {
     CONNECTION(self, connection);
     ENSURE_CONNECTED(connection);
@@ -537,7 +580,7 @@ static VALUE hiredis_flush(VALUE self) {
     int wdone = 0;
     while (!wdone) {
         errno = 0;
-        if (redisBufferWrite(connection->context, &wdone) == REDIS_ERR) {
+        if (hiredis_buffer_write_nogvl(connection->context, &wdone) == REDIS_ERR) {
             if (errno == EAGAIN) {
                 int writable = 0;
 
@@ -573,7 +616,7 @@ static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply)
         while (!wdone) {
             errno = 0;
 
-            if (redisBufferWrite(connection->context, &wdone) == REDIS_ERR) {
+            if (hiredis_buffer_write_nogvl(connection->context, &wdone) == REDIS_ERR) {
                 /* Socket error */
                 return -1;
             }
@@ -596,7 +639,7 @@ static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply)
         while (redis_reply == NULL) {
             errno = 0;
 
-            if (redisBufferRead(connection->context) == REDIS_ERR) {
+            if (hiredis_buffer_read_nogvl(connection->context) == REDIS_ERR) {
                 /* Socket error */
                 return -1;
             }
@@ -662,11 +705,6 @@ void Init_hiredis_connection(void) {
     redisInitOpenSSL();
 
     id_parse = rb_intern("parse");
-    id_add = rb_intern("add");
-    id_new = rb_intern("new");
-
-    rb_cSet = rb_const_get(rb_cObject, rb_intern("Set"));
-    rb_global_variable(&rb_cSet);
 
     VALUE rb_cRedisClient = rb_const_get(rb_cObject, rb_intern("RedisClient"));
 
@@ -676,8 +714,11 @@ void Init_hiredis_connection(void) {
     rb_eRedisClientConnectionError = rb_const_get(rb_cRedisClient, rb_intern("ConnectionError"));
     rb_global_variable(&rb_eRedisClientConnectionError);
 
-    rb_eRedisClientConnectTimeoutError = rb_const_get(rb_cRedisClient, rb_intern("ConnectTimeoutError"));
-    rb_global_variable(&rb_eRedisClientConnectTimeoutError);
+    rb_eRedisClientCannotConnectError = rb_const_get(rb_cRedisClient, rb_intern("CannotConnectError"));
+    rb_global_variable(&rb_eRedisClientCannotConnectError);
+
+    rb_eRedisClientProtocolError = rb_const_get(rb_cRedisClient, rb_intern("ProtocolError"));
+    rb_global_variable(&rb_eRedisClientProtocolError);
 
     rb_eRedisClientReadTimeoutError = rb_const_get(rb_cRedisClient, rb_intern("ReadTimeoutError"));
     rb_global_variable(&rb_eRedisClientReadTimeoutError);

data/lib/redis_client/hiredis_connection.rb

@@ -34,7 +34,11 @@ class RedisClient
       self.write_timeout = write_timeout
 
       if config.path
-        connect_unix(config.path)
+        begin
+          connect_unix(config.path)
+        rescue SystemCallError => error
+          raise CannotConnectError, error.message, error.backtrace
+        end
       else
         connect_tcp(config.host, config.port)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiredis-client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.2
 description:
 email:
 - jean.boussier@gmail.com