pesto 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffdc583cb4fa5d4f90d988bd97fd6886e1ff73ef
-  data.tar.gz: f9bd9ba9a341b286dccef5af3d516fff459f6e72
+  metadata.gz: 548db411d5cb5f639bc299add68aa29af743b2f3
+  data.tar.gz: 63a79d43327c3419a882e2faea5f5aadca73f6b0
 SHA512:
-  metadata.gz: 82838a19298c2995c7c70c31d00c49b86c0be724baac794f5d06951fc8e49e14f7ce9ccbd0402aa97dd3addf9022d69369cc65a886a22a182c93b13bb968e6fa
-  data.tar.gz: a75619382478f790f7f4eab8e981b66846900c26c7fbcbf715cd51dcbdec42668427fc199b65e870dc97a71a2ba054c7738b3fd3e29a6f65bc687191e21f1c37
+  metadata.gz: 70f9c0677b515a53aa0ca1b12b920a6ee1265240b701f9ebb5f8ed9fb9dce88250e0e96a3719e7ba3a680fdd93bcd8cc0be078f92546893646556033fea4db51
+  data.tar.gz: 15106012331ba282174c90108c7877e419d88f112f06ad1c172c3a2179abaff01f00a3d31a2fb0495de027d538e652a18ff7a9545ec902681e793de8a632e9ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pesto (0.0.7)
+    pesto (0.0.10)
       connection_pool (~> 2.2)
       hiredis (~> 0.6)
       redis (~> 3.3)

data/examples/aggressive.rb

@@ -49,7 +49,7 @@ for pid in 0..$concurrency
     redis = ConnectionPool.new(size: 5, :timeout => 10) { Redis.new(:driver => :hiredis) }
     while true do
       lock({ :pool => redis }, pfx, pid)
-      if use_sweep
+      if $use_sleep
         delay = rand(1000).to_f / 10000.0
         sleep delay
       end

data/lib/pesto/lock.rb

@@ -12,6 +12,28 @@ module Pesto
         :timeout_lock => 1,
         :interval_check => 0.05
       }.merge(opts)
+
+      load_scripts
+    end
+
+    def load_scripts
+      cp.with do |rc|
+        @script_sha = rc.script(
+          :load,
+          "local timeout = tonumber(ARGV[1])
+          assert(type(timeout) == 'number', 'timeout expects a number') \
+
+          if redis.call('setnx', KEYS[1], 1) == 1 then \
+            if tonumber(ARGV[1]) > -1 then \
+              redis.call('expire', KEYS[1], timeout) \
+            end
+            return 1 \
+          else \
+            return 0 \
+          end"
+        )
+        puts @script_sha
+      end
     end
 
     def conf
@@ -33,14 +55,14 @@ module Pesto
 
       names = (_names.is_a?(String) ? [_names] : _names).uniq
       opts[:timeout_lock_expire] = opts[:timeout_lock_expire].to_i
-      opts[:timeout_lock_expire] += opts[:timeout_lock] * names.size
+      opts[:timeout_lock_expire] += (opts[:timeout_lock] * names.size).ceil.to_i
 
       t_start = Time.now
 
       while true
-        res, locks, stop = get_locks names
-
-        expire names, opts if stop && conf[:lock_expire]
+        res, locks, stop = get_locks names, {
+          :timeout_lock_expire => opts[:timeout_lock_expire]
+        }
 
         break if stop || (Time.now - t_start) > opts[:timeout_lock]
 
@@ -51,30 +73,25 @@ module Pesto
       stop ? 1 : 0
     end
 
-    def expire names, opts={}
-      cp.with do |rc|
-        rc.pipelined do
-          names.each do |n|
-            rc.expire lock_hash(n), opts[:timeout_lock_expire].to_i
-          end
-        end
-      end
-    end
-
-    def get_locks names
+    def get_locks names, opts = {}
       locked = 0
       locks = []
       res = []
 
+      timeout_lock_expire = conf[:lock_expire] ? opts[:timeout_lock_expire] : -1
+
       cp.with do |rc|
         res = rc.pipelined do
           names.each do |n|
-            rc.setnx lock_hash(n), 1
+            rc.evalsha(@script_sha, {
+              :keys => [lock_hash(n)],
+              :argv => [timeout_lock_expire]
+            })
           end
         end
 
         names.each_with_index do |n, ix|
-          next unless res[ix]
+          next if res[ix] != 1
           locked += 1
           locks.push n
         end

data/lib/pesto/version.rb

@@ -1,3 +1,3 @@
 module Pesto
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pesto
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - bfx devs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis