ree_lib 1.0.80 → 1.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 851b70d1a532092c336e5ca839f19fda79a40775f1a5cdcb5e422e133d892ad9
-  data.tar.gz: 88f743a42f5a0e2b91f5b37d137221299f5b9396a32b0e3415b20509803629ab
+  metadata.gz: 48c6e5f9340bda88afb575a664461152ec75798bde02b1ad022ba1ce82e185ea
+  data.tar.gz: 190ef75078dbd1ebc195250d769f64ae2b12610f3def63b1ce1fdc81ee66d9fb
 SHA512:
-  metadata.gz: f39799b8239edd02be3e6a57a232679aa53e986790f4a17dd1bf68ca533d3ff09e05c462d6a8fb8448ae2de521f8e933e8497c639446515e586fa499b0f206d1
-  data.tar.gz: db291b9035108c00082134201fcb9ac7e84eae431cab108aa82f1125aa2eb5cbf849641df338f1c12ffdecfd3a557b8eb7b3397d151200ed04321eb4b7af664f
+  metadata.gz: ec3d696532a730e37b009acfb2d9fdb93258d1550daaa30703c97634e8415f016ffd57b72eae5b4442a88e276042acf98c33d83d6c848d25ae6d9598bb2fddd9
+  data.tar.gz: 8e495f67ca4a395345caa4635443533dc4cb3579356812a559b3712c285d8e54caaeb27e7ac5cb0f49d9d2e6563663a8aa031b823c5a2a4ea004bc1a2aa3a48a

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.80)
+    ree_lib (1.0.82)
       binding_of_caller (~> 1.0.0)
+      fiber_scheduler (~> 0.13.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
       oj (~> 3.13.17)
@@ -30,6 +31,7 @@ GEM
     diff-lcs (1.5.0)
     faker (3.2.0)
       i18n (>= 1.8.11, < 2)
+    fiber_scheduler (0.13.0)
     hashdiff (1.0.1)
     highline (2.0.3)
     i18n (1.12.0)
@@ -37,10 +39,10 @@ GEM
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    mini_portile2 (2.8.1)
     msgpack (1.6.0)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.6)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/association.rb

@@ -127,17 +127,19 @@ module ReeDao
       else
         threads = associations.instance_exec(assoc_list, &block)
 
-        threads[:association_threads].map do |association, assoc_type, assoc_name, __opts, block|
-          Thread.new do
-            association.load(assoc_type, assoc_name, **__opts, &block)
+        scheduler_proc do
+          threads[:association_threads].map do |association, assoc_type, assoc_name, __opts, block|
+            task_proc do
+              association.load(assoc_type, assoc_name, **__opts, &block)
+            end
           end
-        end.map(&:join)
 
-        threads[:field_threads].map do |association, field_proc|
-          Thread.new do
-            association.handle_field(field_proc)
+          threads[:field_threads].map do |association, field_proc|
+            task_proc do
+              association.handle_field(field_proc)
+            end
           end
-        end.map(&:join)
+        end
       end
     end
 
@@ -353,6 +355,22 @@ module ReeDao
 
     private
 
+    def task_proc(&proc)
+      if Sequel.current.is_a?(Fiber)
+        Fiber.schedule &proc
+      else
+        proc.call
+      end
+    end
+
+    def scheduler_proc(&proc)
+      if Sequel.current.is_a?(Fiber)
+        FiberScheduler &proc
+      else
+        proc.call
+      end
+    end
+
     def foreign_key_from_dao(dao)
       "#{dao.first_source_table.to_s.gsub(/s$/, '')}_id".to_sym
     end

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/agg.rb

@@ -64,17 +64,39 @@ class ReeDao::Agg
     if dao.db.in_transaction? || ReeDao.load_sync_associations_enabled?
       associations
     else
-      associations[:association_threads].map do |association, assoc_type, assoc_name, opts, block|
-        Thread.new do
-          association.load(assoc_type, assoc_name, **opts, &block)
+      scheduler_proc do
+        associations[:association_threads].map do |association, assoc_type, assoc_name, opts, block|
+          task_proc do
+            association.load(assoc_type, assoc_name, **opts, &block)
+          end
         end
-      end.map(&:join)
 
-      associations[:field_threads].map do |association, field_proc|
-        Thread.new do
-          association.handle_field(field_proc)
+        associations[:field_threads].map do |association, field_proc|
+          task_proc do
+            association.handle_field(field_proc)
+          end
         end
-      end.map(&:join)
+      end
+    end
+  end
+
+  def task_proc(&proc)
+    if Sequel.current.is_a?(Fiber)
+      Fiber.schedule do
+        proc.call
+      end
+    else
+      proc.call
+    end
+  end
+
+  def scheduler_proc(&proc)
+    if Sequel.current.is_a?(Fiber)
+      FiberScheduler do
+        proc.call
+      end
+    else
+      proc.call
     end
   end
 end

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_connection.rb

@@ -19,7 +19,6 @@ class ReeDao::BuildConnection
     database_timezone: :utc,
     application_timezone: :utc,
     typecast_timezone: :utc,
-    connection_validation_timeout: 60,
     single_threaded: false,
     timeout: 90
   }.freeze
@@ -27,6 +26,7 @@ class ReeDao::BuildConnection
   contract(
     Hash,
     Ksplat[
+      fibered?: Bool,
       timeout?: Integer,
       convert_two_digit_years?: Bool,
       single_threaded?: Bool,
@@ -36,7 +36,6 @@ class ReeDao::BuildConnection
       database_timezone?: Or[*TIMEZONES],
       application_timezone?: Or[*TIMEZONES],
       typecast_timezone?: Or[*TIMEZONES],
-      connection_validation_timeout?: Integer,
       logger?: Logger,
       sql_log_level?: [:fatal, :error, :warn, :info, :debug],
     ] => Any
@@ -47,7 +46,6 @@ class ReeDao::BuildConnection
     database_timezone = opts.delete(:database_timezone)
     application_timezone = opts.delete(:application_timezone)
     typecast_timezone = opts.delete(:typecast_timezone)
-    # connection_validation_timeout = opts.delete(:connection_validation_timeout)
     convert_two_digit_years = opts.delete(:convert_two_digit_years)
     single_threaded = opts.delete(:single_threaded)
     datetime_class = opts.delete(:datetime_class)
@@ -63,6 +61,10 @@ class ReeDao::BuildConnection
 
     connection = Sequel.connect(conn_opts)
 
+    if opts[:fibered]
+      Sequel.extension :fiber_concurrency
+    end
+
     if opts[:logger]
       connection.logger = opts[:logger]
     end
@@ -84,8 +86,6 @@ class ReeDao::BuildConnection
       end
     end
 
-    # connection.pool.connection_validation_timeout = connection_validation_timeout if connection_validation_timeout
-
     extensions.each { connection.extension(_1) }
     connections.add(connection)
 

data/lib/ree_lib/packages/ree_dao/package/ree_dao.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "sequel"
+require "fiber_scheduler"
 
 module ReeDao
   include Ree::PackageDSL

data/lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_connection.schema.json

@@ -22,7 +22,7 @@
         {
           "arg": "opts",
           "arg_type": "keyrest",
-          "type": "Ksplat[:timeout? => Integer, :convert_two_digit_years? => Bool, :single_threaded? => Bool, :extensions? => ArrayOf[Symbol], :datetime_class? => Or[Time, DateTime], :after_connect? => Proc, :database_timezone? => Or[utc, local], :application_timezone? => Or[utc, local], :typecast_timezone? => Or[utc, local], :connection_validation_timeout? => Integer, :logger? => Logger, :sql_log_level? => [fatal, error, warn, info, debug]]"
+          "type": "Ksplat[:fibered? => Bool, :timeout? => Integer, :convert_two_digit_years? => Bool, :single_threaded? => Bool, :extensions? => ArrayOf[Symbol], :datetime_class? => Or[Time, DateTime], :after_connect? => Proc, :database_timezone? => Or[utc, local], :application_timezone? => Or[utc, local], :typecast_timezone? => Or[utc, local], :logger? => Logger, :sql_log_level? => [fatal, error, warn, info, debug]]"
         }
       ]
     }

data/lib/ree_lib/packages/ree_std/package/ree_std/functions/retry_on_fail.rb

@@ -38,7 +38,7 @@ class ReeStd::RetryOnFail
       retry_block?: Proc,
       retry_if?: Proc,
     ],
-    Block => nil
+    Block => Any
   )
   def call(max:, **opts, &block)
     Retry.new(max: max, **opts).call(&block)

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.80"
+  VERSION = "1.0.82"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.80
+  version: 1.0.82
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: fiber_scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement