fibered_mysql2 0.3.2.pre.tstarck.1 → 0.3.2.pre.tstarck.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5ffddcba35cf6e56e907a78223d599cfb8059b3886b1e323f51a79a58ebe04
-  data.tar.gz: 29ab8df4fb4fc505ae38a30e2c8b2cac14b950d84abf974368b1217608a7553c
+  metadata.gz: 66c97a135c9f7bc28aaf696c7ffea850182ad3ef6e4ea7edbbd048e31451fd8a
+  data.tar.gz: 495ea234c2494981a54432ca7c93a9afd2f491c59178d9f7e342e4853b79253f
 SHA512:
-  metadata.gz: 9abc62b6d6325399935a9ad810dc409a46d5e280b5e486162e643f0473ac25cb58c0ef6afb42e7cfc059fb3fc4cf3656816807bf8efb1a37850712e6599a28b1
-  data.tar.gz: dfcb809f7520a877ae022636d6f0ff846849c3af20ecc7529691b811c483b96192394e8518c3c3769124998c2d54f88a428196276847f61741031c1a3f05e36b
+  metadata.gz: aad30d8c0765a8a2563997711b99683feb235bf577d8611aa3dc8c0252490c34dfa7c40475bc5d6f3c7ab6f526e2f9d337edcf7181ff356cb3b593693d2fc4e5
+  data.tar.gz: ec87c505d83ac96610b44ce47c927458d5a4a772c270de9b122e68edc14c464bc4f5e9edcda0a2bcbf612356a78ce5fa6277b18a13a7d52f590968e379c04cdd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.3.2.pre.tstarck.1)
+    fibered_mysql2 (0.3.2.pre.tstarck.3)
       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

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.1"
+  VERSION = "0.3.2.pre.tstarck.3"
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.2.pre.tstarck.1
+  version: 0.3.2.pre.tstarck.3
 platform: ruby
 authors:
 - Invoca Development
@@ -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