active_record_mutex 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae4a0303c87496334623532cdf84ebe36965400
-  data.tar.gz: 3ff1f5b3142972f9e38b35dd6384efdc6141756f
+  metadata.gz: 82a2b14490ab51a0627c72260226d1742b1c0441
+  data.tar.gz: c487aa29472b77887e5dec81cd7f624676091d4a
 SHA512:
-  metadata.gz: c6925871418c55c987de96784403d27b959af95bd07a5f27b9dbf97f9bcb5cf844875279aff404c9e39173af238dccec9b2a04f6c12513e712465430ac977d46
-  data.tar.gz: ffa0d076563b3e3b86b66528c36b6c1eb95ddc597196036d34db6f5020c4f3d58aa58c430bd70a791a439f9a81d412cd42be81c0b8e0e3533b6b96f8e669a655
+  metadata.gz: 52337abd846212ae910f0d66ba99b39e35e02ad55a540e952dcbee8f195ec4c74d5dbc5f507d2f3dfa9e8b1189c6ba4e245805015893f561fdcd8c1eea4ca8fc
+  data.tar.gz: cbaceacb0cb2e06fef1b1d4a89b5940400e2a06213d7ab031f22f5151087357d0f5e8e092b9acdff49de08a8b133a8647ee064f8b9dea0fafbb82b8b85f9e4f8

data/README.md

@@ -40,13 +40,6 @@ create Mutex instance like this:
 
 Now you can send all messages directly to the Mutex instance.
 
-## Changes
-
-* 2016-08-19 Make locks rails environments independent
-* 2014-12-12 Release 2.0.0
-* 2014-12-12 Add license information
-* 2014-12-09 Adapt to newer Rails versions' API
-
 ## Download
 
 The homepage of this library is located at

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.3.0

data/active_record_mutex.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: active_record_mutex 2.2.1 ruby lib
+# stub: active_record_mutex 2.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active_record_mutex"
-  s.version = "2.2.1"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2016-08-19"
+  s.date = "2016-08-23"
   s.description = "Mutex that can be used to synchronise ruby processes via an ActiveRecord datababase connection. (Only Mysql is supported at the moment.)"
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/active_record/database_mutex.rb", "lib/active_record/database_mutex/implementation.rb", "lib/active_record/database_mutex/version.rb", "lib/active_record/mutex.rb", "lib/active_record_mutex.rb"]

data/lib/active_record/database_mutex/implementation.rb

@@ -29,7 +29,7 @@ module ActiveRecord
       rescue ActiveRecord::DatabaseMutex::MutexLocked
         return nil
       ensure
-        locked && unlock
+        locked and unlock
       end
 
       # Locks the mutex and returns true if successful. If the mutex is
@@ -58,9 +58,18 @@ module ActiveRecord
       # Unlocks the mutex and returns true if successful. Otherwise this method
       # raises a MutexLocked exception.
       def unlock(*)
-        case query("SELECT RELEASE_LOCK(#{quote_value(name)})")
-        when 1      then true
-        when 0, nil then raise MutexUnlockFailed, "unlocking of mutex '#{name}' failed"
+        if aquired_lock?
+          decrease_counter
+          if counter_zero?
+            case query("SELECT RELEASE_LOCK(#{quote(name)})")
+            when 1
+              true
+            when 0, nil
+              raise MutexUnlockFailed, "unlocking of mutex '#{name}' failed"
+            end
+          end
+        else
+          raise MutexUnlockFailed, "unlocking of mutex '#{name}' failed"
         end
       end
 
@@ -75,7 +84,7 @@ module ActiveRecord
 
       # Returns true if this mutex is unlocked at the moment.
       def unlocked?
-        query("SELECT IS_FREE_LOCK(#{quote_value(name)})") == 1
+        query("SELECT IS_FREE_LOCK(#{quote(name)})") == 1
       end
 
       # Returns true if this mutex is locked at the moment.
@@ -85,7 +94,7 @@ module ActiveRecord
 
       # Returns true if this mutex is locked by this database connection.
       def aquired_lock?
-        query("SELECT CONNECTION_ID() = IS_USED_LOCK(#{quote_value(name)})") == 1
+        query("SELECT CONNECTION_ID() = IS_USED_LOCK(#{quote(name)})") == 1
       end
 
       # Returns true if this mutex is not locked by this database connection.
@@ -102,15 +111,45 @@ module ActiveRecord
 
       private
 
-      def quote_value(value)
+      def quote(value)
         ActiveRecord::Base.connection.quote(value)
       end
 
+      def counter
+        "@#{name}_mutex_counter"
+      end
+
+      def increase_counter
+        query("SET #{counter} = IF(#{counter} IS NULL OR #{counter} = 0, 1, #{counter} + 1)")
+      end
+
+      def decrease_counter
+        query("SET #{counter} = #{counter} - 1")
+      end
+
+      def counter_value
+        query("SELECT #{counter}").to_i
+      end
+
+      def counter_zero?
+        counter_value.zero?
+      end
+
       def lock_with_timeout(opts = {})
-        timeout = opts[:timeout] || 1
-        case query("SELECT GET_LOCK(#{quote_value(name)}, #{timeout})")
-        when 1 then true
-        when 0 then raise MutexLocked, "mutex '#{name}' is already locked"
+        if aquired_lock?
+          increase_counter
+          true
+        else
+          timeout = opts[:timeout] || 1
+          case query("SELECT GET_LOCK(#{quote(name)}, #{timeout})")
+          when 1
+            increase_counter
+            true
+          when 0
+            raise MutexLocked, "mutex '#{name}' is already locked"
+          when nil
+            raise MutexSystemError, "mutex '#{name}' not locked due to system error"
+          end
         end
       end
 

data/lib/active_record/database_mutex/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord::DatabaseMutex
   # ActiveRecord::DatabaseMutex version
-  VERSION         = '2.2.1'
+  VERSION         = '2.3.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/active_record/database_mutex.rb

@@ -19,6 +19,8 @@ module ActiveRecord
 
     class MutexInvalidState < MutexError; end
 
+    class MutexSystemError < MutexError; end
+
     def self.included(modul)
       modul.instance_eval do
         extend ClassMethods

data/test/database_mutex_test.rb

@@ -65,30 +65,39 @@ class DatabaseMutexTest < Test::Unit::TestCase
   def test_lock
     mutex = Implementation.new(:name => 'Lock')
     assert mutex.unlocked?
+    assert_equal 0, mutex.send(:counter_value)
     assert mutex.lock
     assert mutex.locked?
     assert mutex.aquired_lock?
+    assert_equal 1, mutex.send(:counter_value)
     assert mutex.lock
+    assert_equal 2, mutex.send(:counter_value)
   end
 
   def test_unlock
     mutex = Implementation.new(:name => 'Unlock')
     assert_raises(ActiveRecord::DatabaseMutex::MutexUnlockFailed) { mutex.unlock }
+    assert_equal 0, mutex.send(:counter_value)
     assert mutex.lock
     assert mutex.locked?
     assert mutex.aquired_lock?
+    assert_equal 1, mutex.send(:counter_value)
     assert mutex.unlock
     assert mutex.unlocked?
+    assert_equal 0, mutex.send(:counter_value)
     assert_raises(ActiveRecord::DatabaseMutex::MutexUnlockFailed) { mutex.unlock }
   end
 
   def test_synchronize
     mutex = Implementation.new(:name => 'Sync1')
     assert mutex.unlocked?
+    assert_equal 0, mutex.send(:counter_value)
     mutex.synchronize do
       assert mutex.locked?
+      assert_equal 1, mutex.send(:counter_value)
     end
     assert mutex.unlocked?
+    assert_equal 0, mutex.send(:counter_value)
   end
 
   def test_synchronize_exception
@@ -110,14 +119,24 @@ class DatabaseMutexTest < Test::Unit::TestCase
   def test_synchronize_nested
     mutex = Implementation.new(:name => 'Sync3')
     assert mutex.unlocked?
+    assert mutex.send(:counter_zero?)
+    assert_equal 0, mutex.send(:counter_value)
     mutex.synchronize do
       assert mutex.locked?
+      assert !mutex.send(:counter_zero?)
+      assert_equal 1, mutex.send(:counter_value)
       mutex.synchronize do
         assert mutex.locked?
+        assert !mutex.send(:counter_zero?)
+        assert_equal 2, mutex.send(:counter_value)
       end
       assert mutex.locked?
+      assert !mutex.send(:counter_zero?)
+      assert_equal 1, mutex.send(:counter_value)
     end
     assert mutex.unlocked?
+    assert mutex.send(:counter_zero?)
+    assert_equal 0, mutex.send(:counter_value)
   end
 
   def test_synchronize_already_locked

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_mutex
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar