activerecord-batch_touching 1.0.pre.rc1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06aa6d889559fed96fed448ffb100324496a79d1e97e147607067f1a3275ab92
-  data.tar.gz: 5a737bed02b7812f0feba746bf2ea19bfece091959bdaa25a465dae634b1c38c
+  metadata.gz: 4a79724b8d5920ced2e53071d67a37739bd098a6f66080c60a831d056c1fe4d2
+  data.tar.gz: 3ee4356cdc64f37ed0349f2f6e39c648f2013c04762021cb19959b3a9ac89b20
 SHA512:
-  metadata.gz: b0add569ae81b020e75b5168b00e550d4f69a67cf8e24e5adbb6f45808339ac0d126f69a59bbd0c8620dd073fc762a9cc98283362f9534f3e20197b95da9dc33
-  data.tar.gz: 2d23e326e341927fa8196c566b3101f8850f56632ab93bdb9bf6506e87a451f9c6141801e40c2c6f2743e7a9cfacc535c555161d06003467e1bd29fa59c0f673
+  metadata.gz: c72e5f701b3573d121c9034f2e5751821b8b129c3411584ada3b6fff0b2e12ac52b717128b257808ce54416588dfea4b3dcc597e2e375fda31b0757cf599d770
+  data.tar.gz: 61cf15c6e237c604347af26f37c1033fdb2e895a5ead9e01078b706e73a0642a332795828c7ca81b4e17628bd81dd9385e7e3bfea2005f6b66f012347d07fa74

data/lib/activerecord/batch_touching/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module BatchTouching
-    VERSION = "1.0"
+    VERSION = "1.2"
   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
@@ -144,7 +178,8 @@ module ActiveRecord
         sql = columns.map { |column| "#{klass.connection.quote_column_name(column)} = :time" }.join(", ")
         sql += ", #{klass.locking_column} = #{klass.locking_column} + 1" if klass.locking_enabled?
 
-        klass.unscoped.where(klass.primary_key => records.to_a).update_all([sql, time: time])
+        ids = records.map { |record| record.send(klass.primary_key) }.sort
+        klass.unscoped.where(klass.primary_key => ids).update_all([sql, time: time])
       end
 
       # Set new timestamp in memory, without updating the DB just yet.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-batch_touching
 version: !ruby/object:Gem::Version
-  version: 1.0.pre.rc1
+  version: '1.2'
 platform: ruby
 authors:
 - Brian Morearty
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,7 +192,7 @@ files:
 - lib/activerecord/batch_touching.rb
 - lib/activerecord/batch_touching/state.rb
 - lib/activerecord/batch_touching/version.rb
-homepage: https://github.com/irphilli/activerecord-batch_touching
+homepage: https://github.com/ProductPlan/activerecord-batch_touching
 licenses:
 - MIT
 metadata:
@@ -208,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: