fibered_mysql2 1.0.0.colin.1 → 1.0.0.colin.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d1eaf3701caa8823cdfbec61e7d9734d1e5f463e7936010c5636715591c2c9
-  data.tar.gz: 715db9f2e07df69a6cf51a2389404f030cd9c257524544cb77c16f53de36b944
+  metadata.gz: 4eb4eb8b784857e027f0d40f7f43e96e65b0bf442153831bc07be41030ae646d
+  data.tar.gz: e1ddc3b9ef66c848cb66b7fd080cd90aef0d6a40fa658ddd6abc1cd39c4ff409
 SHA512:
-  metadata.gz: 9a21b639b0b0ab6afcb558978a7e1060510e7fc7ca5e9a833b27d2b8c9eb49d023ac5beb5e0c500c3a3ff711d7f6ee0e49ae61f4e72f941c7a07420f60b9c866
-  data.tar.gz: 99adce5422229bdea37a08ed76a4dad71c6f4108ce3588d42dadc3b6c6fbb2895f65532842739dbe83cd7d6c748ea4b0cf7d57d05ca8fc26cbd0c6e65ab17e41
+  metadata.gz: f6eb1d2947a2b8c2abcb117f39a888139683206dde1f7d6259fb0aa864b6cfae03939d69b7fb22965d464702fed0efddd8db1c1e8d5141dff79e9feaa4bc05c4
+  data.tar.gz: ec9ee0570f5e99ddc6add3d86589ce0534ed624cf1ae4daf33f4ae65ba46a251f015c34ff845064fddaf73290ba645cb53e45dce0e53c4fc8a7c029bc2b47262

data/Gemfile.lock

@@ -1,69 +1,69 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (1.0.0.colin.1)
+    fibered_mysql2 (1.0.0.colin.2)
       async
       rails (>= 5.2, < 7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.4)
-      actionpack (= 6.0.3.4)
+    actioncable (6.0.6.1)
+      actionpack (= 6.0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionmailbox (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionpack (6.0.6.1)
+      actionview (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actiontext (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.0.6.1)
+      activesupport (= 6.0.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activejob (6.0.6.1)
+      activesupport (= 6.0.6.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activestorage (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.4)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activestorage (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      marcel (~> 1.0)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.4.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
@@ -74,7 +74,7 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.2.2)
     console (1.16.2)
       fiber-local
     coveralls (0.8.23)
@@ -84,111 +84,121 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    erubi (1.10.0)
+    date (3.3.3)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    erubi (1.12.0)
     fiber-local (1.0.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.7)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     io-event (1.2.2)
-    json (2.3.1)
-    loofah (2.8.0)
+    json (2.6.3)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
     method_source (1.0.0)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.0.2)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    minitest (5.14.3)
+    minitest (5.18.0)
     mysql2 (0.5.5)
-    nio4r (2.5.4)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.3.4)
-      actioncable (= 6.0.3.4)
-      actionmailbox (= 6.0.3.4)
-      actionmailer (= 6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actiontext (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+      pry (>= 0.13, < 0.15)
+    racc (1.6.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (6.0.6.1)
+      actioncable (= 6.0.6.1)
+      actionmailbox (= 6.0.6.1)
+      actionmailer (= 6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actiontext (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.4)
+      railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rake (13.0.6)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (4.0.2)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.0.1)
+    thor (1.2.2)
     thread_safe (0.3.6)
+    timeout (0.3.2)
     timers (4.3.5)
-    tins (1.25.0)
+    tins (1.32.1)
       sync
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.1)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -3,34 +3,33 @@
 require 'active_model'
 require 'active_record/errors'
 require 'active_record/connection_adapters/mysql2_adapter'
-require_relative '../../fibered_mysql2/async_task'
 
 module FiberedMysql2
   module FiberedMysql2Adapter_6
     def lease
-      if (ot = owner_task)
+      if (of = owner_fiber)
         msg = +"Cannot lease connection; "
-        if ot == (current_task = AsyncTask.current_or_none)
-          msg << "it is already leased by the current Async::Task."
+        if of == Fiber.current
+          msg << "it is already leased by the current Fiber."
         else
-          msg << "it is already in use by a different Async::Task: #{ot}. " \
-                  "Current Async::Task: #{current_task}."
+          msg << "it is already in use by a different Fiber: #{of}. " \
+                  "Current Fiber: #{Fiber.current}."
         end
         raise ::ActiveRecord::ActiveRecordError, msg
       end
 
-      @owner = AsyncTask.current_or_none
+      @owner = Fiber.current
     end
 
     def expire
-      if (ot = owner_task)
-        # Because we are actively releasing connections from dead tasks, we only want
-        # to enforce that we're expiring the current task's connection, iff the owner
+      if (of = owner_fiber)
+        # Because we are actively releasing connections from dead fibers, we only want
+        # to enforce that we're expiring the current fiber's connection, iff the owner
         # of the connection is still alive.
-        if ot.alive? && ot != (current_task = AsyncTask.current_or_none)
+        if of.alive? && of != Fiber.current
           raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection; " \
-            "it is owned by a different Async::Task: #{ot}. " \
-            "Current Async::Task: #{current_task}."
+            "it is owned by a different Fiber: #{of}. " \
+            "Current Fiber: #{Fiber.current}."
         end
 
         @idle_since = ::Concurrent.monotonic_time
@@ -41,11 +40,11 @@ module FiberedMysql2
     end
 
     def steal!
-      if (ot = owner_task)
-        if ot != (current_task = AsyncTask.current_or_none)
-          pool.send :remove_connection_from_thread_cache, self, ot
+      if (of = owner_fiber)
+        if of != Fiber.current
+          pool.send :remove_connection_from_thread_cache, self, of
 
-          @owner = current_task
+          @owner = Fiber.current
         end
       else
         raise ::ActiveRecord::ActiveRecordError, "Cannot steal connection; it is not currently leased."
@@ -54,9 +53,9 @@ module FiberedMysql2
 
     private
 
-    def owner_task
-      @owner.nil? || @owner == AsyncTask::NoTaskPlaceholder || @owner.is_a?(Async::Task) or
-        raise "@owner must be an Async::Task or FiberedMysql2::AsyncTask::NoTaskPlaceholder! Found #{@owner.inspect}"
+    def owner_fiber
+      @owner.nil? || @owner.is_a?(Fiber) or
+        raise "@owner must be a Fiber! Found #{@owner.inspect}"
       @owner
     end
   end

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-# This class behaves the same as ActiveRecord's ConnectionPool, but synchronizes with Async::Task fibers rather than threads.
-
-# Note - trace statements have been commented out.  This is useful trace but we do not want it on by default.
-#        When we have configurable logging we can put this back and have it off by default.
+# This class behaves the same as ActiveRecord's ConnectionPool, but synchronizes with fibers rather than threads.
 
 module FiberedMysql2
   module FiberedDatabaseConnectionPool
@@ -30,8 +27,8 @@ module FiberedMysql2
       super
     end
 
-    def release_connection(owner_task = AsyncTask.current_or_none)
-      if (conn = @thread_cached_conns.delete(connection_cache_key(owner_task)))
+    def release_connection(owner = Fiber.current)
+      if (conn = @thread_cached_conns.delete(connection_cache_key(owner)))
         checkin(conn)
       end
     end
@@ -81,7 +78,7 @@ module FiberedMysql2
     end
 
     def current_thread
-      AsyncTask.current_or_none
+      Fiber.current
     end
   end
 end

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "1.0.0.colin.1"
+  VERSION = "1.0.0.colin.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 1.0.0.colin.1
+  version: 1.0.0.colin.2
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async