redis-unique-queue 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c090903b2f0f09a20393a18c1df70b7c6e6378
-  data.tar.gz: ad9e42c94f1ee0a273c9d2fadc6fcb55f4d9f7f8
+  metadata.gz: 79dd06e09747ec1015a14103fd72c6e19a121b1c
+  data.tar.gz: 5851bf6cd8e38b65915bc6c449796959c2600c5a
 SHA512:
-  metadata.gz: bcf14202e74611adfd7c51ccf176d78f0391d2f9ddad85ae1918d47071f1606bb02944f9d46c67f266d9251dff73072cdf2c39c22d47e5e240c3966b2f48bd64
-  data.tar.gz: 349bd063035ff95d8d34b67f9218068eb2238aa49971bbde852ed73013ada6ab28af9f4711eeff8d816f4f63a30229898df48e579b78ee32bbe812ce8d2cbf79
+  metadata.gz: b202259ac4ef6ba1bea1b0785d2e40bc519c3aa9d7731b9fe1a1ae2df7ee6f07a4446cec41cbd04170d139059f4df5fab6489e69b48d19f9cd112002349aeea3
+  data.tar.gz: 9f8ae2edf1e423b50a4e159108d560f069abb2961fe6c8047b761b8ab6766526c2dfe828497979142197cb2a25c569175fa0dc740f04d2a73d76866b15f963fa

data/lib/redis/unique/queue.rb

@@ -5,14 +5,14 @@ class Redis
     class Queue
       attr_reader :name
 
-      VERSION = "1.0.2"
+      VERSION = "1.0.3"
 
       class InvalidNameException < StandardError; end;
       class InvalidRedisConfigException < StandardError; end;
 
       def initialize(name, redis_or_options = {})
         name = name.to_s if name.kind_of? Symbol
-        
+
         raise InvalidNameException.new unless name.kind_of?(String) && name.size > 0
         @name  = name
         @redis = if redis_or_options.kind_of? Redis
@@ -25,21 +25,12 @@ class Redis
       end
 
       def push data
-        score = Time.now.to_f
-        @redis.zadd(name, score, data)
+        [block_on_atomic_attempt{ attempt_atomic_push_multi(data) }].flatten.first
       end
 
       def push_multi *values
         if values.size > 0
-          score = Time.now.to_f
-
-          values = values.first if 1 == values.size && values.first.kind_of?(Array)
-          scored_values = []
-          values.each_with_index do |value, i|
-            scored_values << [score + i, value]
-          end
-
-          @redis.zadd name, scored_values
+          block_on_atomic_attempt{ attempt_atomic_push_multi(*values) }
         end
       end
 
@@ -97,7 +88,27 @@ class Redis
       end
 
       private
-      
+
+      def max_score
+        @redis.zscore name, back
+      end
+
+      def attempt_atomic_push_multi *values
+        success = @redis.watch(name) do
+          score = [Time.now.to_f, max_score].compact.max
+          values = values.first if 1 == values.size && values.first.kind_of?(Array)
+          scored_values = []
+          values.each_with_index do |value, i|
+            scored_values << [score + i, value]
+          end
+          @redis.multi do |multi|
+            multi.zadd name, scored_values
+          end
+        end
+
+        [success, values]
+      end
+
       def attempt_atomic_pop_multi amount
         attempt_atomic_read_write lambda{ peek 0, amount }, lambda{  |multi, read_result| multi.zremrangebyrank name, 0, amount - 1 }
       end
@@ -107,11 +118,8 @@ class Redis
       end
 
       def attempt_atomic_pop
-        min_score = 0
-        max_score = Time.now.to_f
-
         read = lambda do
-          @redis.zrangebyscore(name, min_score, max_score, :with_scores => false, :limit => [0, 1]).first
+          @redis.zrangebyscore(name, 0, max_score, :with_scores => false, :limit => [0, 1]).first
         end
 
         write = lambda do |multi, read_result|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-unique-queue
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A unique queue with atomic operations implemented in Redis