porpoise 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb9742ea2691c9286a6d5c59087aa574220e30a
-  data.tar.gz: d35d5078dfa2725190f8298030c1d7aa3fcaf186
+  metadata.gz: f9c9fb178689e3d75dd5d7a2ddebcca83d20dc56
+  data.tar.gz: 749a0a5962cd8f37179f2e2eee29ceb595799bd1
 SHA512:
-  metadata.gz: a2fac198b35735804800e2c18e7cc0a9240fe78f2ad93f7300c3d2b9e3ffdfb446a7ea57134651f4cf04d7a4f5d133872590387718ddec1effa294b9dfc7884a
-  data.tar.gz: 9307bec54ebd9202dfa2a315a9930531b11ebe3562b2e0b98f5b495e9e66f322f6aa05324822f3ed14f1304cba2011ec1c3bd2b6b27d0b3a46c964f4563ccf51
+  metadata.gz: 1d55e8404beff9282361c901e822a76051583f88c6448d26a0d3ffd75bd6c20d3b2dafc4f5d29aa9fa550f8fd53dd6c26f904039503c20123ba09ce7281bd25c
+  data.tar.gz: '009bbfa5f4e889ba6a73521e7db653a9b1eb0bf3de124e1507cdbf178244cc59dd4dcc968208c8aba78558b272d4be4393ffb0a14e57e5097f42e7c55b96ff4b'

data/gemfiles/rails_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    porpoise (0.9.2)
+    porpoise (0.9.3)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       rails (>= 3.2)

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    porpoise (0.9.2)
+    porpoise (0.9.3)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       rails (>= 3.2)

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    porpoise (0.9.2)
+    porpoise (0.9.3)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       rails (>= 3.2)

data/lib/active_support/cache/porpoise_store.rb

@@ -27,7 +27,9 @@ module ActiveSupport
 
       def clear(options = nil)
         short_mem_reset
-        Porpoise::KeyValueObject.where(["`key` LIKE ?", "#{@namespace}:%"]).delete_all
+        Porpoise::KeyValueObject.retry_lock_error(20) do
+          Porpoise::KeyValueObject.where(["`key` LIKE ?", "#{@namespace}:%"]).delete_all
+        end
       end
 
       def decrement(name, amount, options = nil)
@@ -97,6 +99,12 @@ module ActiveSupport
           return val.nil? ? nil : Marshal.load(val)
         rescue TypeError
           return val
+        rescue ArgumentError => e
+          if e.message =~ /marshal data too short/
+            return nil
+          else
+            raise e
+          end
         end
       end
 
@@ -110,6 +118,12 @@ module ActiveSupport
             result[name] = (val.nil? ? nil : Marshal.load(val))
           rescue TypeError
             result[name] = val
+          rescue ArgumentError => e
+            if e.message =~ /marshal data too short/
+              return nil
+            else
+              raise e
+            end
           end
         end
         return result

data/lib/porpoise/hash.rb

@@ -118,7 +118,7 @@ module Porpoise
         elsif o.nil?
           o = Porpoise::KeyValueObject.new(key: key, value: ::Hash.new)
         elsif o.expired?
-          o.delete
+          Porpoise::KeyValueObject.retry_lock_error(20) { o.delete }
           o = Porpoise::KeyValueObject.new(key: key, value: ::Hash.new)
         end
 

data/lib/porpoise/key.rb

@@ -6,7 +6,7 @@ module Porpoise
         aff = 0
 
         unless o.nil?
-          o.delete
+          Porpoise::KeyValueObject.retry_lock_error(20) { o.delete }
           aff += 1
         end 
         
@@ -21,7 +21,9 @@ module Porpoise
 
       def del_matched(matcher)
         matcher = Porpoise::key_with_namespace(matcher.gsub("*", "%"))
-        Porpoise::KeyValueObject.not_expired.where(["`key` LIKE ?", matcher]).delete_all
+        Porpoise::KeyValueObject.retry_lock_error(20) do
+          Porpoise::KeyValueObject.not_expired.where(["`key` LIKE ?", matcher]).delete_all
+        end
       end
 
       def dump(key)
@@ -58,10 +60,13 @@ module Porpoise
         o = find_stored_object(key, true)
         no = find_stored_object(newkey)
         
-        no.delete unless no.nil?
+        unless no.nil?
+          Porpoise::KeyValueObject.retry_lock_error(20) { no.delete }
+        end
+
         no = o.dup
         no.key = newkey
-        o.delete
+        Porpoise::KeyValueObject.retry_lock_error(20) {  o.delete }
 
         no.save
       end
@@ -103,7 +108,7 @@ module Porpoise
         if raise_on_not_found && o.nil?
           raise Porpoise::KeyNotFound.new("Key #{key} could not be found")
         elsif !o.nil? && o.expired?
-          o.delete
+          Porpoise::KeyValueObject.retry_lock_error(20) { o.delete }
           o = nil
           raise Porpoise::KeyNotFound.new("Key #{key} could not be found") if raise_on_not_found
         end

data/lib/porpoise/key_value_object.rb

@@ -20,6 +20,8 @@ class Porpoise::KeyValueObject < ActiveRecord::Base
   end
   # :nocov:
 
+  DEADLOCK_RETRY_COUNT = 20
+
   serialize :value
 
   if ActiveRecord::VERSION::MAJOR == 3
@@ -33,6 +35,22 @@ class Porpoise::KeyValueObject < ActiveRecord::Base
 
   scope :not_expired, -> { where(['(expiration_date IS NOT NULL AND expiration_date > ?) OR expiration_date IS NULL', Time.now]) }
 
+  def self.retry_lock_error(retries = 20, &block)
+    begin
+      yield
+    rescue ActiveRecord::StatementInvalid => e
+      if e.message =~ /Deadlock found when trying to get lock/ and (retries.nil? || retries > 0)
+        retry_lock_error(retries ? retries - 1 : nil, &block)
+      else
+        raise e
+      end
+    rescue ActiveRecord::TransactionIsolationConflict
+      if retries.nil? || retries > 0
+        retry_lock_error(retries ? retries - 1 : nil, &block)
+      end
+    end
+  end
+
   def expired?
     !self.expiration_date.nil? && self.expiration_date < Time.now
   end

data/lib/porpoise/set.rb

@@ -183,7 +183,7 @@ module Porpoise
         elsif o.nil?
           o = Porpoise::KeyValueObject.new(key: key, value: ::Array.new)
         elsif o.expired?
-          o.delete
+          Porpoise::KeyValueObject.retry_lock_error(20) { o.delete }
           o = Porpoise::KeyValueObject.new(key: key, value: ::Array.new)
         end
 

data/lib/porpoise/string.rb

@@ -144,7 +144,7 @@ module Porpoise
         elsif o.nil?
           o = Porpoise::KeyValueObject.new(key: key, value: ::String.new)
         elsif o.expired?
-          o.delete
+          Porpoise::KeyValueObject.retry_lock_error(20) { o.delete }
           o = Porpoise::KeyValueObject.new(key: key, value: ::String.new)
         end
 

data/lib/porpoise/version.rb

@@ -1,3 +1,3 @@
 module Porpoise
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: porpoise
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Wessel van Heerde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler