sidekiq-ultimate 0.0.1.alpha.17 → 0.0.1.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f524ab4f87ba7a8c687046e2ef2893b29a709d35765620df2c212bb5325cc2
-  data.tar.gz: 7be36332d763fb27106eb4212a9454aa54b665df630ec27df90c777fc0c7638b
+  metadata.gz: b03e4fcb8c750d690c00ab84b69838ba9395c06bcf57b710d6c015b6b1b8254d
+  data.tar.gz: a45b5017f30bf1d10307de9a55d1bfe0179c78d2573585e78db7eda68806c01d
 SHA512:
-  metadata.gz: ce2c291e7b34d21adb5c9d1c57fb48208eb385714a9650233519f507d878ecc6efbb6089eb284e149ce262ea5e1b04e5f586628d5143bb42d4617e3e0729f53c
-  data.tar.gz: f4aca94bb0798554e6fcfda6617af4c9ec6f905ea31dcdceff1c8fb450523f9c423060630cba0d870b5ef03ad9b1ccf9fb19dda1c8587bfe9f1c35cbad8480c0
+  metadata.gz: 4daadb4fd2d32bab2119968ac1e290fbf75daeba8ad3e77c276ee8fc284e1df8fb22bd7b76d9cb80d0fd18258cd1e4cd412c8637405b0354b8c90dc414bd1d26
+  data.tar.gz: c894a3c906a12ee3552237324a17d0bd36d89c448b8105f784113064e70d8b577e1c98f9c5011a74b3860ae11621ea66baabe99bbdde23a337c872ecd6dd2ad0

data/lib/sidekiq/ultimate/expirable_set.rb

@@ -34,7 +34,7 @@ module Sidekiq
 
       # Create a new ExpirableSet instance.
       def initialize
-        @set = {}
+        @set = Hash.new(0.0)
         @mon = Monitor.new
       end
 
@@ -55,9 +55,7 @@ module Sidekiq
           expires_at = Concurrent.monotonic_time + ttl
 
           # do not allow decrease element's expiry
-          break if @set.key?(element) && expires_at <= @set[element]
-
-          @set[element] = expires_at
+          @set[element] = expires_at if @set[element] < expires_at
         end
 
         self

data/lib/sidekiq/ultimate/fetch.rb

@@ -23,7 +23,6 @@ module Sidekiq
       def initialize(options)
         @exhausted = ExpirableSet.new
 
-        @debug  = ENV["DEBUG_SIDEKIQ_ULTIMATE"] ? {} : nil
         @strict = options[:strict] ? true : false
         @queues = options[:queues].map { |name| QueueName.new(name) }
 
@@ -37,7 +36,8 @@ module Sidekiq
         if work&.throttled?
           work.requeue_throttled
 
-          @exhausted.add(work.queue, :ttl => THROTTLE_TIMEOUT)
+          queue = QueueName.new(work.queue_name)
+          @exhausted.add(queue, :ttl => THROTTLE_TIMEOUT)
 
           return nil
         end
@@ -59,8 +59,6 @@ module Sidekiq
       def retrieve
         Sidekiq.redis do |redis|
           queues.each do |queue|
-            debug!(queue)
-
             job = redis.rpoplpush(queue.pending, queue.inproc)
             return UnitOfWork.new(queue, job) if job
 
@@ -86,18 +84,6 @@ module Sidekiq
           instance_variable_get(:@paused_queues).
           map { |q| QueueName[q] }
       end
-
-      def debug!(queue)
-        return unless @debug
-
-        previous, @debug[queue] = @debug[queue], Concurrent.monotonic_time
-
-        return unless previous
-
-        Sidekiq.logger.debug do
-          "Queue #{queue} last time polled: #{@debug[queue] - previous} s ago"
-        end
-      end
     end
   end
 end

data/lib/sidekiq/ultimate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-ultimate
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.17
+  version: 0.0.1.alpha.18
 platform: ruby
 authors:
 - Alexey Zapparov
@@ -114,7 +114,6 @@ files:
 - lib/sidekiq/ultimate.rb
 - lib/sidekiq/ultimate/expirable_set.rb
 - lib/sidekiq/ultimate/fetch.rb
-- lib/sidekiq/ultimate/fetch/debug.rb
 - lib/sidekiq/ultimate/queue_name.rb
 - lib/sidekiq/ultimate/resurrector.rb
 - lib/sidekiq/ultimate/resurrector/resurrect.lua

data/lib/sidekiq/ultimate/fetch/debug.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq/throttled"
-
-require "sidekiq/ultimate/debugging"
-require "sidekiq/ultimate/expirable_set"
-require "sidekiq/ultimate/queue_name"
-require "sidekiq/ultimate/resurrector"
-require "sidekiq/ultimate/unit_of_work"
-
-module Sidekiq
-  module Ultimate
-    # Throttled reliable fetcher implementing reliable queue pattern.
-    class Fetch
-      class Debug
-        def initialize
-          @queues_stats = {}
-        end
-      end
-    end
-  end
-end