fibered_mysql2 0.3.2.pre.tstarck.2 → 0.3.2.pre.tstarck.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55f3b411a3c86ad1e9c04094cf7f98c114f48652df50bcd7e9c67b1f8108ce91
-  data.tar.gz: c3113915739077ac57bc93223300e2c3c5fc61955c72d57675faabf50e3f41fd
+  metadata.gz: 4773eb4c6e76109ac68abfc6513d14777501d11615e44024a867752e67700674
+  data.tar.gz: 1965bebf349ba637dd806105f6f1134c816d08609a858d8851dffda2f5805cb4
 SHA512:
-  metadata.gz: 9ff4172f6e32fd6cdb6e231d71b167445470534961f5b5a543d3a409db7e15fce2c6351de46b749e82a1847fcd630118f771e664bcbf0fddb1cc615840985f28
-  data.tar.gz: 3fafdc9bda976f83e7b98edb9ede3635168544a3d2e0aed4c6ac5a022c1ac2c1501a2cafe9e0b88d8cbdab0149815f410bd6cbc4dcc574bd75ecf1ad4f00a9fb
+  metadata.gz: 39a86b9bf560b89c868295bfd191d46c27e6badd19b586f488e0e366182a4e6db7e1293087258d74d4981622d1cc2a69685352936b36113458d64a55a63b0f9a
+  data.tar.gz: cfb223c6ba2c4ac7865be8cf9ac0041a0b7acfe272b4229af75d602092c2726af3bdeaa4bc2cbbf964778777d8b5f028b060e5b02e5e640bff3fbc12d7909175

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.3.2.pre.tstarck.2)
+    fibered_mysql2 (0.3.2.pre.tstarck.4)
       em-synchrony (~> 1.0)
       rails (>= 7.0, < 7.1)
 

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -64,7 +64,6 @@ module FiberedMysql2
 
   class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
     include FiberedMysql2Adapter_5_2
-    include FiberedMysql2::TransactionManagerOverride
 
     class << self
       # Copied from Mysql2Adapter, except with the EM Mysql2 client
@@ -78,9 +77,5 @@ module FiberedMysql2
         end
       end
     end
-
-    def initialize(*args)
-      super
-    end
   end
 end

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -186,31 +186,30 @@ module FiberedMysql2
   module FiberedDatabaseConnectionPool
     include FiberedMonitorMixin
 
-    module Adapter_5_2
-      def cached_connections
-        @thread_cached_conns
-      end
-
-      def current_connection_id
-        connection_cache_key(current_thread)
+    module Adapter_7_0
+      def release_connection(owner_thread = Fiber.current)
+        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
+          checkin(conn)
+        end
       end
 
-      def checkout(checkout_timeout = @checkout_timeout)
-        begin
-          reap_connections
-        rescue => ex
-          ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
+      def with_connection
+        unless (conn = cached_connections[current_connection_id])
+          conn = connection
+          fresh_connection = true
         end
-        super
+        yield conn
+      ensure
+        release_connection if fresh_connection
       end
 
-      def release_connection(owner_thread = Fiber.current)
-        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
-          checkin(conn)
-        end
+      private
+
+      def current_thread
+        Fiber.current
       end
     end
-    include Adapter_5_2
+    include Adapter_7_0 if ActiveRecord.gem_version < "7.1"
 
     def initialize(pool_config)
       if pool_config.db_config.reaping_frequency
@@ -238,6 +237,23 @@ module FiberedMysql2
       end
     end
 
+    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
+
+    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?
@@ -245,12 +261,6 @@ module FiberedMysql2
         end
       end
     end
-
-    private
-
-    def current_thread
-      Fiber.current
-    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.2"
+  VERSION = "0.3.2.pre.tstarck.4"
 end

data/lib/fibered_mysql2.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'fibered_mysql2/version'
-require 'fibered_mysql2/transaction_manager_override'
 require_relative '../lib/active_record/connection_adapters/fibered_mysql2_adapter'
 require 'fibered_mysql2/fibered_database_connection_pool'
 require 'fibered_mysql2/fibered_mutex_with_waiter_priority'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.2.pre.tstarck.2
+  version: 0.3.2.pre.tstarck.4
 platform: ruby
 authors:
 - Invoca Development
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-07 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -73,7 +73,6 @@ files:
 - lib/fibered_mysql2/fibered_mutex_with_waiter_priority.rb
 - lib/fibered_mysql2/fibered_mysql2_connection_factory.rb
 - lib/fibered_mysql2/hash_config_override.rb
-- lib/fibered_mysql2/transaction_manager_override.rb
 - lib/fibered_mysql2/version.rb
 homepage: https://github.com/Invoca/fibered_mysql2
 licenses: []

data/lib/fibered_mysql2/transaction_manager_override.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record"
-
-module FiberedMysql2
-  module TransactionManagerOverride
-    class TransactionManager < ::ActiveRecord::ConnectionAdapters::TransactionManager
-      def initialize(*args)
-        super
-        @stack = Hash.new { |h, k| h[k] = [] }
-      end
-
-      def current_transaction #:nodoc:
-        _current_stack.last || 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
-
-    # def reset_transaction #:nodoc:
-    #   @transaction_manager = ::FiberedMysql2::TransactionManagerOverride::TransactionManager.new(self)
-    # end
-  end
-end