active_record_mutex 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624916896cfdc77c6a74fde8700a9b07ff587250
-  data.tar.gz: dea7261a14573e0202de967869d123b473785d86
+  metadata.gz: 60ad881c3d0757d14d5ec9c12ac3740b95ba0d32
+  data.tar.gz: e0f2cc67ac0407f5652f40931d17e9785757bcd3
 SHA512:
-  metadata.gz: fa68c4dd7ba5c49f7a17fabdb17afbbdf7943e994fea75c1d6b61aeed001a1793326b69bc24b5422987c84dfe573a803d87642539516050607bd141a70f7ea57
-  data.tar.gz: 4d86b6ebca7510b1f9f4276c1380a7a16655404ed57f91b6c1f3038a827d8e260daa2407dceddf63e309fa22230a37f062586f2ac3dd9e92eee850cad25602c2
+  metadata.gz: 690678e820f5849c845fd5c992832e561cecc4e8341ede697c7cdac0cd5b34ba551f4b5f7f4911d7f948c24d3f3890b7acc36227dfa395ccc046e33fd1b54b21
+  data.tar.gz: 6c0feddd0d11bd30893842b129c51ca8deea17a1c8dfb19bb1ed1a732389051d27ef036ebd0ac2b4cadfb3da4db6721fc443d1323359cdba656dfa738bcd03b5

data/VERSION

@@ -1 +1 @@
-2.3.3
+2.3.4

data/active_record_mutex.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: active_record_mutex 2.3.3 ruby lib
+# stub: active_record_mutex 2.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active_record_mutex"
-  s.version = "2.3.3"
+  s.version = "2.3.4"
 
   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-24"
+  s.date = "2016-08-25"
   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

@@ -5,26 +5,21 @@ module ActiveRecord
   module DatabaseMutex
     class Implementation
 
-      class << self
-        def db
-          ActiveRecord::Base.connection
-        end
-
-        def check_size?
-          if defined? @check_size
-            @check_size
-          else
-            version = db.execute("SHOW VARIABLES LIKE 'version'").first.last.
-              delete('^0-9.').version
-            @check_size = version >= '5.7'.version
-          end
-        end
-      end
-
       # Creates a mutex with the name given with the option :name.
       def initialize(opts = {})
         @name = opts[:name] or raise ArgumentError, "mutex requires a :name argument"
-        counter or raise ArgumentError, 'argument :name is too long'
+        query %{
+          CREATE TEMPORARY TABLE IF NOT EXISTS mutex_counters
+            (
+              name CHAR(255) NOT NULL,
+              counter INT UNSIGNED NOT NULL DEFAULT 1,
+              PRIMARY KEY (name)
+            )
+        }
+      end
+
+      def db
+        ActiveRecord::Base.connection
       end
 
       # Returns the name of this mutex as given as a constructor argument.
@@ -82,7 +77,7 @@ module ActiveRecord
         if aquired_lock?
           decrease_counter
           if counter_zero?
-            case query("SELECT RELEASE_LOCK(#{quote(name)})")
+            case query %{ SELECT RELEASE_LOCK(#{quote(name)}) }
             when 1
               true
             when 0, nil
@@ -105,7 +100,7 @@ module ActiveRecord
 
       # Returns true if this mutex is unlocked at the moment.
       def unlocked?
-        query("SELECT IS_FREE_LOCK(#{quote(name)})") == 1
+        query(%{ SELECT IS_FREE_LOCK(#{quote(name)}) }).to_i == 1
       end
 
       # Returns true if this mutex is locked at the moment.
@@ -136,24 +131,26 @@ module ActiveRecord
         ActiveRecord::Base.connection.quote(value)
       end
 
-      def counter
-        encoded_name = ?$ + Base64.encode64(name).delete('^A-Za-z0-9+/').
-          gsub(/[+\/]/, ?+ => ?_, ?/ => ?.)
-        if !self.class.check_size? || encoded_name.size <= 64 # mysql 5.7 only allows size <=64 variable names
-          "@#{encoded_name}"
-        end
-      end
-
       def increase_counter
-        query("SET #{counter} = IF(#{counter} IS NULL OR #{counter} = 0, 1, #{counter} + 1)")
+        query %{
+          INSERT INTO mutex_counters (name)
+            VALUES (#{quote(@name)})
+            ON DUPLICATE KEY UPDATE counter = counter + 1
+        }
       end
 
       def decrease_counter
-        query("SET #{counter} = #{counter} - 1")
+        query %{
+          UPDATE mutex_counters SET counter = counter - 1
+            WHERE name = #{quote(@name)}
+        }
       end
 
       def counter_value
-        query("SELECT #{counter}").to_i
+        query(%{
+          SELECT counter FROM mutex_counters
+            WHERE name = #{quote(@name)}
+        }).to_i
       end
 
       def counter_zero?
@@ -166,7 +163,7 @@ module ActiveRecord
           true
         else
           timeout = opts[:timeout] || 1
-          case query("SELECT GET_LOCK(#{quote(name)}, #{timeout})")
+          case query %{ SELECT GET_LOCK(#{quote(name)}, #{timeout}) }
           when 1
             increase_counter
             true
@@ -178,16 +175,13 @@ module ActiveRecord
         end
       end
 
-      def query(sql)
-        if result = self.class.db.execute(sql)
-          result = result.first.first.to_i
-          $DEBUG and warn %{query("#{sql}") = #{result}}
+      def query(sql, index: 0)
+        if row = db.select_rows(sql).first
+          value = index ? row[index] : row
+          $DEBUG and warn %{query("#{sql}", #{index.inspect}) = #{value.inspect}}
+          value
         end
-        result
-      rescue ActiveRecord::StatementInvalid
-        nil
       end
     end
   end
 end
-

data/lib/active_record/database_mutex/version.rb

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

data/test/database_mutex_test.rb

@@ -146,9 +146,4 @@ class DatabaseMutexTest < Test::Unit::TestCase
     end
     assert_nil mutex.synchronize {}
   end
-
-  def test_counter_name
-    mutex = Implementation.new(:name => (250..255).map(&:chr) * '')
-    assert_equal '@$_vv8.f7.', mutex.send(:counter)
-  end
 end

metadata

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