ilios 0.4.9 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe04ef9746b0a963eade104e22e4285eac2a5192fbb19407c6d5373d0b69e9e0
-  data.tar.gz: 66b83da5d0da081c2f737e7ce03ea4c878f62e28dfc6fc8816bece5d10ef941e
+  metadata.gz: 0def2f85dbab76062cb552bdf5263988913ea5e7bd7ecafd2681e81d91dcf5f6
+  data.tar.gz: 9c6b8696ae30614e09709ab2ba7706964c11b382d4b09361e9518d7a25d4891d
 SHA512:
-  metadata.gz: ac26a4ed1f5f37807161acde7fbb62f2268f0e81b9d81b3412eb151650ad830cf38fbdb3283b67251c8aba526d56781b4ee4419e5ebb98a7459e6cfab5f39606
-  data.tar.gz: 93a3620eea6b6af5982d0805d36350100d93340353e0ea0681bdfb4043dbfa59cdf8e4267c12989ef9620f9da99fca73b1a8d21fc412609054220bf696cdb4f0
+  metadata.gz: 68e58cdf0fb8c656428438f7b772cd9bced047f17aa711b593db533ea6a13393d831b1370b63bec6a7b5801f90ada694f10a553d3744cc05dbb9dd1695c46913
+  data.tar.gz: 5c483e7ef9ec943f7782fe20b8aa452255a21f18bd925fdcf5be9b8c1605443bf408351dac220376bfc2aa44d43fa377abcca2c173d72a77272bc30de30bf145

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/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

@@ -1,6 +1,7 @@
 #include "ilios.h"
 
 #define THREAD_MAX 5
+#define QUEUE_MAX 100
 
 typedef struct
 {
@@ -31,7 +32,7 @@ const rb_data_type_t cassandra_future_data_type = {
 
 static void future_thread_pool_init(future_thread_pool *pool)
 {
-    pool->queue = rb_funcall(cQueue, id_new, 0);
+    pool->queue = rb_funcall(cSizedQueue, id_new, 1, INT2NUM(QUEUE_MAX));
     rb_gc_register_mark_object(pool->queue);
 }
 

data/ext/ilios/ilios.c

@@ -11,7 +11,7 @@ VALUE eConnectError;
 VALUE eExecutionError;
 VALUE eStatementError;
 
-VALUE cQueue;
+VALUE cSizedQueue;
 
 VALUE id_to_time;
 VALUE id_new;
@@ -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);
@@ -73,7 +85,7 @@ void Init_ilios(void)
     eExecutionError = rb_define_class_under(mCassandra, "ExecutionError", rb_eStandardError);
     eStatementError = rb_define_class_under(mCassandra, "StatementError", rb_eStandardError);
 
-    cQueue = rb_const_get(rb_cThread, rb_intern("Queue"));
+    cSizedQueue = rb_const_get(rb_cThread, rb_intern("SizedQueue"));
 
     id_to_time = rb_intern("to_time");
     id_new = rb_intern("new");
@@ -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;
 
@@ -85,7 +84,7 @@ extern VALUE eConnectError;
 extern VALUE eExecutionError;
 extern VALUE eStatementError;
 
-extern VALUE cQueue;
+extern VALUE cSizedQueue;
 
 extern VALUE id_to_time;
 extern VALUE id_new;

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.9'
+  VERSION = '0.4.11'
   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.9
+  version: 0.4.11
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-03-07 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.9
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.11
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []