fibered_mysql2 0.4.0.pre.tstarck.1 → 0.4.0.pre.tstarck.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4de2661b6a53134802496ea91ed73ad10623ee8459f1d4ecdb1ebdef6ea4f63
-  data.tar.gz: 8846ea290e1ed8ccab648c55458809b63cb4a1ca737f405f0ece815b441104cf
+  metadata.gz: 0fcddd19ebaa9bb4c2bcfba7bcb7862b9fb07a31ef4ecd122d46c345a563f8ec
+  data.tar.gz: 65666da2f04f234f15e8945f8b693341599c478a471756963091c19c6391f770
 SHA512:
-  metadata.gz: 68e08cebe9eec799298274fa1be5e3f83f7b896b5cbdebad3b3b5cb082fabb92388b80310cdb8bd376605374db8460dad4f9fde4746385d9e9d03f53278bf0a2
-  data.tar.gz: 1ea97ac7495a0bc0085aaf4f45e226ad9110f879d893673ae646c48753f90f4c456156bb29ca63c36ddf827fff96a7aab934f80d43c27dbc534fd602db8472be
+  metadata.gz: fdcc099c7c98ec0860a198d7ede37859c1c060c791f2fa33acb8659b02fabdc64f675fcbdc3cb4b555a3f40a3466945b15ebe586a14311ff70eb443e92ad30be
+  data.tar.gz: 755c58904cdd0405c464ba49f662b00c1747a30c61672472a683d17a8c6432e20d3c8c695ca82f34d2d4797c66741d7381ead66084478d634a04f187112c1b02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.4.0.pre.tstarck.1)
+    fibered_mysql2 (0.4.0.pre.tstarck.3)
       em-synchrony (~> 1.0)
       rails (>= 7.0, < 7.2)
 

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -54,6 +54,98 @@ 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

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -204,10 +204,6 @@ module FiberedMysql2
       def current_thread
         Fiber.current
       end
-
-      def connection
-        cached_connections[current_connection_id] ||= checkout
-      end
     end
 
     if ::ActiveRecord.gem_version < "7.1"
@@ -243,6 +239,23 @@ module FiberedMysql2
       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)
+      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
+    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.1"
+  VERSION = "0.4.0.pre.tstarck.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.tstarck.1
+  version: 0.4.0.pre.tstarck.3
 platform: ruby
 authors:
 - Invoca Development