activerecord-batch_touching 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a36257abfcfe62c1741375666ac2739ba1acd362bc508b42cd9d7708db0bd81
-  data.tar.gz: 2a03c834b458618170111c06eec6e063f69c43f011ce691922107857b12e18ec
+  metadata.gz: f994be54523c59f7878cbcf822ca03552bb3a365215cb3de7f23c05541381c75
+  data.tar.gz: aeab5dbe2bebca4b0b88d2a77ce033b7a288969fe6bddb18c74e332ec729a6bf
 SHA512:
-  metadata.gz: 6a8e13e88052d2dc02b2fd087cd4f9df734f7968429309e2c998530c111c7fd37a5220f7aa88c73eca193fd7d861e3806b157305495206863b1534490f9b68f4
-  data.tar.gz: 1970e2b0152a0d02d0535608a87f74bf884412cd26aaf2bee13905cf4d20b2ffb9ba1c8029ad402420ce8d235f9856a690f45348f3aa87190f81fa318255fadc
+  metadata.gz: '0808dfbb8f5ea2fedbd51feaf8c453f9224699017d5c33c54a8c08ff02396b52524b67691937ba9b48b838f84257abf0eab3280500bb976945b7eec7302fc89a'
+  data.tar.gz: 4237add83e7f90d3c6852f3221daa31e798eedc2a2b780193e2eab71ae8d17c831c8d2076d899bfed1e84cf830285d501d820fd34ca942223e0f7b53dc5876f2

data/lib/activerecord/batch_touching/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module BatchTouching
-    VERSION = "1.0"
+    VERSION = "1.1"
   end
 end

data/lib/activerecord/batch_touching.rb

@@ -22,9 +22,17 @@ module ActiveRecord
     #     Person.first.touch
     #   end
     def transaction(requires_new: nil, isolation: nil, joinable: true, &block)
-      super(requires_new: requires_new, isolation: isolation, joinable: joinable) do
+      result = super(requires_new: requires_new, isolation: isolation, joinable: joinable) do
         BatchTouching.start(requires_new: requires_new, &block)
       end
+
+      if BatchTouching.should_apply_touches?
+        super() do
+          BatchTouching.apply_touches
+        end
+      end
+
+      result
     end
   end
 
@@ -83,12 +91,12 @@ module ActiveRecord
       def start(requires_new:)
         states.push State.new
         yield.tap do
-          apply_touches if states.length == 1
+          gather_touches if states.length == 1
         end
       ensure
         merge_transactions unless $! && requires_new
 
-        # Decrement nesting even if +apply_touches+ raised an error. To ensure the stack of States
+        # Decrement nesting even if +gather_touches+ raised an error. To ensure the stack of States
         # is empty after the top-level transaction exits.
         states.pop
       end
@@ -99,8 +107,34 @@ module ActiveRecord
         states.present? && !disabled?
       end
 
+      def should_apply_touches?
+        batched_touches.present?
+      end
+
+      def apply_touches
+        batched_touches&.each do |(klass, columns), records|
+          records.reject!(&:destroyed?)
+          touch_records klass, columns, records, batched_touches_time
+        end
+
+        reset!
+      end
+
       private
 
+      def reset!
+        Thread.current[:batch_touching_batch] = nil
+        Thread.current[:batch_touching_time] = nil
+      end
+
+      def batched_touches
+        Thread.current[:batch_touching_batch]
+      end
+
+      def batched_touches_time
+        Thread.current[:batch_touching_time]
+      end
+
       def states
         Thread.current[:batch_touching_states] ||= []
       end
@@ -115,8 +149,8 @@ module ActiveRecord
         states[-2].merge!(current_state) if states.length > 1
       end
 
-      # Apply the touches that were batched. We're in a transaction already so there's no need to open one.
-      def apply_touches
+      # Gather all the touches that were batched.
+      def gather_touches
         current_time = ActiveRecord::Base.current_time_from_proper_timezone
         already_touched = Set.new
         all_states = State.new
@@ -131,10 +165,10 @@ module ActiveRecord
 
         # Sort by class name. Having a consistent order can help mitigate deadlocks.
         sorted_records = all_states.records.keys.sort_by { |k| k.first.name }.to_h { |k| [k, all_states.records[k]] }
-        sorted_records.each do |(klass, columns), records|
-          records.reject!(&:destroyed?)
-          touch_records klass, columns, records, current_time
-        end
+
+        # Save results to a thread so that we can reference these later in their own transaction.
+        Thread.current[:batch_touching_batch] = sorted_records
+        Thread.current[:batch_touching_time] = current_time
       end
 
       # Perform DB update to touch records

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-batch_touching
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Brian Morearty
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord