umbrellio-sequel-plugins 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04b57476dd8a38bb6ba7a40a38603ce3dfa807f0a8072c76f4446081b48f97e
-  data.tar.gz: 89fc7a911c67c32321cb0290b5a408effaf948717f0d60ceaa5437c8f7718006
+  metadata.gz: 7a801a66fb801ece2e3db9f48a042d34f9a5f857817cd70103b730bb5025d0fd
+  data.tar.gz: e90f785e58bf727159b83bbb0387351254279412fc2e3e7bbd41f1c33ef4767c
 SHA512:
-  metadata.gz: 4bdbfa1d179d94da6b41d8f1f17556ec1617d420f23c91a0d84d4cc1e3d56b5bb63500018f482ecb92ff459737e62f3692190a3932f7006c505de182deb6b0e2
-  data.tar.gz: 4fd0e9eaa31182ed0df4c7c4c7afa32d231f2d89b59621399558fce7145553889cfc784ba02a13f4c1ff50a6453c002d5d1e5e24435f916b3bc425eae2293d77
+  metadata.gz: 949c5b6918b91001653bda2706900c9fec8eba2449425e783ba0a593e6bf938443a5723687e2c58cd887700ebeb8167eac59088105e2d12bc2668ca777246aa5
+  data.tar.gz: 2635f3b88224877118eb0ffe706e49d32753ab017309b643b661ea9c7e56ad667e9586c4246aa76a7b5d6c8ee49b4a1c9f41768a9e1acef3c96dc9a732ef8de2

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.17.2)
+    umbrellio-sequel-plugins (0.18.0)
+      concurrent-ruby
       sequel
 
 GEM

data/lib/sequel/extensions/concurrent_thread_pool.rb

@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+require "concurrent"
+
+module Sequel
+  # https://github.com/jeremyevans/sequel/blob/master/lib/sequel/extensions/async_thread_pool.rb
+  module Database::ConcurrentThreadPool
+    # Base proxy: delegates all method calls to the resolved async value.
+    class BaseProxy < BasicObject
+      def method_missing(...)
+        __value.public_send(...)
+      end
+
+      def respond_to_missing?(*args)
+        __value.respond_to?(*args)
+      end
+
+      [:!, :==, :!=, :instance_eval, :instance_exec].each do |method|
+        define_method(method) do |*args, &block|
+          __value.public_send(method, *args, &block)
+        end
+      end
+    end
+
+    # Default proxy: schedules block via Concurrent::Future, blocks on first access.
+    class Proxy < BaseProxy
+      def initialize(executor, &block)
+        super()
+
+        @future = Concurrent::Promises.future_on(executor, &block)
+      end
+
+      def __value
+        @future.value!
+      end
+    end
+
+    # Preemptable proxy: calling thread runs the block if the pool hasn't started it yet.
+    class PreemptableProxy < BaseProxy
+      def initialize(executor, &block)
+        super()
+
+        @mutex = Mutex.new
+        @block = block
+        @done = false
+        @result = nil
+        @error = nil
+
+        executor.post { __run }
+      end
+
+      def __value
+        error, result = @mutex.synchronize do
+          __execute unless @done
+          [@error, @result]
+        end
+        ::Kernel.raise error if error
+        result
+      end
+
+      private
+
+      def __run
+        @mutex.synchronize { __execute unless @done }
+      end
+
+      def __execute
+        @result = @block.call
+      rescue StandardError => error
+        @error = error
+      ensure
+        @done = true
+      end
+    end
+
+    module DatabaseMethods
+      class << self
+        def make_finalizer(executor) = proc { executor.shutdown }
+
+        def extended(db)
+          db.instance_exec do
+            case pool.pool_type
+            when :single, :sharded_single
+              raise Error, "cannot load concurrent_thread_pool extension " \
+                           "if using single or sharded_single connection pool"
+            end
+
+            executor, owned = choose_executor(opts)
+            proxy_klass =
+              typecast_value_boolean(opts[:preempt_async_thread]) ? PreemptableProxy : Proxy
+
+            define_singleton_method(:async_job_class) { proxy_klass }
+            define_singleton_method(:async_thread_executor) { executor }
+
+            finalizer =
+              Sequel::Database::ConcurrentThreadPool::DatabaseMethods.make_finalizer(executor)
+            ObjectSpace.define_finalizer(db, finalizer) if owned
+
+            extend_datasets(DatasetMethods)
+          end
+        end
+      end
+
+      private
+
+      def choose_executor(opts)
+        if opts[:async_thread_executor]
+          [opts[:async_thread_executor], false]
+        else
+          num = opts[:num_async_threads] ? typecast_value_integer(opts[:num_async_threads]) :
+                                Integer(opts[:max_connections] || 4)
+          raise Error, "must have positive number for num_async_threads" if num <= 0
+          [Concurrent::ThreadPoolExecutor.new(
+            min_threads: num,
+            max_threads: num,
+            max_queue: 0,
+            fallback_policy: :abort,
+          ), true]
+        end
+      end
+
+      def async_run(&block)
+        async_job_class.new(async_thread_executor, &block)
+      end
+    end
+
+    ASYNC_METHODS = ((
+      [:all?, :any?, :drop, :entries, :grep_v, :include?, :inject, :member?, :minmax,
+       :none?, :one?, :reduce, :sort, :take, :tally, :to_a, :to_h, :uniq, :zip] &
+        Enumerable.instance_methods
+    ) + (Dataset::ACTION_METHODS - [:map, :paged_each])).freeze
+
+    ASYNC_BLOCK_METHODS = ((
+      [:collect, :collect_concat, :detect, :drop_while, :each_cons, :each_entry, :each_slice,
+       :each_with_index, :each_with_object, :filter_map, :find, :find_all, :find_index,
+       :flat_map, :max_by, :min_by, :minmax_by, :partition, :reject, :reverse_each,
+       :sort_by, :take_while] & Enumerable.instance_methods
+    ) + [:paged_each]).freeze
+
+    ASYNC_ARGS_OR_BLOCK_METHODS = [:map].freeze
+
+    module DatasetMethods
+      def self.define_async_method(mod, method)
+        mod.send(:define_method, method) do |*args, &block|
+          if @opts[:async]
+            ds = sync
+            db.send(:async_run) { ds.send(method, *args, &block) }
+          else
+            super(*args, &block)
+          end
+        end
+      end
+
+      def self.define_async_block_method(mod, method)
+        mod.send(:define_method, method) do |*args, &block|
+          if block && @opts[:async]
+            ds = sync
+            db.send(:async_run) { ds.send(method, *args, &block) }
+          else
+            super(*args, &block)
+          end
+        end
+      end
+
+      def self.define_async_args_or_block_method(mod, method)
+        mod.send(:define_method, method) do |*args, &block|
+          if (block || !args.empty?) && @opts[:async]
+            ds = sync
+            db.send(:async_run) { ds.send(method, *args, &block) }
+          else
+            super(*args, &block)
+          end
+        end
+      end
+
+      ASYNC_METHODS.each { |m| define_async_method(self, m) }
+      ASYNC_BLOCK_METHODS.each { |m| define_async_block_method(self, m) }
+      ASYNC_ARGS_OR_BLOCK_METHODS.each { |m| define_async_args_or_block_method(self, m) }
+
+      def async
+        cached_dataset(:_async) { clone(async: true) }
+      end
+
+      def sync
+        cached_dataset(:_sync) { clone(async: false) }
+      end
+    end
+  end
+
+  Database.register_extension(
+    :concurrent_thread_pool, Database::ConcurrentThreadPool::DatabaseMethods
+  )
+end

data/lib/sequel/plugins/concurrent_thread_pool_eager_loading.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Plugins
+    # Concurrent eager loading using concurrent_thread_pool extension.
+    # Adapted from Sequel's built-in concurrent_eager_loading plugin but uses
+    # our concurrent_thread_pool extension instead of async_thread_pool.
+    #
+    # Usage:
+    #
+    #   DB.extension(:concurrent_thread_pool)
+    #   Album.plugin :concurrent_thread_pool_eager_loading
+    #   Album.eager_load_concurrently.eager(:artist, :genre, :tracks).all
+    #
+    #   # Always concurrent by default:
+    #   Album.plugin :concurrent_thread_pool_eager_loading, always: true
+    module ConcurrentThreadPoolEagerLoading
+      def self.configure(mod, opts = OPTS)
+        if opts.key?(:always)
+          mod.instance_variable_set(:@always_eager_load_concurrently, opts[:always])
+        end
+      end
+
+      module ClassMethods
+        Plugins.inherited_instance_variables(self, :@always_eager_load_concurrently => nil)
+        Plugins.def_dataset_methods(self, [:eager_load_concurrently, :eager_load_serially])
+
+        def always_eager_load_concurrently?
+          @always_eager_load_concurrently
+        end
+      end
+
+      module DatasetMethods
+        def eager_load_concurrently
+          cached_dataset(:_eager_load_concurrently) do
+            clone(eager_load_concurrently: true)
+          end
+        end
+
+        def eager_load_serially
+          cached_dataset(:_eager_load_serially) do
+            clone(eager_load_concurrently: false)
+          end
+        end
+
+        private
+
+        def eager_load_concurrently?
+          v = @opts[:eager_load_concurrently]
+          v.nil? ? model.always_eager_load_concurrently? : v
+        end
+
+        def perform_eager_loads(eager_load_data)
+          return super if !eager_load_concurrently? || eager_load_data.length < 2
+
+          mutex = Mutex.new
+          eager_load_data.each_value do |elo|
+            elo[:mutex] = mutex
+          end
+
+          super.each do |v|
+            if Sequel::Database::ConcurrentThreadPool::BaseProxy === v # rubocop:disable Style/CaseEquality
+              v.__value
+            end
+          end
+        end
+
+        def perform_eager_load(loader, elo)
+          elo[:mutex] ? db.send(:async_run) { super } : super
+        end
+      end
+    end
+  end
+end

data/umbrellio-sequel-plugins.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = "umbrellio-sequel-plugins"
-  spec.version = "0.17.2"
+  spec.version = "0.18.0"
   spec.required_ruby_version = ">= 3.0"
 
   spec.authors = ["Team Umbrellio"]
@@ -18,5 +18,6 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "sequel"
 end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Team Umbrellio
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +56,7 @@ files:
 - bin/console
 - bin/setup
 - lib/clickhouse/migrator.rb
+- lib/sequel/extensions/concurrent_thread_pool.rb
 - lib/sequel/extensions/currency_rates.rb
 - lib/sequel/extensions/deferrable_foreign_keys.rb
 - lib/sequel/extensions/fibered_connection_pool.rb
@@ -54,6 +68,7 @@ files:
 - lib/sequel/extensions/synchronize.rb
 - lib/sequel/plugins/attr_encrypted.rb
 - lib/sequel/plugins/attr_encrypted/simple_crypt.rb
+- lib/sequel/plugins/concurrent_thread_pool_eager_loading.rb
 - lib/sequel/plugins/duplicate.rb
 - lib/sequel/plugins/get_column_value.rb
 - lib/sequel/plugins/money_accessors.rb
@@ -77,7 +92,6 @@ homepage: https://github.com/umbrellio/umbrellio-sequel-plugins
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Sequel plugins
 test_files: []