ilios 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28970c92e0e274f14457318e1ab9ddd17dcdb197cc89084d2d58fe9b51afb14
-  data.tar.gz: 9dab2538fd742cc4f85ae9a864348a97ba6d9655ababbd633c1477781be5274d
+  metadata.gz: bfc0036bce9b2d84aa66c517c58772bc084a8377997953b149c8192e660d836a
+  data.tar.gz: be99b813f53b6abe7d1faa86fe7006e34c202d65928c64f41893c68a77cd9275
 SHA512:
-  metadata.gz: fe695966bf3b1dacf3825ceb73d689b7b38f4488fb11d3bdea777942aa0c7e5b653d2a3be2eff4cc5cc897af489583deb6ae383874a0c814e4270452091dc4b1
-  data.tar.gz: 310d435e083b862b4e890edd4195ff58363494fd7b4c47612d7cc1fbd794f80faab7da6e2fdb333b26df49326641ab87803805f39e7ff14cab0c915d8d539015
+  metadata.gz: 55fe1cc2ea9e157e81f6d52fd54aeb2e5259f5ce3e078f54260abe76423280464752e3591da167c26c1dd783413cda5ae202f884a7df3d0625ee719724b03673
+  data.tar.gz: c2315325480d67a765d0f9b8588649b9bfdc8a99fe2489c4013090faf1d9f44f3f3458258d842aab2203b49d9385fb84393b01b113f9e4debdd58a34060b29cf

data/ext/ilios/cluster.c

@@ -134,6 +134,23 @@ static VALUE cluster_keyspace(VALUE self, VALUE keyspace)
     return self;
 }
 
+/**
+ * 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_protocol_version(VALUE self, VALUE version)
+{
+    CassandraCluster *cassandra_cluster;
+
+    GET_CLUSTER(self, cassandra_cluster);
+    cass_cluster_set_protocol_version(cassandra_cluster->cluster, NUM2INT(version));
+
+    return self;
+}
+
 /**
  * Sets the timeout for connecting to a node.
  * Default is +5000+ milliseconds.
@@ -242,9 +259,17 @@ void Init_cluster(void)
     rb_define_method(cCluster, "hosts", cluster_hosts, 1);
     rb_define_method(cCluster, "port", cluster_port, 1);
     rb_define_method(cCluster, "keyspace", cluster_keyspace, 1);
+    rb_define_method(cCluster, "protocol_version", cluster_protocol_version, 1);
     rb_define_method(cCluster, "connect_timeout", cluster_connect_timeout, 1);
     rb_define_method(cCluster, "request_timeout", cluster_request_timeout, 1);
     rb_define_method(cCluster, "resolve_timeout", cluster_resolve_timeout, 1);
     rb_define_method(cCluster, "constant_speculative_execution_policy", cluster_constant_speculative_execution_policy, 2);
 
+    rb_define_const(cCluster, "PROTOCOL_VERSION_V1", INT2NUM(CASS_PROTOCOL_VERSION_V1));
+    rb_define_const(cCluster, "PROTOCOL_VERSION_V2", INT2NUM(CASS_PROTOCOL_VERSION_V2));
+    rb_define_const(cCluster, "PROTOCOL_VERSION_V3", INT2NUM(CASS_PROTOCOL_VERSION_V3));
+    rb_define_const(cCluster, "PROTOCOL_VERSION_V4", INT2NUM(CASS_PROTOCOL_VERSION_V4));
+    rb_define_const(cCluster, "PROTOCOL_VERSION_V5", INT2NUM(CASS_PROTOCOL_VERSION_V5));
+    rb_define_const(cCluster, "PROTOCOL_VERSION_DSEV1", INT2NUM(CASS_PROTOCOL_VERSION_DSEV1));
+    rb_define_const(cCluster, "PROTOCOL_VERSION_DSEV2", INT2NUM(CASS_PROTOCOL_VERSION_DSEV2));
 }

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)

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.4'
+  VERSION = '0.4.6'
   public_constant :VERSION
 
   CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'

data/sig/ilios.rbs

@@ -7,6 +7,7 @@ module Ilios
       def hosts: (Array[String]) -> self
       def port: (Integer) -> self
       def keyspace: (String) -> self
+      def protocol_version: (Integer) -> self
       def connect_timeout: (Integer) -> self
       def request_timeout: (Integer) -> self
       def resolve_timeout: (Integer) -> self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-07 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.4
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.6
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []