fibered_mysql2 0.3.2.pre.tstarck.7 → 0.4.0.pre.tstarck.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14341c3b793112061aa9934a52cebb26ce5f109873ad66d6c73956377392df75
-  data.tar.gz: 1b571b948cc5823906ca438a4cb43edc0c2a3a606441160a5263ac0aa10f3b22
+  metadata.gz: f4de2661b6a53134802496ea91ed73ad10623ee8459f1d4ecdb1ebdef6ea4f63
+  data.tar.gz: 8846ea290e1ed8ccab648c55458809b63cb4a1ca737f405f0ece815b441104cf
 SHA512:
-  metadata.gz: 074ee670599ad1e31ede07877e3b2956e6e99d332c19bea36d3f32b257523c8d99b7c23ce5ede83ec45085ecb3162960f170c3c0e27796905203c63c32dabd7d
-  data.tar.gz: 3a26877200c88facb93a1dabd2bb069af8d2c8bcffa0299258c6503259dc47fb4e2503b0194f1946d6cf160c7699be10cbbb4874f681514ab221fb45320d2c15
+  metadata.gz: 68e08cebe9eec799298274fa1be5e3f83f7b896b5cbdebad3b3b5cb082fabb92388b80310cdb8bd376605374db8460dad4f9fde4746385d9e9d03f53278bf0a2
+  data.tar.gz: 1ea97ac7495a0bc0085aaf4f45e226ad9110f879d893673ae646c48753f90f4c456156bb29ca63c36ddf827fff96a7aab934f80d43c27dbc534fd602db8472be

data/.github/workflows/build.yml

@@ -1,6 +1,6 @@
 ---
 name: FiberedMySQL2 Gem Build
-on: [push]
+on: [push, pull_request]
 jobs:
   test:
     name: Unit Tests
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2, 3.3]
+        ruby: [3.1, 3.2, 3.3, 3.4]
         gemfile:
         - Gemfile
         - gemfiles/rails_7_0.gemfile
@@ -20,6 +20,5 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 2.2.29
         bundler-cache: true
     - run: bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-3.1.6
+3.3.8

data/Appraisals

@@ -2,4 +2,10 @@
 
 require "appraisal/matrix"
 
-appraisal_matrix(rails: [">= 7.0", "< 7.2"])
+appraisal_matrix(rails: [">= 7.0", "< 7.2"]) do |rails:|
+  if rails < "7.1"
+    gem "mutex_m"
+    gem "base64"
+    gem "bigdecimal"
+  end
+end

data/CHANGELOG.md

@@ -4,6 +4,23 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - Unreleased
+### Added
+- Support for Rails 7.1
+
+### Removed
+- Removed support for Rails 6.1 and below.
+
+### Changed
+#### FiberedMysql2Adapter
+- Updated to no longer include EM::Synchrony::ActiveRecord::Adapter_4_2 as it is no longer necessary.
+- Removed TransactionManager overrides as they are no longer necessary.
+
+#### FiberedMysql2::FiberedDatabaseConnectionPool
+- Updated to only override methods needed in Rails 7.0.
+- Removed double-checking in #connection for cached connection.
+- Updated #checkout patch to use #reap instead of our custom #reaped_connections method.
+
 ## [0.3.1] - 2024-10-30
 ### Fixed
 - Fixed bug in FiberedMysqlAdapter.new_client that was causing `uninitialized constant` errors.

data/Gemfile

@@ -12,4 +12,4 @@ gem 'nokogiri'
 gem 'pry'
 gem 'pry-byebug'
 gem 'rake'
-gem 'rspec', '< 3.13'
+gem 'rspec', '~> 3.12.0' # Rspec 3.13 is causing segfaults for some reason in CI...

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.3.2.pre.tstarck.7)
+    fibered_mysql2 (0.4.0.pre.tstarck.1)
       em-synchrony (~> 1.0)
       rails (>= 7.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.2)
-      actionview (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -44,35 +44,35 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.5.2)
-      activesupport (= 7.1.5.2)
-    activerecord (7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-    activesupport (7.1.5.2)
+    activesupport (7.1.5.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -169,20 +169,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (7.1.5.2)
-      actioncable (= 7.1.5.2)
-      actionmailbox (= 7.1.5.2)
-      actionmailer (= 7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actiontext (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.5.2)
+      railties (= 7.1.5.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -190,9 +190,9 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -208,15 +208,15 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
+    rspec-core (3.12.3)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-expectations (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.12.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+    rspec-support (3.12.2)
     securerandom (0.4.1)
     stringio (3.1.7)
     thor (1.4.0)
@@ -241,7 +241,7 @@ DEPENDENCIES
   pry
   pry-byebug
   rake
-  rspec (< 3.13)
+  rspec (~> 3.12.0)
 
 BUNDLED WITH
-   2.2.29
+   2.6.9

data/gemfiles/rails_7_0.gemfile

@@ -9,7 +9,10 @@ gem "nokogiri"
 gem "pry"
 gem "pry-byebug"
 gem "rake"
-gem "rspec", "< 3.13"
+gem "rspec", "~> 3.12.0"
 gem "rails", "~> 7.0.0"
+gem "mutex_m"
+gem "base64"
+gem "bigdecimal"
 
 gemspec path: "../"

data/gemfiles/rails_7_1.gemfile

@@ -9,7 +9,7 @@ gem "nokogiri"
 gem "pry"
 gem "pry-byebug"
 gem "rake"
-gem "rspec", "< 3.13"
+gem "rspec", "~> 3.12.0"
 gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -3,6 +3,7 @@
 require 'em-synchrony'
 require 'active_model'
 require 'active_record/errors'
+
 require 'active_record/connection_adapters/mysql2_adapter'
 require 'em-synchrony/mysql2'
 
@@ -62,31 +63,9 @@ module FiberedMysql2
     end
   end
 
-  module FiberedMysql2Adapter_7_1
-    def expire
-      if in_use?
-        # Because we are actively releasing connections from dead fibers, we only want
-        # to enforce that we're expiring the current fibers connection, iff the owner
-        # of the connection is still alive.
-        if @owner.alive? && @owner != ActiveSupport::IsolatedExecutionState.context
-          raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection, " \
-            "it is owned by a different fiber: #{@owner}. " \
-            "Current fiber: #{ActiveSupport::IsolatedExecutionState.context}."
-        end
-
-        @idle_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        @owner = nil
-      else
-        raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection, it is not currently leased."
-      end
-    end
-  end
-
   class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
-    if Rails.gem_version < "7.1"
+    if ::ActiveRecord.gem_version < "7.1"
       include FiberedMysql2Adapter_7_0
-    else
-      include FiberedMysql2Adapter_7_1
     end
 
     class << self

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -184,8 +184,6 @@ module FiberedMysql2
   end
 
   module FiberedDatabaseConnectionPool
-    include FiberedMonitorMixin
-
     module Adapter_7_0
       def release_connection(owner_thread = Fiber.current)
         if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
@@ -194,7 +192,7 @@ module FiberedMysql2
       end
 
       def with_connection
-        unless (conn = cached_connections[current_connection_id])
+        unless (conn = cached_connections[current_connection_id]) # Invoca Patch to use Fiber
           conn = connection
           fresh_connection = true
         end
@@ -203,15 +201,19 @@ module FiberedMysql2
         release_connection if fresh_connection
       end
 
-      private
-
       def current_thread
         Fiber.current
       end
+
+      def connection
+        cached_connections[current_connection_id] ||= checkout
+      end
     end
-    if ActiveRecord.gem_version < "7.1"
+
+    if ::ActiveRecord.gem_version < "7.1"
       include Adapter_7_0
     end
+    include FiberedMonitorMixin # This is switches the connection pool's mutex and condition variables to event machine / Fiber compatible ones.
 
     def initialize(pool_config)
       if pool_config.db_config.reaping_frequency
@@ -223,46 +225,24 @@ module FiberedMysql2
       @reaper = nil # no need to keep a reference to this since it does nothing in this sub-class
     end
 
-    def connection
-      # this is correctly done double-checked locking
-      # (ThreadSafe::Cache's lookups have volatile semantics)
-      if (result = cached_connections[current_connection_id])
-        result
-      else
-        synchronize do
-          if (result = cached_connections[current_connection_id])
-            result
-          else
-            cached_connections[current_connection_id] = checkout
-          end
-        end
-      end
+    def current_connection_id
+      connection_cache_key(current_thread)
+    end
+
+    def cached_connections
+      @thread_cached_conns
     end
 
+    # Invoca patch that reaps orphaned connections on checkout. This lets us immediately use a connection left open by dead fibers
+    # instead of waiting for all connections to be used in the pool before they are reaped.
     def checkout(checkout_timeout = @checkout_timeout)
       begin
-        reap_connections
+        reap
       rescue => ex
         ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
       end
       super
     end
-
-    def cached_connections
-      @thread_cached_conns
-    end
-
-    def current_connection_id
-      connection_cache_key(current_thread)
-    end
-
-    def reap_connections
-      cached_connections.values.each do |connection|
-        unless connection.owner.alive?
-          checkin(connection)
-        end
-      end
-    end
   end
 end
 

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "0.3.2.pre.tstarck.7"
+  VERSION = "0.4.0.pre.tstarck.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.2.pre.tstarck.7
+  version: 0.4.0.pre.tstarck.1
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-18 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -91,11 +91,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: An adapter for fibered mysql2