ilios 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d98a43ed2e7d55fc61fa938bf98da7ae866518af91ac38c169bc96b10fedf9db
-  data.tar.gz: b09d0ed06e5ff7466d99265c20d4cf43a1b2c9e88701a112e7afd48985ea2854
+  metadata.gz: 7794c439a6a3b6c6f0362b2b1d4b20b553727473320921d6c370a524e6863c39
+  data.tar.gz: 8d01681e24c7b822f3a4e96837f4682cbb139527c1660a1d2db7371ff9cba551
 SHA512:
-  metadata.gz: 276136abb5f4ec998acc5301b2dd069816206c46a1bcc44005587a7454b3661014a31011a814f2f9863dae7eb83fd9c62a31b27fa0769edc5da0632cc0b06d15
-  data.tar.gz: 938c8bdf76528f5c953c81df64e76fba4230af03a8af14693fa9cb7cb53638d09b37643510eb68263b1014b7d0fa57bdd54031898666f8ce6599485c40ac8e2c
+  metadata.gz: 7b2e96c2adcf02b602ba9e97d2ba25bbecd3816106519ab3b61e97f814df033f01650bbd2a99fc9b7475f26e2cc598c6a864b1098215a9742be65ee80a3695ad
+  data.tar.gz: 3d5ca806b3f682fe2427e3f3cd091ceacd8a98e5894479ddf6bd5cbcb721f58ca4e64cb4a2e3e318b7aff36ed09a851791d04403cc185d4f03adbefeb045c385

data/ext/ilios/cluster.c

@@ -135,35 +135,35 @@ static VALUE cluster_keyspace(VALUE self, VALUE keyspace)
 }
 
 /**
- * Sets the timeout for connecting to a node.
- * Default is +5000+ milliseconds.
+ * Sets the protocol version. The driver will automatically downgrade to the lowest supported protocol version.
+ * Default is +PROTOCOL_VERSION_V4+.
  *
  * @param timeout_ms [Integer] A connect timeout in milliseconds.
  * @return [Cassandra::Cluster] self.
  */
-static VALUE cluster_connect_timeout(VALUE self, VALUE timeout_ms)
+static VALUE cluster_protocol_version(VALUE self, VALUE version)
 {
     CassandraCluster *cassandra_cluster;
 
     GET_CLUSTER(self, cassandra_cluster);
-    cass_cluster_set_connect_timeout(cassandra_cluster->cluster, NUM2UINT(timeout_ms));
+    cass_cluster_set_protocol_version(cassandra_cluster->cluster, NUM2INT(version));
 
     return self;
 }
 
 /**
- * Sets the protocol version. The driver will automatically downgrade to the lowest supported protocol version.
- * Default is +PROTOCOL_VERSION_V4+.
+ * Sets the timeout for connecting to a node.
+ * Default is +5000+ milliseconds.
  *
  * @param timeout_ms [Integer] A connect timeout in milliseconds.
  * @return [Cassandra::Cluster] self.
  */
-static VALUE cluster_protocol_version(VALUE self, VALUE version)
+static VALUE cluster_connect_timeout(VALUE self, VALUE timeout_ms)
 {
     CassandraCluster *cassandra_cluster;
 
     GET_CLUSTER(self, cassandra_cluster);
-    cass_cluster_set_protocol_version(cassandra_cluster->cluster, NUM2INT(version));
+    cass_cluster_set_connect_timeout(cassandra_cluster->cluster, NUM2UINT(timeout_ms));
 
     return self;
 }

data/ext/ilios/future.c

@@ -33,10 +33,23 @@ static void future_thread_pool_init(future_thread_pool *pool)
 {
     pool->queue = rb_funcall(cQueue, id_new, 0);
     rb_gc_register_mark_object(pool->queue);
+}
+
+static void future_thread_pool_prepare_thread(future_thread_pool *pool)
+{
+    VALUE status;
 
     for (int i = 0; i < THREAD_MAX; i++) {
-        pool->thread[i] = rb_thread_create(future_result_yielder_thread, (void*)pool);
-        rb_gc_register_mark_object(pool->thread[i]);
+        status = Qfalse;
+
+        if (pool->thread[i]) {
+            status = rb_funcall(pool->thread[i], id_alive, 0);
+        }
+        if (!pool->thread[i] || !RTEST(status)) {
+            pool->thread[i] = rb_thread_create(future_result_yielder_thread, (void*)pool);
+            rb_funcall(pool->thread[i], id_report_on_exception, 1, Qtrue);
+            rb_gc_register_address(&pool->thread[i]);
+        }
     }
 }
 
@@ -58,6 +71,7 @@ static inline future_thread_pool *future_thread_pool_get(CassandraFuture *cassan
 static inline void future_queue_push(future_thread_pool *pool, VALUE future)
 {
     rb_funcall(pool->queue, id_push, 1, future);
+    future_thread_pool_prepare_thread(pool);
 }
 
 static inline VALUE future_queue_pop(future_thread_pool *pool)
@@ -137,7 +151,6 @@ static VALUE future_result_yielder_body(VALUE future)
 
     nogvl_future_wait(cassandra_future->future);
     return rb_mutex_synchronize(cassandra_future->proc_mutex, future_result_yielder_synchronize, future);
-
 }
 
 static VALUE future_result_yielder_ensure(VALUE future)
@@ -290,7 +303,7 @@ static VALUE future_await(VALUE self)
     GET_FUTURE(self, cassandra_future);
 
     if (cassandra_future->already_waited) {
-        rb_raise(eExecutionError, "It should not call twice");
+        return self;
     }
 
     if (cassandra_future->on_success_block || cassandra_future->on_failure_block) {

data/ext/ilios/ilios.c

@@ -17,6 +17,8 @@ VALUE id_to_time;
 VALUE id_new;
 VALUE id_push;
 VALUE id_pop;
+VALUE id_alive;
+VALUE id_report_on_exception;
 VALUE sym_unsupported_column_type;
 
 #if defined(HAVE_MALLOC_USABLE_SIZE)
@@ -77,6 +79,8 @@ void Init_ilios(void)
     id_new = rb_intern("new");
     id_push = rb_intern("push");
     id_pop = rb_intern("pop");
+    id_alive = rb_intern("alive?");
+    id_report_on_exception = rb_intern("report_on_exception=");
     sym_unsupported_column_type = ID2SYM(rb_intern("unsupported_column_type"));
 
     Init_cluster();

data/ext/ilios/ilios.h

@@ -91,6 +91,8 @@ extern VALUE id_to_time;
 extern VALUE id_new;
 extern VALUE id_push;
 extern VALUE id_pop;
+extern VALUE id_alive;
+extern VALUE id_report_on_exception;
 extern VALUE sym_unsupported_column_type;
 
 extern void Init_cluster(void);

data/lib/ilios/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '0.4.5'
+  VERSION = '0.4.7'
   public_constant :VERSION
 
   CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -77,7 +77,7 @@ metadata:
   homepage_uri: https://github.com/Watson1978/ilios
   source_code_uri: https://github.com/Watson1978/ilios
   bug_tracker_uri: https://github.com/Watson1978/ilios/issues
-  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.5
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.7
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []