culturecode_stagehand 0.12.7 → 0.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef4f7ed707fdd603dee78f606e921ad59fbdf1ae
-  data.tar.gz: bb179ffa8b7e83eebc77f8588b3391b7da3f9de9
+  metadata.gz: 157594f1ea15ea034a9c883c00835b44bc6d6bef
+  data.tar.gz: f42ed40749d2ac477e5d3c064bc9bb306331a4e2
 SHA512:
-  metadata.gz: 34f3b335af3dd3012fd2e5d4d25c4e92a2c050de854a2dbd2f8ef120280912816f622baed085e1d20f97ea9aea68c08f59700169f1fc9b6b404dc4ec3b5889e5
-  data.tar.gz: 2ef4879e631f9fc512eab292206ada48631707c3bec2a374611ca0c50927dfbe444fcdce42b578e6ccbc70e8fed429ca0bbeeee3fda72b7d1ce69ed83bebfd8b
+  metadata.gz: b6bfe97dcb0695d74e415dbaa74ab0d3e425027833fe4afb660ceb7f354db7a2c93ca3d2d1da58ae6fd95e66ceef86fc6891b41c1b675b3496692ff0618c2021
+  data.tar.gz: 2240f17970315f0fb0d7fd64f999bef1a6374903f190cbb01cefa0561edbcd18f87da879b8dedc012137045e02bf198e1f97fbcfb64a3eeea223f511c43ae688

data/lib/stagehand/staging/commit_entry.rb

@@ -29,7 +29,8 @@ module Stagehand
                ON active_starts.session = #{table_name}.session AND active_starts.start_id <= #{table_name}.id")
        .where("active_starts.start_id IS NULL") }
       scope :with_uncontained_keys, lambda {
-        joins("LEFT OUTER JOIN (#{ unscoped.contained.select('record_id, table_name').distinct.to_sql}) AS contained
+        uncontained
+        .joins("LEFT OUTER JOIN (#{ unscoped.contained.select('record_id, table_name').distinct.to_sql}) AS contained
                ON contained.record_id = #{table_name}.record_id AND contained.table_name = #{table_name}.table_name")
         .where("contained.record_id IS NULL")
       }

data/lib/stagehand/staging/synchronizer.rb

@@ -83,14 +83,12 @@ module Stagehand
       # Lazily iterate through millions of commit entries
       # Returns commit entries in ID descending order
       def iterate_autosyncable_entries(&block)
-        max = CommitEntry.maximum(:id)
-        min = CommitEntry.minimum(:id)
+        max = CommitEntry.maximum(:id).to_i
+        min = CommitEntry.minimum(:id).to_i
 
         max.step(min, -BATCH_SIZE).each do |current|
           range = [current - BATCH_SIZE, min].max..current
-          autosyncable_entries(:id => range).uniq(&:id).each do |entry|
-            with_confirmed_autosyncability(entry, &block)
-          end
+          with_confirmed_autosyncability(autosyncable_entries(:id => range).order(:id => :desc), &block)
         end
       end
 
@@ -98,15 +96,25 @@ module Stagehand
       # This confirmation is used to guard against writes to the record that occur after loading an initial list of
       # entries that are autosyncable, but before the record is actually synced. To prevent this, a lock on the record
       # is acquired and then the record's autosync eligibility is rechecked before calling the block.
-      def with_confirmed_autosyncability(entry, &block)
+      def with_confirmed_autosyncability(entries, &block)
+        entries = Array.wrap(entries)
+        return unless entries.present?
+
         Database.transaction do
-          CommitEntry.connection.execute("SELECT 1 FROM #{entry.table_name} WHERE id = #{entry.record_id}")
-          block.call(entry) if autosyncable_entries(:record_id => entry.record_id, :table_name => entry.table_name).exists?
+          # Lock the records so nothing can update them
+          CommitEntry.connection.execute(CommitEntry.where(:id => entries).lock.to_sql)
+
+          # Execute the block for each entry we've confirm autosyncability
+          confirmed_ids = Set.new(autosyncable_entries.where(:id => entries).pluck(:id))
+
+          entries.each do |entry|
+            block.call(entry) if confirmed_ids.include?(entry.id)
+          end
         end
       end
 
       def autosyncable_entries(scope = nil)
-        entries = CommitEntry.content_operations.not_in_progress.where(scope).order(:id => :desc)
+        entries = CommitEntry.content_operations.not_in_progress.where(scope)
         entries = entries.with_uncontained_keys unless Configuration.ghost_mode?
         return entries
       end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.12.7"
+  VERSION = "0.12.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.12.8
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails