Expire older changelog entries first (#698)

* Expire older changelog entries first

* Merp

* Fix flaky tests

* Mandatory linter commit

* Ignore smell

* Bump codeclimate

.codeclimate.yml

@@ -50,7 +50,7 @@ plugins:
       file: .reek.yml
   rubocop:
     enabled: false
-    channel: rubocop-1-21-0
+    channel: rubocop-1-23-0
     config:
       file: .rubocop.yml
 

.reek.yml

@@ -54,6 +54,7 @@ detectors:
       - SidekiqUniqueJobs::Digests#page
       - SidekiqUniqueJobs::InvalidUniqueArguments#initialize
       - SidekiqUniqueJobs::InvalidWorker#initialize
+      - SidekiqUniqueJobs::LockDigest#initialize
       - SidekiqUniqueJobs::Locksmith#add_drift
       - SidekiqUniqueJobs::Logging#debug_item
       - SidekiqUniqueJobs::NotUniqueWorker#initialize

lib/sidekiq_unique_jobs/lock_digest.rb

@@ -38,8 +38,8 @@ def self.call(item)
     def initialize(item)
       @item         = item
       @worker_class = item[CLASS]
-      @lock_args    = item.slice(LOCK_ARGS, UNIQUE_ARGS).values.first # TODO: Deprecate UNIQUE_ARGS
-      @lock_prefix  = item.slice(LOCK_PREFIX, UNIQUE_PREFIX).values.first # TODO: Deprecate UNIQUE_PREFIX
+      @lock_args    = item[LOCK_ARGS] || item[UNIQUE_ARGS] # TODO: Deprecate UNIQUE_ARGS
+      @lock_prefix  = item[LOCK_PREFIX] || item[UNIQUE_PREFIX] # TODO: Deprecate UNIQUE_PREFIX
     end
 
     # Memoized lock_digest

lib/sidekiq_unique_jobs/lua/shared/_common.lua

@@ -31,7 +31,7 @@ local function log(message, prev_jid)
   log_debug("ZADD", changelog, current_time, entry);
   redis.call("ZADD", changelog, current_time, entry);
   local total_entries = redis.call("ZCARD", changelog)
-  local removed_entries = redis.call("ZREMRANGEBYRANK", changelog, max_history, -1)
+  local removed_entries = redis.call("ZREMRANGEBYRANK", changelog, 0, -1 * max_history)
   if removed_entries > 0 then
     log_debug("Removing", removed_entries , "entries from changelog (total entries", total_entries, "exceeds max_history:", max_history ..")");
   end

lib/sidekiq_unique_jobs/testing.rb

@@ -21,22 +21,24 @@ module Sidekiq
   #
   # @param [Hash<Symbol, Object>] tmp_config the temporary config to use
   #
-  def self.use_options(tmp_config = {})
-    old_options = default_worker_options.dup
+  def self.use_options(tmp_config = {}) # rubocop:disable Metrics/MethodLength
+    if respond_to?(:default_job_options)
+      default_job_options.clear
+      self.default_job_options = tmp_config
+    else
+      default_worker_options.clear
+      self.default_worker_options = tmp_config
+    end
 
-    default_worker_options.clear
-    self.default_worker_options = tmp_config
     yield
   ensure
-    default_worker_options.clear
-    self.default_worker_options =
-      if respond_to?(:default_job_options)
-        default_job_options
-      else
-        DEFAULT_WORKER_OPTIONS
-      end
-
-    self.default_worker_options = old_options
+    if respond_to?(:default_job_options)
+      default_job_options.clear
+      self.default_job_options = default_job_options
+    else
+      default_worker_options.clear
+      self.default_worker_options = DEFAULT_WORKER_OPTIONS
+    end
   end
 
   #

spec/sidekiq_unique_jobs/lock_args_spec.rb

@@ -67,20 +67,22 @@
   describe "#filter_by_proc" do
     subject(:filter_by_proc) { lock_args.filter_by_proc(args) }
 
-    let(:args) { [1, { "test" => "it" }] }
-
     context "when #lock_args_method is a proc" do
-      let(:filter) { ->(args) { args[1]["test"] } }
+      let(:args)   { [1, 2] }
+      let(:filter) { ->(args) { args[1] } }
 
       before { allow(lock_args).to receive(:lock_args_method).and_return(filter) }
 
-      it { is_expected.to eq("it") }
+      it { is_expected.to eq(2) }
     end
 
     context "when configured globally" do
+      let(:args) { %w[abc cde] }
+      let(:filter) { ->(args) { args[1] } }
+
       it "uses global filter" do
-        Sidekiq.use_options(lock_args_method: ->(args) { args.first }) do
-          expect(filter_by_proc).to eq(1)
+        Sidekiq.use_options(lock_args_method: filter) do
+          expect(filter_by_proc).to eq("cde")
         end
       end
     end