redlock_for_collection 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3378d1d9df7bf21c5b3193f6718114f5a757920b
-  data.tar.gz: 8fc50b970e8117bff0c304a4147616280369f58a
+  metadata.gz: 4937ef3a7fc3cc932e53c070779e4111f570003c
+  data.tar.gz: ea8133464f2c73a36ca2688676908ece989dfc06
 SHA512:
-  metadata.gz: fa0d2f377be01b32396ab97ed61b273f4598be78b8f0710b0e524b7fc6f5e26d0f5e1ee075d42e610e8d766331cc1eea3a255d702ca58cdfa1a0437b6f12cc3d
-  data.tar.gz: 2d36951d26cdfed4fdb956ec49f7f98d368d41150d394427ee0734a4d1df76d407741b7752e5d1414002906acdcd506f002c7c4018a3a49d011fb079a2ac2d42
+  metadata.gz: 64e5152770347cf2cbcfa4f74f0b60e6c882b74bf9239bd5b0da689dbbfddad25e3efb9275f5c9b5079d1da74e60e73ba0b509b3edc0d078cdc588187a8c6f06
+  data.tar.gz: 16afb06e26f1f7c7dc85e3ba0850fc3183feb42eaa744d1492596e1c981402733e7463c8b769dbc101458f325f57748691df4a5c35017585ef0ee4652bc072fe

data/lib/redlock_for_collection/collection.rb

@@ -5,6 +5,8 @@ module RedlockForCollection
     DEFAULT_KEY_METHOD = 'key'.freeze
     DEFAULT_KEY_PREFIX = 'prefix'.freeze
 
+    LockPair = Struct.new(:object, :lock_info, :status)
+
     attr_reader :objects, :options, :pool
 
     def initialize(objects, options, pool)
@@ -15,47 +17,32 @@ module RedlockForCollection
       init_options
     end
 
-
     def lock(&block)
-      locked_objects   = []
-      unlocked_objects = []
-
-      locks_info         = []
-      expired_locks_info = []
+      lock_pairs = []
 
+      start_time = (Time.now.to_f * 1000).to_i
       @objects.each do |object|
         @pool.with do |redlock|
           lock_info = redlock.lock(build_key_for(object), @options[:ttl])
-
-          # Check if ttl is enough
-          if lock_info && (lock_info[:validity] > (@options[:min_validity]))
-            locked_objects << object
-            locks_info     << lock_info
-          else
-            expired_locks_info << lock_info if lock_info
-            unlocked_objects   << object
-          end
+          lock_pairs << LockPair.new(object, lock_info)
         end
       end
+      end_time = (Time.now.to_f * 1000).to_i
+
+      separated_pairs = separate_expired_pairs(lock_pairs, end_time - start_time)
 
       begin
-        block.yield(locked_objects, unlocked_objects)
+        separated_pairs[:valid].map(&:object)
+        separated_pairs[:expired].map(&:object)
+        block.yield(separated_pairs[:valid].map(&:object), separated_pairs[:expired].map(&:object))
       ensure
         # Release the all acquired locks
-        unlock(expired_locks_info)
-        unlock(locks_info)
+        unlock(lock_pairs)
       end
     end
 
-
     protected
 
-    def unlock(locks_info)
-      @pool.with do |redlock|
-        locks_info.each { |lock_info| redlock.unlock(lock_info) }
-      end
-    end
-
     def init_options
       @options[:key_prefix]   ||= DEFAULT_KEY_PREFIX
       @options[:key_method]   ||= DEFAULT_KEY_METHOD
@@ -63,10 +50,39 @@ module RedlockForCollection
       @options[:ttl]          ||= DEFAULT_TTL
     end
 
+    # @param lock_pairs [Array<LockPair>]
+    def unlock(lock_pairs)
+      @pool.with do |redlock|
+        lock_pairs.each do |lock_pair|
+          redlock.unlock(lock_pair.lock_info) if lock_pair.lock_info
+        end
+      end
+    end
+
     def build_key_for(object)
       (@options[:key_prefix]) + object.send(@options[:key_method]).to_s
     end
 
+    # @param lock_pairs [Array<LockPair>]
+    # @param elapsed [Integer]
+    # @return [Hash]
+    def separate_expired_pairs(lock_pairs, elapsed)
+      expired_pairs = []
+      valid_pairs   = []
+
+      lock_pairs.each do |lock_pair|
+        if lock_pair.lock_info && ((lock_pair.lock_info[:validity] - elapsed) > (@options[:min_validity]))
+          lock_pair.status = :valid
+          valid_pairs << lock_pair
+        else
+          lock_pair.status= :expired
+          expired_pairs <<  lock_pair
+        end
+      end
+
+      { valid: valid_pairs, expired: expired_pairs }
+    end
+
   end
 end
 

data/lib/redlock_for_collection/configuration.rb

@@ -14,20 +14,16 @@ module RedlockForCollection
       @pool_size    = 5
       @pool_timeout = 5
       @redis_urls   = ['redis://localhost:6379']
-      @retry_delay  = 5
+      @retry_delay  = 50
       @retry_count  = 5
       @pool         = nil
     end
 
-
     def pool
-      @pool|| begin
-        @pool = ConnectionPool.new(size: @pool_size, timeout: @pool_timeout) do
+      @pool ||= ConnectionPool.new(size: @pool_size, timeout: @pool_timeout) do
           Redlock::Client.new(@redis_urls, retry_delay: @retry_delay, retry_count: @retry_count)
-        end
       end
     end
-
   end
 end
 

data/lib/redlock_for_collection/version.rb

@@ -1,3 +1,3 @@
 module RedlockForCollection
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redlock_for_collection
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - CoolElvis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler