active_record_mutex 2.3.8 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8705fe3d190b75644675f7fc74d246da19f8a3b
-  data.tar.gz: 2441f8fbca8fd0fca45e380341a9e0a924c49acd
+  metadata.gz: 868990d82f5cfc1f8948a56494b5264d67610031
+  data.tar.gz: 843d17dd76cfb98da16bce309f4b33a8595a65b9
 SHA512:
-  metadata.gz: 5525469c28b82c0e6a4c78e2d5ae410a351df12a61b011acedb73f966604708b39a1e3a87ab9e25dd18a30b472d24e645318766540a18dff611dc12c0055f86f
-  data.tar.gz: 6b6e0addf643c5db413aa1c21ae1f3f4963b46af08c12f7c78ed1b82e0123c02e2777b718da8754faebeefb06729581c86756f680621bbc5daf4d0798e81d165
+  metadata.gz: cbab372a12b534583abaede4466a91e99ec981670d73729f1282a80bd2f68f99af379781d47fb06523513af03b3a82e150da15ae6fe7c074b3032ad757628f06
+  data.tar.gz: 859681f8d7bbb4cf64544bf5a00adfd8007d929e028e06dd498ac8a501eef3f64637822006f548bb62da4287ca0c46a8635fff6b9a97d280aa580e13ae25997a

data/.travis.yml

@@ -1,9 +1,6 @@
 rvm:
   - 2.0.0
   - 2.1
-  - 2.2
-  - 2.3.1
-  - 2.4.0-preview1
   - ruby-head
   - jruby-head
 matrix:

data/Rakefile

@@ -19,7 +19,7 @@ GemHadar do
 
   dependency             'mysql2',       '~>0.3.0'
   dependency             'activerecord', '~> 4.0'
-  dependency             'tins',         '~> 1.12.0'
+  dependency             'tins',         '~> 1.12'
   development_dependency 'test-unit',    '~>3.0'
   development_dependency 'byebug'
   development_dependency 'simplecov'

data/VERSION

@@ -1 +1 @@
-2.3.8
+2.4.0

data/active_record_mutex.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: active_record_mutex 2.3.8 ruby lib
+# stub: active_record_mutex 2.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active_record_mutex".freeze
-  s.version = "2.3.8"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2016-09-07"
+  s.date = "2016-11-23"
   s.description = "Mutex that can be used to synchronise ruby processes via an ActiveRecord datababase connection. (Only Mysql is supported at the moment.)".freeze
   s.email = "flori@ping.de".freeze
   s.extra_rdoc_files = ["README.md".freeze, "lib/active_record/database_mutex.rb".freeze, "lib/active_record/database_mutex/implementation.rb".freeze, "lib/active_record/database_mutex/version.rb".freeze, "lib/active_record/mutex.rb".freeze, "lib/active_record_mutex.rb".freeze]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/flori/active_record_mutex".freeze
   s.licenses = ["GPL-2".freeze]
   s.rdoc_options = ["--title".freeze, "ActiveRecordMutex - Implementation of a Mutex for Active Record".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "2.6.4".freeze
+  s.rubygems_version = "2.6.7".freeze
   s.summary = "Implementation of a Mutex for Active Record".freeze
   s.test_files = ["test/database_mutex_test.rb".freeze, "test/test_helper.rb".freeze]
 
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<mysql2>.freeze, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<activerecord>.freeze, ["~> 4.0"])
-      s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.12.0"])
+      s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.12"])
     else
       s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.7.1"])
       s.add_dependency(%q<test-unit>.freeze, ["~> 3.0"])
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<mysql2>.freeze, ["~> 0.3.0"])
       s.add_dependency(%q<activerecord>.freeze, ["~> 4.0"])
-      s.add_dependency(%q<tins>.freeze, ["~> 1.12.0"])
+      s.add_dependency(%q<tins>.freeze, ["~> 1.12"])
     end
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.7.1"])
@@ -47,6 +47,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<mysql2>.freeze, ["~> 0.3.0"])
     s.add_dependency(%q<activerecord>.freeze, ["~> 4.0"])
-    s.add_dependency(%q<tins>.freeze, ["~> 1.12.0"])
+    s.add_dependency(%q<tins>.freeze, ["~> 1.12"])
   end
 end

data/lib/active_record/database_mutex/implementation.rb

@@ -6,29 +6,25 @@ module ActiveRecord
     class Implementation
 
       class << self
-        attr_accessor :table_name
+        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
-      self.table_name = 'active_record_mutex_counters'
 
       # 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"
-        query %{
-          CREATE TABLE IF NOT EXISTS #{table_name}
-            (
-              name CHAR(255) NOT NULL,
-              counter INT UNSIGNED NOT NULL DEFAULT 1,
-              PRIMARY KEY (name(128))
-            ) DEFAULT CHARSET=utf8mb4
-        }
-      end
-
-      def table_name
-        self.class.table_name
-      end
-
-      def db
-        ActiveRecord::Base.connection
+        counter or raise ArgumentError, 'argument :name is too long'
       end
 
       # Returns the name of this mutex as given as a constructor argument.
@@ -86,7 +82,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
@@ -109,7 +105,7 @@ module ActiveRecord
 
       # Returns true if this mutex is unlocked at the moment.
       def unlocked?
-        query(%{ SELECT IS_FREE_LOCK(#{quote(name)}) }).to_i == 1
+        query("SELECT IS_FREE_LOCK(#{quote(name)})") == 1
       end
 
       # Returns true if this mutex is locked at the moment.
@@ -140,26 +136,24 @@ 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 %{
-          INSERT INTO #{table_name} (name)
-            VALUES (#{quote(@name)})
-            ON DUPLICATE KEY UPDATE counter = counter + 1
-        }
+        query("SET #{counter} = IF(#{counter} IS NULL OR #{counter} = 0, 1, #{counter} + 1)")
       end
 
       def decrease_counter
-        query %{
-          UPDATE #{table_name} SET counter = counter - 1
-            WHERE name = #{quote(@name)}
-        }
+        query("SET #{counter} = #{counter} - 1")
       end
 
       def counter_value
-        query(%{
-          SELECT counter FROM #{table_name}
-            WHERE name = #{quote(@name)}
-        }).to_i
+        query("SELECT #{counter}").to_i
       end
 
       def counter_zero?
@@ -172,7 +166,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
@@ -184,13 +178,16 @@ module ActiveRecord
         end
       end
 
-      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
+      def query(sql)
+        if result = self.class.db.execute(sql)
+          result = result.first.first.to_i
+          $DEBUG and warn %{query("#{sql}") = #{result}}
         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.8'
+  VERSION         = '2.4.0'
   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,4 +146,9 @@ 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.8
+  version: 2.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.12'
 description: Mutex that can be used to synchronise ruby processes via an ActiveRecord
   datababase connection. (Only Mysql is supported at the moment.)
 email: flori@ping.de
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Implementation of a Mutex for Active Record