ilios 0.4.10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e873b74dbb71ac4a950cf02eed7f2edf1207e8e2aabfd70575643b981af4f6c
-  data.tar.gz: 8312031b4094cc1a8849ca87530960e8140109a520e08421ed5ef9c21418f3ce
+  metadata.gz: 77733851acee687dec34d008c22f855c1e8630952f3989850a6cf99000b2e5ff
+  data.tar.gz: 4b2dd035a5212ad4da4d561b5669dd6bd6017e1a667588b01d4156a6353c7621
 SHA512:
-  metadata.gz: 86df26c6d95ec57893a84a77e032d3380fb6f6e7f0bda23b59b8e8a8e170bea2a98c2fa1db32c9e7860220a6b3768fec3048c823c8093c23efdc87a16604d4a1
-  data.tar.gz: 51357dab484bf3ef443db260292c62f9f45cff02a40439d80f1ca580bcf828816bfe38db916a448a350b89b3e78ae5dafaa0ec7e1756b6a92f228070e6dcdfc2
+  metadata.gz: ec6a735ad9981a59760daa6b1916acf362e4032ece3c1dd4fcf4fabca80b8ac1cd4137bb0481a2f9955c9852fb99899071c0d199492b232c9370c547ad61f377
+  data.tar.gz: 597c69a77e126e358821c65d394ec95e7198b5554498ad25a7bf695f6eb6d4ab4f58bd66bd023a6d8044db398d4d78836cb2385c7b68be3988ba34e4e6716c77

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Change Log
+
+## 1.0.0
+
+- Support for
+  - Ruby 3.1 or later
+  - Cassandra 3.0 or later
+- Used libraries
+  - DataStax C/C++ Driver 2.17.1
+  - libuv 1.48.0

data/Gemfile

@@ -10,5 +10,8 @@ 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-minitest', '~> 0.33'
 gem 'rubocop-performance', '~> 1.19'
+gem 'rubocop-rake', '~> 0.6'
+
+gem 'rubocop-on-rbs', '~> 0.2'

data/README.md

@@ -37,10 +37,12 @@ $ gem install ilios -- --with-libuv-dir=/path/to/libuv-installed-dir --with-cass
 ## Requirements
 
 - cmake (in order to build the DataStax C/C++ Driver and libuv)
+- C/C++ compiler
+- install_name_tool (macOS only)
 
 ## Supported
 
-- Ruby 3.0 or later
+- Ruby 3.1 or later
 - Cassandra 3.0 or later
 - Linux and macOS platform
 

data/Rakefile

@@ -4,7 +4,9 @@ require 'bundler/gem_tasks'
 require 'rake/extensiontask'
 require 'rake/testtask'
 
+desc 'Run tests'
 task test: :compile
+
 task default: :test
 
 Rake::ExtensionTask.new('ilios') do |ext|

data/ext/ilios/extconf.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require File.expand_path('../../lib/ilios/version', __dir__)
+require 'etc'
 require 'fileutils'
 require 'mini_portile2'
 require 'mkmf'
@@ -8,23 +9,19 @@ require 'mkmf'
 have_func('malloc_usable_size')
 have_func('malloc_size')
 
-MAX_CORES = 8
-
-def num_cpu_cores
-  cores =
-    begin
-      if RUBY_PLATFORM.include?('darwin')
-        Integer(`sysctl -n hw.ncpu`, 10)
-      else
-        Integer(`nproc`, 10)
-      end
-    rescue StandardError
-      2
-    end
-
-  return 1 if cores <= 0
-
-  cores >= 7 ? MAX_CORES : cores
+def create_compile_flags_txt
+  cppflags = $CPPFLAGS.split
+  include_flags = cppflags.select { |flag| flag.start_with?('-I') }
+  define_flags = cppflags.select { |flag| flag.start_with?('-D') } + $defs
+
+  File.open('compile_flags.txt', 'w') do |f|
+    include_flags.each { |flag| f.puts(flag) }
+    f.puts("-I#{Dir.pwd}")
+    f.puts("-I#{RbConfig::CONFIG['rubyhdrdir']}")
+    f.puts("-I#{RbConfig::CONFIG['rubyhdrdir']}/ruby/backward")
+    f.puts("-I#{RbConfig::CONFIG['rubyarchhdrdir']}")
+    define_flags.each { |flag| f.puts(flag) }
+  end
 end
 
 module LibuvInstaller
@@ -45,7 +42,7 @@ module LibuvInstaller
 
   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}")
+      libuv_recipe = LibuvRecipe.new('libuv', Ilios::LIBUV_VERSION, make_command: "make -j #{Etc.nprocessors}")
       libuv_recipe.files << {
         url: "https://github.com/libuv/libuv/archive/v#{Ilios::LIBUV_VERSION}.tar.gz"
       }
@@ -78,7 +75,7 @@ module CassandraDriverInstaller
     def initialize(name, version, **kwargs)
       ENV['LIBUV_ROOT_DIR'] ||= LibuvInstaller.special_install_path
 
-      super(name, version, **kwargs)
+      super
     end
 
     def configure_prefix
@@ -92,7 +89,7 @@ module CassandraDriverInstaller
 
   def self.install_from_source
     unless File.exist?(CASSANDRA_CPP_DRIVER_INSTALL_PATH)
-      cassandra_recipe = CassandraRecipe.new('cpp-driver', Ilios::CASSANDRA_CPP_DRIVER_VERSION, make_command: "make -j #{num_cpu_cores}")
+      cassandra_recipe = CassandraRecipe.new('cpp-driver', Ilios::CASSANDRA_CPP_DRIVER_VERSION, make_command: "make -j #{Etc.nprocessors}")
       cassandra_recipe.files << {
         url: "https://github.com/datastax/cpp-driver/archive/#{Ilios::CASSANDRA_CPP_DRIVER_VERSION}.tar.gz"
       }
@@ -146,3 +143,4 @@ $CPPFLAGS += " #{ENV['CPPFLAGS']}"
 $LDFLAGS += " #{ENV['LDFLAGS']}"
 
 create_makefile('ilios')
+create_compile_flags_txt

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;
@@ -85,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");

data/ext/ilios/ilios.h

@@ -84,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/statement.c

@@ -170,7 +170,7 @@ static VALUE statement_bind(VALUE self, VALUE hash)
 }
 
 /**
- * Sets the statement's page size.
+ * Sets the statement's page size. The default is +10000+.
  *
  * @param page_size [Integer] A page size.
  * @return [Cassandra::Statement] self.

data/ilios.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = 'Cassandra driver written by C language'
   spec.homepage = 'https://github.com/Watson1978/ilios'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.requirements << 'cmake'
 
@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions << 'ext/ilios/extconf.rb'
 
-  spec.add_runtime_dependency('mini_portile2', '~> 2.8')
+  spec.add_dependency('mini_portile2', '~> 2.8')
 end

data/lib/ilios/version.rb

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

data/sig/ilios.rbs

@@ -43,7 +43,7 @@ module Ilios
     class Statement
       def bind: (Hash[Symbol | String, untyped]) -> self
       def page_size=: (Integer) -> self
-      def idempotent=: (true | false) -> self
+      def idempotent=: (bool) -> self
     end
 
     class Future

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 1.0.0
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -33,6 +33,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -58,7 +59,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.10
+  documentation_uri: https://www.rubydoc.info/gems/ilios/1.0.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -68,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - cmake
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Cassandra driver written by C language