redis_queue 0.2.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2201c5c59c9745c3cbf47ecab0f0320fd2047b68
-  data.tar.gz: 3cc5543162e1c7b875a2a43b192ea2d138ed9f90
+  metadata.gz: 14ecb40d446afdf9a51b35bba011c7b624b564da
+  data.tar.gz: 165266f148f89bb86f186ee5b1ea1a3d12519f3b
 SHA512:
-  metadata.gz: 11cf94f54444abf30672422e09f1b438523c477b411fdb2f36b82388befe6bb5748d1a7193d3b309b45af1a9d4a968cd92d6f52c07715abfbcc38108ec3c01dc
-  data.tar.gz: 1e65a38240397b876a20799dc10d4f6b555017864165c9d1ac78b0eacef78a401a365f1592b0cb359c6957b6c8974b6e81fdd73a1a4637e80fedb142970414d6
+  metadata.gz: 27ee2b2f69ac03bccc97ebaa87feb1f7f7224dd56261ef7c2167ca467d152d7215925633302158e9716cb0cb7296944051970b25f402855c3aaa24c3c8f225e7
+  data.tar.gz: c2399835758c0c4ffb8ab54f57dfd0a51216a2c4402622db938e9932ca6e3013b0cb61c5cef9c0442580d5d16a905f26ff5f2a3c3fdb34dedc75e4639a8518ab

data/lib/redis_queue.rb

@@ -1,16 +1,37 @@
 require_relative 'redis_connection'
 
 class RedisQueue
+  SCRIPTS       = {
+    fail: """
+      redis.call('sadd', ARGV[1]..'_failed', ARGV[2])
+      redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
+    """,
+    done: """
+      redis.call('sadd', ARGV[1]..'_done', ARGV[2])
+      redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
+    """,
+    unpop: """
+      redis.call('lpush', ARGV[1], ARGV[2])
+      redis.call('srem', ARGV[1]..'_in_use', ARGV[2])
+    """,
+    init_from: """
+      local vals = redis.call('smembers', ARGV[2])
+      for i = 1, table.getn(vals) do
+        redis.call('rpush', ARGV[1], vals[i])
+      end"""
+  }
+
   def initialize args={id: :messages, url: 'redis://localhost:6379/0'}
     @id             = args.delete(:id)
     @redis          = RedisConnection.new(args)
     @redis_blocking = RedisConnection.new(args)
+    load_scripts
   end
 
   def pop
-    message = @redis_blocking.run { |redis| redis.blpop(@id) }.last
-    @redis.run { |redis| redis.sadd "#{@id}_in_use", message }
-    message
+    task = @redis_blocking.run { |redis| redis.blpop(@id) }.last
+    @redis.run { |redis| redis.sadd "#{@id}_in_use", task }
+    task
   end
 
   def push task
@@ -18,24 +39,15 @@ class RedisQueue
   end
 
   def fail task
-    @redis.run do |redis|
-      redis.sadd "#{@id}_failed", task
-      redis.srem "#{@id}_in_use", task
-    end
+    script :fail, @id, task
   end
 
   def done task
-    @redis.run do |redis|
-      redis.sadd "#{@id}_done", task
-      redis.srem "#{@id}_in_use", task
-    end
+    script :done, @id, task
   end
 
   def unpop task
-    @redis.run do |redis|
-      redis.lpush @id, task
-      redis.srem "#{@id}_in_use", task
-    end
+    script :unpop, @id, task
   end
 
   def reset
@@ -49,12 +61,7 @@ class RedisQueue
   end
 
   def init_from set
-    @redis.run do |redis|
-      redis.eval "local vals = redis.call('smembers', '#{set}')
-      for i = 1, table.getn(vals) do
-        redis.call('rpush', '#{@id}', vals[i])
-      end"
-    end
+    script(:init_from, @id, set)
   end
 
   def size
@@ -111,4 +118,19 @@ class RedisQueue
       redis.del "#{@id}_failed"
     end
   end
+
+  private
+
+  def load_scripts
+    @scripts = {}
+    @redis.run do |redis|
+      SCRIPTS.each do |name, code|
+        @scripts[name] = redis.script(:load, code)
+      end
+    end
+  end
+
+  def script name, *args
+    @redis.run { |redis| redis.evalsha @scripts[name], argv: args }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_queue
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: '0.3'
 platform: ruby
 authors:
 - Jose Ignacio Fernandez