ilios 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c54ed7ca20c4e0633a57b33b41cbe2a8a9fe1c89134d92496fea61c1b5d6d0bb
-  data.tar.gz: dbde2f3d25981a52980fb9eaf198c90aea663f1cd99b33923227ccb2fb0d76f4
+  metadata.gz: 1e873b74dbb71ac4a950cf02eed7f2edf1207e8e2aabfd70575643b981af4f6c
+  data.tar.gz: 8312031b4094cc1a8849ca87530960e8140109a520e08421ed5ef9c21418f3ce
 SHA512:
-  metadata.gz: 2db32fe42576c2a1add3b44903c2e4b93b163f240b5adc668ecbc18ea44f1611d007737657798e11e06125e8eda86a92994716b1b6ce74231a4c6d14d901f3f9
-  data.tar.gz: ea74e0a82689fdae39a2924c1c5feccf1a334588eb239d0bddbc0878e4811b703cc53e2c6d873a26c8c8e05b9529a1280ffc07eabd025a96a860b01a9ec6a43f
+  metadata.gz: 86df26c6d95ec57893a84a77e032d3380fb6f6e7f0bda23b59b8e8a8e170bea2a98c2fa1db32c9e7860220a6b3768fec3048c823c8093c23efdc87a16604d4a1
+  data.tar.gz: 51357dab484bf3ef443db260292c62f9f45cff02a40439d80f1ca580bcf828816bfe38db916a448a350b89b3e78ae5dafaa0ec7e1756b6a92f228070e6dcdfc2

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 gem 'minitest', '~> 5.20'
 gem 'rake', '~> 13.0'
 gem 'rake-compiler', '~> 1.2'
+gem 'rbs', '~> 3.4'
 gem 'rubocop', '~> 1.57'
 gem 'rubocop-minitest', '~> 0.33.0'
 gem 'rubocop-performance', '~> 1.19'

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Watson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,5 +1,8 @@
 # Ilios
 
+[![Gem Version](https://badge.fury.io/rb/ilios.svg)](https://badge.fury.io/rb/ilios)
+[![CI](https://github.com/Watson1978/ilios/actions/workflows/CI.yml/badge.svg)](https://github.com/Watson1978/ilios/actions/workflows/CI.yml)
+
 Ilios that Cassandra driver written by C language for Ruby using [DataStax C/C++ Driver](https://github.com/datastax/cpp-driver).
 
 ## Installation

data/Rakefile

@@ -14,3 +14,13 @@ end
 Rake::TestTask.new do |task|
   task.pattern = 'test/test_*.rb'
 end
+
+namespace :rbs do
+  desc 'Validate RBS definitions'
+  task :validate do
+    all_sigs = Dir.glob('sig').map { |dir| "-I #{dir}" }.join(' ')
+    sh("bundle exec rbs #{all_sigs} validate") do |ok, _|
+      abort('one or more rbs validate failed') unless ok
+    end
+  end
+end

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   cassandra:
-    image: cassandra:5
+    image: cassandra:4
     ports:
     - 9042:9042
     volumes:

data/ext/ilios/cluster.c

@@ -49,6 +49,7 @@ static VALUE cluster_connect(VALUE self)
 {
     CassandraSession *cassandra_session;
     CassandraCluster *cassandra_cluster;
+    CassFuture* connect_future;
     VALUE cassandra_session_obj;
     const char *keyspace = "";
 
@@ -60,16 +61,18 @@ static VALUE cluster_connect(VALUE self)
     cassandra_session_obj = CREATE_SESSION(cassandra_session);
     cassandra_session->cluster_obj = self;
     cassandra_session->session = cass_session_new();
-    cassandra_session->connect_future = cass_session_connect_keyspace(cassandra_session->session, cassandra_cluster->cluster, keyspace);
-    nogvl_future_wait(cassandra_session->connect_future);
+    connect_future = cass_session_connect_keyspace(cassandra_session->session, cassandra_cluster->cluster, keyspace);
+    nogvl_future_wait(connect_future);
 
-    if (cass_future_error_code(cassandra_session->connect_future) != CASS_OK) {
+    if (cass_future_error_code(connect_future) != CASS_OK) {
         char error[4096] = { 0 };
 
-        strncpy(error, cass_error_desc(cass_future_error_code(cassandra_session->connect_future)), sizeof(error) - 1);
+        strncpy(error, cass_error_desc(cass_future_error_code(connect_future)), sizeof(error) - 1);
+        cass_future_free(connect_future);
         rb_raise(eConnectError, "Unable to connect: %s", error);
         return Qnil;
     }
+    cass_future_free(connect_future);
 
     return cassandra_session_obj;
 }

data/ext/ilios/extconf.rb

@@ -4,7 +4,6 @@ require File.expand_path('../../lib/ilios/version', __dir__)
 require 'fileutils'
 require 'mini_portile2'
 require 'mkmf'
-require 'native-package-installer'
 
 have_func('malloc_usable_size')
 have_func('malloc_size')
@@ -24,6 +23,7 @@ def num_cpu_cores
     end
 
   return 1 if cores <= 0
+
   cores >= 7 ? MAX_CORES : cores
 end
 
@@ -40,25 +40,9 @@ module LibuvInstaller
   end
 
   def self.install
-    return if install_from_package
-
     install_from_source
   end
 
-  def self.install_from_package
-    NativePackageInstaller.install(
-      alpine_linux: 'libuv-dev',
-      alt_linux: 'libuv',
-      arch_linux: 'libuv',
-      debian: 'libuv1-dev',
-      freebsd: 'libuv',
-      gentoo_linux: 'libuv',
-      homebrew: 'libuv',
-      macports: 'libuv',
-      redhat: 'libuv-devel'
-    )
-  end
-
   def self.install_from_source
     unless File.exist?(LIBUV_INSTALL_PATH)
       libuv_recipe = LibuvRecipe.new('libuv', Ilios::LIBUV_VERSION, make_command: "make -j #{num_cpu_cores}")
@@ -158,4 +142,7 @@ else
   CassandraDriverInstaller.install
 end
 
+$CPPFLAGS += " #{ENV['CPPFLAGS']}"
+$LDFLAGS += " #{ENV['LDFLAGS']}"
+
 create_makefile('ilios')

data/ext/ilios/future.c

@@ -195,31 +195,12 @@ VALUE future_create(CassFuture *future, VALUE session, future_kind kind)
     return cassandra_future_obj;
 }
 
-/**
- * Run block when future resolves to a value.
- *
- * @yieldparam value [Cassandra::Statement, Cassandra::Result] A value.
- *   Yields +Cassandra::Statement+ object when future was created by +Cassandra::Session#prepare_async+.
- *   Yields +Cassandra::Result+ object when future was created by +Cassandra::Session#execute_async+.
- * @return [Cassandra::Future] self.
- * @raise [Cassandra::ExecutionError] If this method will be called twice.
- * @raise [ArgumentError] If no block was given.
- */
-static VALUE future_on_success(VALUE self)
+static VALUE future_on_success_synchronize(VALUE future)
 {
     CassandraFuture *cassandra_future;
     bool wakeup_thread = false;
 
-    GET_FUTURE(self, cassandra_future);
-
-    if (cassandra_future->on_success_block) {
-        rb_raise(eExecutionError, "It should not call twice");
-    }
-    if (!rb_block_given_p()) {
-        rb_raise(rb_eArgError, "no block given");
-    }
-
-    rb_mutex_lock(cassandra_future->proc_mutex);
+    GET_FUTURE(future, cassandra_future);
 
     if (!cassandra_future->on_failure_block) {
         // Invoke the callback with thread pool only once
@@ -229,44 +210,52 @@ static VALUE future_on_success(VALUE self)
     cassandra_future->on_success_block = rb_block_proc();
 
     if (cass_future_ready(cassandra_future->future)) {
-        rb_mutex_unlock(cassandra_future->proc_mutex);
         uv_sem_post(&cassandra_future->sem);
         if (cass_future_error_code(cassandra_future->future) == CASS_OK) {
             future_result_success_yield(cassandra_future);
         }
-        return self;
+        return future;
     }
 
     if (wakeup_thread) {
-        future_queue_push(future_thread_pool_get(cassandra_future), self);
+        future_queue_push(future_thread_pool_get(cassandra_future), future);
     }
-    rb_mutex_unlock(cassandra_future->proc_mutex);
 
-    return self;
+    return future;
 }
 
 /**
- * Run block when future resolves to error.
+ * Run block when future resolves to a value.
  *
+ * @yieldparam value [Cassandra::Statement, Cassandra::Result] A value.
+ *   Yields +Cassandra::Statement+ object when future was created by +Cassandra::Session#prepare_async+.
+ *   Yields +Cassandra::Result+ object when future was created by +Cassandra::Session#execute_async+.
  * @return [Cassandra::Future] self.
  * @raise [Cassandra::ExecutionError] If this method will be called twice.
  * @raise [ArgumentError] If no block was given.
  */
-static VALUE future_on_failure(VALUE self)
+static VALUE future_on_success(VALUE self)
 {
     CassandraFuture *cassandra_future;
-    bool wakeup_thread = false;
 
     GET_FUTURE(self, cassandra_future);
 
-    if (cassandra_future->on_failure_block) {
+    if (cassandra_future->on_success_block) {
         rb_raise(eExecutionError, "It should not call twice");
     }
     if (!rb_block_given_p()) {
         rb_raise(rb_eArgError, "no block given");
     }
 
-    rb_mutex_lock(cassandra_future->proc_mutex);
+    return rb_mutex_synchronize(cassandra_future->proc_mutex, future_on_success_synchronize, self);
+}
+
+static VALUE future_on_failure_synchronize(VALUE future)
+{
+    CassandraFuture *cassandra_future;
+    bool wakeup_thread = false;
+
+    GET_FUTURE(future, cassandra_future);
 
     if (!cassandra_future->on_success_block) {
         // Invoke the callback with thread pool only once
@@ -276,20 +265,41 @@ static VALUE future_on_failure(VALUE self)
     cassandra_future->on_failure_block = rb_block_proc();
 
     if (cass_future_ready(cassandra_future->future)) {
-        rb_mutex_unlock(cassandra_future->proc_mutex);
         uv_sem_post(&cassandra_future->sem);
         if (cass_future_error_code(cassandra_future->future) != CASS_OK) {
             future_result_failure_yield(cassandra_future);
         }
-        return self;
+        return future;
     }
 
     if (wakeup_thread) {
-        future_queue_push(future_thread_pool_get(cassandra_future), self);
+        future_queue_push(future_thread_pool_get(cassandra_future), future);
     }
-    rb_mutex_unlock(cassandra_future->proc_mutex);
 
-    return self;
+    return future;
+}
+
+/**
+ * Run block when future resolves to error.
+ *
+ * @return [Cassandra::Future] self.
+ * @raise [Cassandra::ExecutionError] If this method will be called twice.
+ * @raise [ArgumentError] If no block was given.
+ */
+static VALUE future_on_failure(VALUE self)
+{
+    CassandraFuture *cassandra_future;
+
+    GET_FUTURE(self, cassandra_future);
+
+    if (cassandra_future->on_failure_block) {
+        rb_raise(eExecutionError, "It should not call twice");
+    }
+    if (!rb_block_given_p()) {
+        rb_raise(rb_eArgError, "no block given");
+    }
+
+    return rb_mutex_synchronize(cassandra_future->proc_mutex, future_on_failure_synchronize, self);
 }
 
 /**
@@ -303,16 +313,18 @@ static VALUE future_await(VALUE self)
 
     GET_FUTURE(self, cassandra_future);
 
+    rb_mutex_lock(cassandra_future->proc_mutex);
     if (cassandra_future->already_waited) {
+        rb_mutex_unlock(cassandra_future->proc_mutex);
         return self;
     }
+    cassandra_future->already_waited = true;
+    rb_mutex_unlock(cassandra_future->proc_mutex);
 
+    nogvl_future_wait(cassandra_future->future);
     if (cassandra_future->on_success_block || cassandra_future->on_failure_block) {
         nogvl_sem_wait(&cassandra_future->sem);
-    } else {
-        nogvl_future_wait(cassandra_future->future);
     }
-    cassandra_future->already_waited = true;
     return self;
 }
 

data/ext/ilios/ilios.c

@@ -58,6 +58,18 @@ static void ilios_free(void *ptr)
     }
 }
 
+/**
+ *  Sets the log level.
+ * Default is +LOG_ERROR+.
+ *
+ * @return [Cassandra] self.
+ */
+static VALUE cassandra_set_log_level(VALUE self, VALUE log_level)
+{
+    cass_log_set_level(NUM2INT(log_level));
+    return self;
+}
+
 void Init_ilios(void)
 {
     rb_ext_ractor_safe(true);
@@ -83,6 +95,15 @@ void Init_ilios(void)
     id_report_on_exception = rb_intern("report_on_exception=");
     sym_unsupported_column_type = ID2SYM(rb_intern("unsupported_column_type"));
 
+    rb_define_module_function(mCassandra, "log_level", cassandra_set_log_level, 1);
+    rb_define_const(mCassandra, "LOG_DISABLED", INT2NUM(CASS_LOG_DISABLED));
+    rb_define_const(mCassandra, "LOG_CRITICAL", INT2NUM(CASS_LOG_CRITICAL));
+    rb_define_const(mCassandra, "LOG_ERROR", INT2NUM(CASS_LOG_ERROR));
+    rb_define_const(mCassandra, "LOG_WARN", INT2NUM(CASS_LOG_WARN));
+    rb_define_const(mCassandra, "LOG_INFO", INT2NUM(CASS_LOG_INFO));
+    rb_define_const(mCassandra, "LOG_DEBUG", INT2NUM(CASS_LOG_DEBUG));
+    rb_define_const(mCassandra, "LOG_TRACE", INT2NUM(CASS_LOG_TRACE));
+
     Init_cluster();
     Init_session();
     Init_statement();

data/ext/ilios/ilios.h

@@ -35,7 +35,6 @@ typedef struct
 typedef struct
 {
     CassSession* session;
-    CassFuture* connect_future;
     VALUE cluster_obj;
 } CassandraSession;
 

data/ext/ilios/session.c

@@ -136,9 +136,6 @@ static void session_destroy(void *ptr)
     if (cassandra_session->session) {
         cass_session_free(cassandra_session->session);
     }
-    if (cassandra_session->connect_future) {
-        cass_future_free(cassandra_session->connect_future);
-    }
     xfree(cassandra_session);
 }
 

data/ilios.gemspec

@@ -35,5 +35,4 @@ Gem::Specification.new do |spec|
   spec.extensions << 'ext/ilios/extconf.rb'
 
   spec.add_runtime_dependency('mini_portile2', '~> 2.8')
-  spec.add_runtime_dependency('native-package-installer', '~> 1.1', '>= 1.1.9')
 end

data/lib/ilios/version.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '0.4.8'
+  VERSION = '0.4.10'
   public_constant :VERSION
 
   CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'
   public_constant :CASSANDRA_CPP_DRIVER_VERSION
 
-  LIBUV_VERSION = '1.47.0'
+  LIBUV_VERSION = '1.48.0'
   public_constant :LIBUV_VERSION
 end

data/sig/ilios.rbs

@@ -2,7 +2,25 @@ module Ilios
   VERSION: String
 
   module Cassandra
+    LOG_DISABLED: Integer
+    LOG_CRITICAL: Integer
+    LOG_ERROR: Integer
+    LOG_WARN: Integer
+    LOG_INFO: Integer
+    LOG_DEBUG: Integer
+    LOG_TRACE: Integer
+
+    def self.log_level: (Integer log_level) -> self
+
     class Cluster
+      PROTOCOL_VERSION_V1: Integer
+      PROTOCOL_VERSION_V2: Integer
+      PROTOCOL_VERSION_V3: Integer
+      PROTOCOL_VERSION_V4: Integer
+      PROTOCOL_VERSION_V5: Integer
+      PROTOCOL_VERSION_DSEV1: Integer
+      PROTOCOL_VERSION_DSEV2: Integer
+
       def connect: () -> Ilios::Cassandra::Session
       def hosts: (Array[String]) -> self
       def port: (Integer) -> self
@@ -23,7 +41,7 @@ module Ilios
     end
 
     class Statement
-      def bind: (Hash[Symbol, untyped] | Hash[String, untyped]) -> self
+      def bind: (Hash[Symbol | String, untyped]) -> self
       def page_size=: (Integer) -> self
       def idempotent=: (true | false) -> self
     end
@@ -31,7 +49,7 @@ module Ilios
     class Future
       def on_success: () { (Ilios::Cassandra::Result) -> void } -> self
       def on_failure: () { () -> void } -> self
-      def await: () -> Ilios::Cassandra::Future
+      def await: () -> self
     end
 
     class Result
@@ -39,10 +57,9 @@ module Ilios
 
       include Enumerable[row_type]
 
-      def each:  () { (row_type) -> void } -> void |
-                 () -> ::Enumerator[row_type, self]
-      def next_page: () -> Ilios::Cassandra::Result |
-                     () -> nil
+      def each: () { (row_type) -> void } -> void
+              | () -> ::Enumerator[row_type, self]
+      def next_page: () -> (Ilios::Cassandra::Result | nil)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: native-package-installer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.9
 description: Cassandra driver written by C language
 email:
 - watson1978@gmail.com
@@ -54,6 +34,7 @@ extra_rdoc_files: []
 files:
 - ".yardopts"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - docker-compose.yml
@@ -77,7 +58,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.8
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.10
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []