Skip to content

Commit 6e5c097

Browse files
t27duckmarcelolx
authored andcommitted
Don't use depicated Redis commands
Sidekiq 7.1 now warns on depircated Redis commands. `zrangebyscore` is currently used by the gem which is depicated in Redis 6.2 which is the mimimum required Redis version for current Sidekiq. Since we most likely are supporting the latest 7.x of Sidekiq, I reused the "GTE 7.0" check and redirected calls to `zrangebyscore` to use the Sidekiq Adaptor class. The difference in commands is based off of the changes to Sidekiq when it swapped out the depricated call: sidekiq/sidekiq@1aca434#diff-25f829140be25a886134933b537d356dddb12234ca85319e50b381f9edb6b74dR686
1 parent 91adde9 commit 6e5c097

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

lib/sidekiq-scheduler/redis_manager.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def self.schedule_exist?
106106
#
107107
# @return [Array] array with all the changed job names
108108
def self.get_schedule_changes(from, to)
109-
Sidekiq.redis { |r| r.zrangebyscore(schedules_changed_key, from, "(#{to}") }
109+
SidekiqScheduler::SidekiqAdapter.redis_zrangebyscore(schedules_changed_key, from, "(#{to}")
110110
end
111111

112112
# Register a schedule change for a given job

lib/sidekiq-scheduler/sidekiq_adapter.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,15 @@ def self.redis_key_exists?(key_name)
7676
end
7777
end
7878
end
79+
80+
def self.redis_zrangebyscore(key, from, to)
81+
Sidekiq.redis do |r|
82+
if SIDEKIQ_GTE_7_0_0
83+
r.zrange(key, from, to, "BYSCORE")
84+
else
85+
r.zrangebyscore(key, from, to)
86+
end
87+
end
88+
end
7989
end
8090
end

spec/support/store.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def self.zadd(sorted_set_key, score, field_key)
5050
end
5151

5252
def self.zrangebyscore(zset_key, from, to)
53-
Sidekiq.redis { |r| r.zrangebyscore(zset_key, from, to) }
53+
SidekiqScheduler::SidekiqAdapter.redis_zrangebyscore(zset_key, from, to)
5454
end
5555

5656
def self.zrange(zset_key, from, to)

0 commit comments

Comments
 (0)