culturecode_stagehand 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3dab896a9f7c3dc73684d932a38b73dd622078d8
-  data.tar.gz: 5c6ed76e33a075d8fad38b75270c4d07302b4356
+SHA256:
+  metadata.gz: fc5e551f7e747ad8fb67d445f787bd47df6059fbe939f65088901445e4ccc5db
+  data.tar.gz: d7d1a28bdac8a210119431075d48fa5cfafaadf311958926e13e10ac5c5dda9c
 SHA512:
-  metadata.gz: 952176cc2d5c7a0a62651071afc0f8c290c94787dc744b3390a8264b74f0e0171500f7c306c5fffffc7d0de9f306dc0a0b2a5d39cd2f57d5359f03d37f644716
-  data.tar.gz: 4d76928b54fc1f3937617d7042ff5f47b2b9f234f8436e6c533fd1622fa764e05d0d092e47e22778f7f7c6601c10239de51c541054f05ebe528de10a333c229f
+  metadata.gz: d73461a90dceed0855d2779925174f1ced0b4ba9a2a9b47c0948fa1faef6666eb5ee83af52481114033a99367747baf82b1161617ff73c30721c19dfedf5e28e
+  data.tar.gz: 3a2443903c414b6f87ccb312d77b165428e036ae80bc04a103234a7efc373d5068f9f329d8c87c987a9e1605929237053e5b276de1dedd79860028e3fb9bc5a4

data/lib/stagehand/schema/statements.rb

@@ -40,7 +40,7 @@ module Stagehand
         stagehand = ':commit_entries' if table_name == Staging::CommitEntry.table_name
 
         table_stream = StringIO.new
-        table_stream = super(table_name, table_stream)
+        super(table_name, table_stream)
         table_stream.rewind
         table_schema = table_stream.read.gsub(/create_table (.+) do/, 'create_table \1' + ", stagehand: #{stagehand} do")
         stream.puts table_schema

data/lib/stagehand/staging/commit.rb

@@ -21,7 +21,7 @@ module Stagehand
         begin
           block.call(start_operation)
         rescue => e
-          end_commit(start_operation, except) unless e.is_a?(CommitError)
+          end_commit(start_operation, except) unless e.is_a?(CommitError) || e.is_a?(ActiveRecord::Rollback)
           raise(e)
         else
           return end_commit(start_operation, except)
@@ -71,7 +71,17 @@ module Stagehand
         if except.present? && Array(except).collect(&:to_s).exclude?(start_operation.table_name)
           scope = scope.where('table_name NOT IN (?) OR table_name IS NULL', except)
         end
-        scope.update_all(:commit_id => start_operation.id)
+
+        # We perform a read to determine the ids that are meant to be part of our Commit in order to avoid acquiring
+        # write locks on commit entries between the start and end entry that don't belong to our session. Otherwise, we
+        # risk a deadlock if another process manipulates entries between our start and end while we have a range lock.
+        updated_count = CommitEntry.where(id: scope.pluck(:id)).update_all(:commit_id => start_operation.id)
+
+        if updated_count < 2 # Unless we found at least 2 entries (start and end), abort the commit
+          CommitEntry.logger.warn "Commit entries not found for Commit #{start_operation.id}. Was the Commit rolled back in a transaction?"
+          end_operation.delete
+          return
+        end
 
         return new(start_operation.id)
       end
@@ -95,8 +105,8 @@ module Stagehand
         return if @start_id && @end_id
 
         missing = []
-        missing << CommitEntry::START_OPERATION unless @start_id
-        missing << CommitEntry::END_OPERATION unless @end_id
+        missing << CommitEntry::START_OPERATION unless @start_id == start_id
+        missing << CommitEntry::END_OPERATION if @start_id == start_id
 
         raise CommitNotFound, "Couldn't find #{missing.join(', ')} entry for Commit #{start_id}"
       end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Simplify the management of a sandbox database that can sync content to a