sidekiq-ultimate 0.0.1.alpha.5 → 0.0.1.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0176019d0fa6bd44ec34fb292e7caafdaa78ab4c8d5dc33c03f2f933b5db74
-  data.tar.gz: ab8225dae6c14e67784ef3147cad83e1d1597df234626837207d6fd8ba783997
+  metadata.gz: 93e1eaff50e0499819b57d210931b829eaf89c6843ddfeeb3a027a8e3291908f
+  data.tar.gz: 6071458dd821cda0e00891af04801841a62b52e0aea2b4e1523d93b4345fbffe
 SHA512:
-  metadata.gz: d222fcb849ad439eddb9957c6b4fc9c87010181e5b97dc217eaf512402902137671141f090ab3a431fba12d13c145e11d5c6bcd477c94319e267daebfcbfeb97
-  data.tar.gz: f5ec33ba4bbf1159ec79f12dc4c416f6a79b77f64c4f161bf85690f40173702c513e475884e84dc127a24bc6373b32dc8e84bd59e64dcab36cfd45e8b48ab946
+  metadata.gz: 29e14a9eea62466ca4212f25b475424c864f70146996c7518a0c8115d56d5f8f5c6547af38176e20def8391f10cecb83715363df5f62d2228e68b4854dd5cd1e
+  data.tar.gz: 9aeaf41ebc64f0e3bfa181e8acaaf34e775f0fa47ef58ce71ab81a9917b8681fbdd3db93b75e99a50063381a61cf3b4077d0f0aeb1fb06e259f69f924329e3d5

data/lib/sidekiq/ultimate/{expirable_list.rb → expirable_set.rb}

@@ -29,24 +29,32 @@ module Sidekiq
     # @see https://linux.die.net/man/3/clock_gettime
     #
     # @private
-    class ExpirableList
+    class ExpirableSet
       include Enumerable
 
-      # Create a new ExpirableList instance.
-      #
-      # @param ttl [Float] elements time-to-live in seconds
-      def initialize(ttl)
-        @ttl = ttl.to_f
-        @arr = []
+      # Create a new ExpirableSet instance.
+      def initialize
+        @set = {}
         @mon = Monitor.new
       end
 
-      # Pushes given element into the list.
+      alias to_ary to_a
+
+      # Adds given element into the set.
       #
       # @params element [Object]
-      # @return [ExpirableList] self
-      def <<(element)
-        @mon.synchronize { @arr << [Concurrent.monotonic_time, element] }
+      # @param ttl [Numeric] elements time-to-live in seconds
+      # @return [ExpirableSet] self
+      def add(element, ttl:)
+        @mon.synchronize do
+          expires_at = Concurrent.monotonic_time + ttl
+
+          # do not allow decrease element's expiry
+          break if @set[element] && @set[element] >= expires_at
+
+          @set[element] = expires_at
+        end
+
         self
       end
 
@@ -55,18 +63,15 @@ module Sidekiq
       #
       # @yield [element]
       # @return [Enumerator] if no block given
-      # @return [ExpirableList] self if block given
+      # @return [ExpirableSet] self if block given
       def each
         return to_enum __method__ unless block_given?
 
-        # Evict expired elements
         @mon.synchronize do
-          horizon = Concurrent.monotonic_time - @ttl
-          @arr.shift while @arr[0] && @arr[0][0] < horizon
+          horizon = Concurrent.monotonic_time
+          @set.each { |k, v| v < horizon ? @set.delete(k) : yield(k) }
         end
 
-        @arr.dup.each { |element| yield element[1] }
-
         self
       end
     end

data/lib/sidekiq/ultimate/fetch.rb

@@ -2,7 +2,7 @@
 
 require "sidekiq/throttled"
 
-require "sidekiq/ultimate/expirable_list"
+require "sidekiq/ultimate/expirable_set"
 require "sidekiq/ultimate/queue_name"
 require "sidekiq/ultimate/resurrector"
 require "sidekiq/ultimate/unit_of_work"
@@ -11,12 +11,15 @@ module Sidekiq
   module Ultimate
     # Throttled reliable fetcher implementing reliable queue pattern.
     class Fetch
-      # Timeout to sleep between fetch retries in case of no job received,
-      # as well as timeout to wait for redis to give us something to work.
+      # Timeout to sleep between fetch retries in case of no job received.
       TIMEOUT = 2
 
+      # Timeout to sleep between queue fetch attempts in case if last job
+      # of it was throttled.
+      THROTTLE_TIMEOUT = 10
+
       def initialize(options)
-        @exhausted = ExpirableList.new(2 * TIMEOUT)
+        @exhausted = ExpirableSet.new
 
         @strict = options[:strict] ? true : false
         @queues = options[:queues].map { |name| QueueName.new(name) }
@@ -31,7 +34,7 @@ module Sidekiq
         return work unless work.throttled?
 
         work.requeue_throttled
-        @exhausted << work.queue
+        @exhausted.add(work.queue, :ttl => THROTTLE_TIMEOUT)
       end
 
       def self.bulk_requeue(*)
@@ -51,7 +54,7 @@ module Sidekiq
             job = redis.rpoplpush(queue.pending, queue.inproc)
             return UnitOfWork.new(queue, job) if job
 
-            @exhausted << queue
+            @exhausted.add(queue, :ttl => TIMEOUT)
           end
         end
 

data/lib/sidekiq/ultimate/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Ultimate
     # Gem version.
-    VERSION = "0.0.1.alpha.5"
+    VERSION = "0.0.1.alpha.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-ultimate
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.5
+  version: 0.0.1.alpha.6
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -112,7 +112,7 @@ files:
 - README.md
 - Rakefile
 - lib/sidekiq/ultimate.rb
-- lib/sidekiq/ultimate/expirable_list.rb
+- lib/sidekiq/ultimate/expirable_set.rb
 - lib/sidekiq/ultimate/fetch.rb
 - lib/sidekiq/ultimate/queue_name.rb
 - lib/sidekiq/ultimate/resurrector.rb