pesto 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a4d29e05c469f38626211b849e51d025fb9ebd
-  data.tar.gz: 4bfff9da5343b7f71aa5da6cf49d19644246f60d
+  metadata.gz: '0802911e97e5cd42de96021e46103e4d8730bef6'
+  data.tar.gz: a6a6a9f48f7b52e4574705dc220c265fc04183cd
 SHA512:
-  metadata.gz: 3de8857a9826ba5d33e493de92815210bfe263a23068537dbbfeb276528960d8a9c85552e8f14de60dc6b0c8ece28af1d13d973b40eb71fb4ac97e05b3e9f9a1
-  data.tar.gz: e9feaff53acec342d69c28fe70090cfd6dc7f3488a4768f96b4ccecd3fb097fb0d4e93a6610499b7cb77c173eb549a690b81871d24f2ee5817531aa61451043f
+  metadata.gz: fb17c467e1848403b5e590f430605d193052abe2ff7b1ea35cb6bbb8ce5e888c3a04787ffdb0dd83ab87ddf16dc6a29d59cd10cec7e0ccf044e33dbc35e9873f
+  data.tar.gz: ff214b249fa8e1513a82542654a20a29ff8833f12e85f655dc556f5046bf91a65367f04a111dcf33478c1185ac9d7a3d67421bc4be7ad527c94e9480c5bda0c0

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    pesto (0.0.10)
+    pesto (0.0.15)
       connection_pool (~> 2.2)
-      hiredis (~> 0.6)
       redis (~> 4.0)
 
 GEM
@@ -13,7 +12,6 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     fakeredis (0.1.4)
-    hiredis (0.6.1)
     json (2.1.0)
     redis (4.0.1)
     rspec (3.6.0)

data/examples/aggressive.rb

@@ -1,15 +1,14 @@
 require 'connection_pool'
-require 'hiredis'
 require 'redis'
 require 'securerandom'
 require_relative '../lib/pesto.rb'
 
 $use_sleep = false
-$key_num = 20
+$key_num = 5
 $concurrency = 10
 
 def lock(ctx, pfx, pid = 0)
-  pl = Pesto::Lock.new({ :pool => ctx[:pool], :verbose => true })
+  pl = Pesto::Lock.new({ :pool => ctx[:pool] })
   keys = []
 
   for i in 0..$key_num
@@ -46,7 +45,7 @@ Signal.trap('TERM')  { killall(children) }
 for pid in 0..$concurrency
   puts "[#{pid}] fork"
   children << fork do
-    redis = ConnectionPool.new(size: 5, :timeout => 10) { Redis.new(:driver => :hiredis) }
+    redis = ConnectionPool.new(size: 3, :timeout => 10) { Redis.new }
     while true do
       lock({ :pool => redis }, pfx, pid)
       if $use_sleep

data/examples/simple.rb

@@ -0,0 +1,42 @@
+require 'connection_pool'
+require 'redis'
+require 'securerandom'
+require_relative '../lib/pesto.rb'
+
+$key_num = 5
+
+def lock(ctx, pfx, pid = 0)
+  pl = Pesto::Lock.new({ :pool => ctx[:pool], :verbose => true })
+  keys = []
+
+  for i in 0..$key_num
+    keys << "pesto:#{pfx}:#{i}"
+  end
+
+  keys.shuffle!
+
+  d1 = Time.now
+
+  locked = pl.lock(keys, timeout_lock: 0.05, interval_check: 0.005 )
+
+  if locked == 1
+    pl.unlock(keys)
+    puts "[#{pid}] lock acquired/dismissed (took: #{(Time.now - d1) * 1000}ms)"
+  else
+    puts "[#{pid}] lock failed"
+  end
+end
+
+pfx = SecureRandom.hex(10)
+
+def killall()
+  Process.exit
+end
+
+Signal.trap('INT') { killall }
+Signal.trap('TERM') { killall }
+
+redis = ConnectionPool.new(size: 5, :timeout => 10) { Redis.new }
+while true do
+  lock({ :pool => redis }, pfx, 0)
+end

data/lib/pesto.rb

@@ -1,4 +1,3 @@
-require 'hiredis'
 require 'redis'
 require 'connection_pool'
 require 'pesto/lock'

data/lib/pesto/lock.rb

@@ -7,7 +7,6 @@ module Pesto
       raise 'ERR_REDIS_NOTFOUND' if @ctx[:pool].nil?
 
       @conf = {
-        :lock_expire => true,
         :timeout_lock_expire => 5,
         :timeout_lock => 1,
         :interval_check => 0.05
@@ -20,19 +19,20 @@ module Pesto
       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 \
+          "local ret = 0 \
+          local timeout = tonumber(ARGV[1]) \
+          if type(timeout) ~= 'number' then \
             return 0 \
-          end"
+          end \
+          local res = redis.call('setnx', KEYS[1], 1) \
+          if res == 1 then \
+            redis.call('expire', KEYS[1], ARGV[1]) \
+            ret = 1 \
+          else \
+            ret = 0 \
+          end \
+          return ret"
         )
-        puts @script_sha
       end
     end
 
@@ -58,6 +58,7 @@ module Pesto
       opts[:timeout_lock_expire] += (opts[:timeout_lock] * names.size).ceil.to_i
 
       t_start = Time.now
+      stop = false
 
       while true
         res, locks, stop = get_locks names, {
@@ -78,23 +79,23 @@ module Pesto
       locks = []
       res = []
 
-      timeout_lock_expire = conf[:lock_expire] ? opts[:timeout_lock_expire] : -1
+      timeout_lock_expire = opts[:timeout_lock_expire]
 
       cp.with do |rc|
-        res = rc.pipelined do
+        res = rc.multi do
           names.each do |n|
-            rc.evalsha(@script_sha, {
+            res << rc.evalsha(@script_sha, {
               :keys => [lock_hash(n)],
               :argv => [timeout_lock_expire]
             })
           end
         end
+      end
 
-        names.each_with_index do |n, ix|
-          next if res[ix] != 1
-          locked += 1
-          locks.push n
-        end
+      names.each_with_index do |n, ix|
+        next if res[ix] != 1
+        locked += 1
+        locks.push n
       end
 
       return [res, locks, locked == names.size]
@@ -117,14 +118,14 @@ module Pesto
       res = []
 
       cp.with do |rc|
-        res = rc.pipelined do
+        res = rc.multi do
           names.each do |n|
             rc.del(lock_hash(n))
           end
         end
       end
 
-      val = res.reduce(0){|sum,n| sum+n}
+      val = res.reduce(0){|sum, n| sum + n}
 
       val > 0 ? 1 : 0
     end

data/lib/pesto/version.rb

@@ -1,3 +1,3 @@
 module Pesto
-  VERSION = "0.0.11"
+  VERSION = "0.0.15"
 end

data/pesto.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "hiredis", "~> 0.6"
   s.add_runtime_dependency "redis", "~> 4.0"
   s.add_runtime_dependency "connection_pool", "~> 2.2"
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pesto
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - bfx devs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +92,7 @@ files:
 - Gemfile.lock
 - README.md
 - examples/aggressive.rb
+- examples/simple.rb
 - lib/pesto.rb
 - lib/pesto/lock.rb
 - lib/pesto/version.rb