porpoise 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c9fb178689e3d75dd5d7a2ddebcca83d20dc56
-  data.tar.gz: 749a0a5962cd8f37179f2e2eee29ceb595799bd1
+  metadata.gz: 40868f5a0247e5e68c4b732ebe99cbc152fe8135
+  data.tar.gz: 99d9476f9696789601c1ec97512d65563ccb5aeb
 SHA512:
-  metadata.gz: 1d55e8404beff9282361c901e822a76051583f88c6448d26a0d3ffd75bd6c20d3b2dafc4f5d29aa9fa550f8fd53dd6c26f904039503c20123ba09ce7281bd25c
-  data.tar.gz: '009bbfa5f4e889ba6a73521e7db653a9b1eb0bf3de124e1507cdbf178244cc59dd4dcc968208c8aba78558b272d4be4393ffb0a14e57e5097f42e7c55b96ff4b'
+  metadata.gz: 764eae754b33e385e158eed973dec7b70be44a3e83f64c8374632309b3c0a5d82309e6c65d19018ec5c7d1e40de2eb24bf0ee16d0dcf7e13190072a330deb0b4
+  data.tar.gz: 32f0697bd15f52bc2408876ce2b3f1a2f53b0937a5e30a693784c3fcf6b247a002a6442aa1ad76b7166d94103b74c7702696fc2e11d2abb51933dd3be89002c2

data/gemfiles/rails_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    porpoise (0.9.3)
+    porpoise (0.9.4)
       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.3)
+    porpoise (0.9.4)
       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.3)
+    porpoise (0.9.4)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       rails (>= 3.2)

data/lib/active_support/cache/porpoise_store.rb

@@ -18,17 +18,24 @@ module ActiveSupport
 
       def cleanup(options = nil)
         short_mem_reset
-        Porpoise::KeyValueObject.where(["`key` LIKE ?", "#{@namespace}:%"]).
-                                 where(["expiration_date IS NOT NULL AND expiration_date < ?", Time.now]).
-                                 delete_all
-
-
+        
+        Porpoise::KeyValueObject.retry_lock_error(20) do
+          Porpoise::KeyValueObject.where(["`key` LIKE ?", "#{@namespace}:%"]).
+                                   where(["expiration_date IS NOT NULL AND expiration_date < ?", Time.now]).
+                                   pluck(:key).
+                                   in_groups_of(150) do |object_keys|
+          
+            Porpoise::KeyValueObject.where(key: object_keys).delete_all
+          end
+        end
       end
 
       def clear(options = nil)
         short_mem_reset
         Porpoise::KeyValueObject.retry_lock_error(20) do
-          Porpoise::KeyValueObject.where(["`key` LIKE ?", "#{@namespace}:%"]).delete_all
+          Porpoise::KeyValueObject.where(["`key` LIKE ?", "#{@namespace}:%"]).pluck(:key).in_groups_of(150) do |object_keys|
+            Porpoise::KeyValueObject.where(key: object_keys).delete_all
+          end
         end
       end
 

data/lib/porpoise/key.rb

@@ -22,7 +22,9 @@ module Porpoise
       def del_matched(matcher)
         matcher = Porpoise::key_with_namespace(matcher.gsub("*", "%"))
         Porpoise::KeyValueObject.retry_lock_error(20) do
-          Porpoise::KeyValueObject.not_expired.where(["`key` LIKE ?", matcher]).delete_all
+          Porpoise::KeyValueObject.not_expired.where(["`key` LIKE ?", matcher]).pluck(:key).in_groups_of(150) do |object_keys|
+            Porpoise::KeyValueObject.where(key: object_keys).delete_all
+          end
         end
       end
 

data/lib/porpoise/key_value_object.rb

@@ -44,10 +44,6 @@ class Porpoise::KeyValueObject < ActiveRecord::Base
       else
         raise e
       end
-    rescue ActiveRecord::TransactionIsolationConflict
-      if retries.nil? || retries > 0
-        retry_lock_error(retries ? retries - 1 : nil, &block)
-      end
     end
   end
 

data/lib/porpoise/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: porpoise
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Wessel van Heerde