fibered_mysql2 0.4.0.pre.tstarck.3 → 0.4.0.pre.tstarck.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fcddd19ebaa9bb4c2bcfba7bcb7862b9fb07a31ef4ecd122d46c345a563f8ec
-  data.tar.gz: 65666da2f04f234f15e8945f8b693341599c478a471756963091c19c6391f770
+  metadata.gz: d06e5fc60f480741cc45b28c4eb4ee10b36e364cea461ebc07f0817381e40021
+  data.tar.gz: 30ae5bf495212c120fc8920a803b5fa3bac4835dd311c862d905e288cd664b76
 SHA512:
-  metadata.gz: fdcc099c7c98ec0860a198d7ede37859c1c060c791f2fa33acb8659b02fabdc64f675fcbdc3cb4b555a3f40a3466945b15ebe586a14311ff70eb443e92ad30be
-  data.tar.gz: 755c58904cdd0405c464ba49f662b00c1747a30c61672472a683d17a8c6432e20d3c8c695ca82f34d2d4797c66741d7381ead66084478d634a04f187112c1b02
+  metadata.gz: 167c87ec227094ecf1b28805735d049e554b413db9bb8f04c65a4b0fde85f987047023074834842090bceb830924684c271246735c9abd64b79622a296081f09
+  data.tar.gz: b4419ac94cc20c2294b3caa28c615995a0f65637ba170b9dd4f405877dca2e660e39b23a33b53b75c529a4ba5a86393da35818b641898f573a50a75d5f4ef27e

data/.github/workflows/build.yml

@@ -1,6 +1,6 @@
 ---
 name: FiberedMySQL2 Gem Build
-on: [push, pull_request]
+on: [push]
 jobs:
   test:
     name: Unit Tests
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2, 3.3, 3.4]
+        ruby: [3.1, 3.2, 3.3]
         gemfile:
         - Gemfile
         - gemfiles/rails_7_0.gemfile
@@ -20,5 +20,6 @@ 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.3.8
+3.1.6

data/Appraisals

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

data/CHANGELOG.md

@@ -6,20 +6,11 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 
 ## [0.4.0] - Unreleased
 ### Added
-- Support for Rails 7.1
+- 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.
+- Removed support for Rails 6.
+- Removed usage of EventMachine::Synchrony ActiveRecord Mysql adapter. This adapter code was extremely old and we were overriding their patches back to the current ActiveRecord version.
 
 ## [0.3.1] - 2024-10-30
 ### Fixed

data/Gemfile

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

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.4.0.pre.tstarck.3)
+    fibered_mysql2 (0.4.0.pre.tstarck.10)
       em-synchrony (~> 1.0)
       rails (>= 7.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actioncable (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    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)
+    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)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    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)
+    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)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.1)
-      actionview (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionpack (7.1.5.2)
+      actionview (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       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.1)
-      actionpack (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    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)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionview (7.1.5.2)
+      activesupport (= 7.1.5.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activejob (7.1.5.2)
+      activesupport (= 7.1.5.2)
       globalid (>= 0.3.6)
-    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)
+    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)
       timeout (>= 0.4.0)
-    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)
+    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)
       marcel (~> 1.0)
-    activesupport (7.1.5.1)
+    activesupport (7.1.5.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -169,20 +169,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    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)
+    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)
       bundler (>= 1.15.0)
-      railties (= 7.1.5.1)
+      railties (= 7.1.5.2)
     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.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    railties (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       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.3)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.4)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.7)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.2)
+    rspec-support (3.12.1)
     securerandom (0.4.1)
     stringio (3.1.7)
     thor (1.4.0)
@@ -241,7 +241,7 @@ DEPENDENCIES
   pry
   pry-byebug
   rake
-  rspec (~> 3.12.0)
+  rspec (< 3.13)
 
 BUNDLED WITH
-   2.6.9
+   2.2.29

data/gemfiles/rails_7_0.gemfile

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

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -3,7 +3,6 @@
 require 'em-synchrony'
 require 'active_model'
 require 'active_record/errors'
-
 require 'active_record/connection_adapters/mysql2_adapter'
 require 'em-synchrony/mysql2'
 
@@ -54,98 +53,6 @@ module FiberedMysql2
       end
     end
 
-    def reset_transaction #:nodoc:
-      @transaction_manager = ::FiberedMysql2::FiberedMysql2Adapter_7_0::TransactionManager.new(self)
-    end
-
-    class TransactionManager < ::ActiveRecord::ConnectionAdapters::TransactionManager
-      def initialize(...)
-        super
-        @stack = Hash.new { |h, k| h[k] = [] }
-      end
-
-      def current_transaction #:nodoc:
-        _current_stack.last || ::ActiveRecord::ConnectionAdapters::TransactionManager::NULL_TRANSACTION
-      end
-
-      def open_transactions
-        _current_stack.size
-      end
-
-      def begin_transaction(isolation: nil, joinable: true, _lazy: true)
-        @connection.lock.synchronize do
-          run_commit_callbacks = !current_transaction.joinable?
-          transaction =
-            if _current_stack.empty?
-              ::ActiveRecord::ConnectionAdapters::RealTransaction.new(@connection, isolation:, joinable:, run_commit_callbacks: run_commit_callbacks)
-            else
-              ::ActiveRecord::ConnectionAdapters::SavepointTransaction.new(@connection, "active_record_#{Fiber.current.object_id}_#{open_transactions}", _current_stack.last, isolation:, joinable:, run_commit_callbacks: run_commit_callbacks)
-            end
-
-          if @connection.supports_lazy_transactions? && lazy_transactions_enabled? && _lazy
-            @has_unmaterialized_transactions = true
-          else
-            transaction.materialize!
-          end
-          _current_stack.push(transaction)
-          transaction
-        end
-      end
-
-      # Overriding the ActiveRecord::TransactionManager#materialize_transactions method to use
-      # fiber safe the _current_stack instead of the @stack instance variable. when marterializing
-      # transactions.
-      def materialize_transactions
-        return if @materializing_transactions
-        return unless @has_unmaterialized_transactions
-
-        @connection.lock.synchronize do
-          begin
-            @materializing_transactions = true
-            _current_stack.each { |t| t.materialize! unless t.materialized? }
-          ensure
-            @materializing_transactions = false
-          end
-          @has_unmaterialized_transactions = false
-        end
-      end
-
-      # Overriding the ActiveRecord::TransactionManager#commit_transaction method to use
-      # fiber safe the _current_stack instead of the @stack instance variable. when marterializing
-      # transactions.
-      def commit_transaction
-        @connection.lock.synchronize do
-          transaction = _current_stack.last
-
-          begin
-            transaction.before_commit_records
-          ensure
-            _current_stack.pop
-          end
-
-          transaction.commit
-          transaction.commit_records
-        end
-      end
-
-      # Overriding the ActiveRecord::TransactionManager#rollback_transaction method to use
-      # fiber safe the _current_stack instead of the @stack instance variable. when marterializing
-      # transactions.
-      def rollback_transaction(transaction = nil)
-        @connection.lock.synchronize do
-          transaction ||= _current_stack.pop
-          transaction.rollback
-          transaction.rollback_records
-        end
-      end
-
-      private
-
-      def _current_stack
-        @stack[Fiber.current.object_id]
-      end
-    end
-
     private
 
     def owner_fiber
@@ -155,9 +62,31 @@ 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 ::ActiveRecord.gem_version < "7.1"
+    if Rails.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,6 +184,9 @@ module FiberedMysql2
   end
 
   module FiberedDatabaseConnectionPool
+    include FiberedMonitorMixin
+
+    # Methods that only need to be made Fiber safe in Rails 7.0. Rails 7.1 properly supports Fibers for these methods.
     module Adapter_7_0
       def release_connection(owner_thread = Fiber.current)
         if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
@@ -192,7 +195,7 @@ module FiberedMysql2
       end
 
       def with_connection
-        unless (conn = cached_connections[current_connection_id]) # Invoca Patch to use Fiber
+        unless (conn = cached_connections[current_connection_id])
           conn = connection
           fresh_connection = true
         end
@@ -201,15 +204,15 @@ module FiberedMysql2
         release_connection if fresh_connection
       end
 
+      private
+
       def current_thread
         Fiber.current
       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
@@ -221,26 +224,6 @@ module FiberedMysql2
       @reaper = nil # no need to keep a reference to this since it does nothing in this sub-class
     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
-      rescue => ex
-        ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
-      end
-      super
-    end
-
-    # Invoca patch to ensure that we are using the current fiber's connection.
     def connection
       # this is correctly done double-checked locking
       # (ThreadSafe::Cache's lookups have volatile semantics)
@@ -256,6 +239,39 @@ module FiberedMysql2
         end
       end
     end
+
+    # Invoca Patch - Reap connections so we re-use any orphaned connections instead of creating a new connection.
+    # This has been useful in Ringswitch where we have a lot of orphaned connections, as it limits the number of connections we have open.
+    # ActiveRecord only calls reap if there are no more connections available in the pool, i.e. if all connections are in use (and potentially orphaned).
+    def checkout(checkout_timeout = @checkout_timeout)
+      begin
+        reap_connections
+      rescue => ex
+        ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
+      end
+      super
+    end
+
+    # Invoca Patch - Only used in our #checkout patch above. The main difference this method has with #reap is that we don't call #steal! on the orphaned connections first.
+    # This may be risky for race conditions but potentially runs faster than the #reap method?
+    # We should look to replace this with the standard #reap method in the future.
+    def reap_connections
+      cached_connections.values.each do |connection|
+        unless connection.owner.alive?
+          checkin(connection)
+        end
+      end
+    end
+
+    # Invoca Patch - Helper method.
+    def cached_connections
+      @thread_cached_conns
+    end
+
+    # Invoca Patch - Helper method
+    def current_connection_id
+      connection_cache_key(current_thread)
+    end
   end
 end
 

data/lib/fibered_mysql2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.tstarck.3
+  version: 0.4.0.pre.tstarck.10
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-19 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: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: An adapter for fibered mysql2