sidekiq-unique-jobs 6.0.25 → 7.0.0.beta2

data/lib/sidekiq_unique_jobs/web/views/unique_digest.erb

@@ -1,28 +0,0 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('Unique Digest') %> - <a class="btn btn-default btn-xs" href="<%= root_path %>unique_digests"><%= t('GoBack') %></a></h3>
-  </div>
-</header>
-
-<% if @unique_keys.size.positive? %>
-  <div class="table_container">
-    <table class="table table-striped table-bordered table-hover">
-      <thead>
-        <tr>
-          <th>
-            <%= t('Keys') %>
-            <span class="small text-muted">for (<%= @digest %>)</span>
-          </th>
-        </tr>
-      </thead>
-        <% @unique_keys.each do |key| %>
-          <tr><td colspan="2"><%= key %></td></tr>
-        <% end %>
-    </table>
-  </div>
-  <form action="<%= root_path %>unique_digests/<%= @digest %>/delete" method="get">
-    <%= csrf_tag %>
-    <a class="btn btn-default btn-xs" href="<%= root_path %>unique_digests"><%= t('GoBack') %></a>
-    <input class="btn btn-danger btn-xs flip" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
-<% end %>

data/lib/sidekiq_unique_jobs/web/views/unique_digests.erb

@@ -1,46 +0,0 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('Unique Digests') %></h3>
-  </div>
-  <form action="<%= root_path %>unique_digests" class="form form-inline" method="get">
-    <%= csrf_tag %>
-    <input name="filter" class="form-control" type="text" value="<%= @filter %>" />
-    <button class="btn btn-default" type="submit"><%= t('Filter') %></button>
-  </form>
-  <% if @unique_digests.size > 0 && @total_size > @count.to_i %>
-    <div class="col-sm-4">
-      <%= erb unique_template(:_paging), locals: { url: "#{root_path}unique_digests" } %>
-    </div>
-  <% end %>
-</header>
-
-<% if @unique_digests.size.positive? %>
-  <div class="table_container">
-    <table class="table table-striped table-bordered table-hover">
-      <thead>
-        <tr>
-          <th><%= t('Delete') %></th>
-          <th><%= t('Digest') %></th>
-        </tr>
-      </thead>
-      <% @unique_digests.each do |digest| %>
-        <tr>
-          <td>
-            <form action="<%= root_path %>unique_digests/<%= digest %>/delete" method="get">
-              <%= csrf_tag %>
-              <input name="digest" value="<%= h digest %>" type="hidden" />
-              <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
-            </form>
-          </td>
-          <td>
-            <a href="<%= root_path %>unique_digests/<%= digest %>"><%= digest %></a>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-
-    <form action="<%= root_path %>unique_digests/delete_all" method="get">
-      <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-    </form>
-  </div>
-<% end %>

data/redis/acquire_lock.lua

@@ -1,21 +0,0 @@
-local unique_key = KEYS[1]
-local job_id     = ARGV[1]
-local expires    = tonumber(ARGV[2])
-local stored_jid = redis.pcall('get', unique_key)
-
-if stored_jid then
-  if stored_jid == job_id then
-    return 1
-  else
-    return 0
-  end
-end
-
-if redis.call('SET', unique_key, job_id, 'nx') then
-  if expires then
-    redis.call('EXPIRE', unique_key, expires)
-  end
-  return 1
-else
-  return 0
-end

data/redis/convert_legacy_lock.lua

@@ -1,13 +0,0 @@
-local grabbed_key   = KEYS[1]
-local unique_digest = KEYS[2]
-
-local job_id = ARGV[1]
-local current_time = tonumber(ARGV[2])
-
-local old_token  = redis.call('GET', unique_digest)
-if old_token then
-  if old_token == job_id or old_token == '2' then
-    redis.call('DEL', unique_digest)
-    redis.call('HSET', grabbed_key, job_id, current_time)
-  end
-end

data/redis/delete.lua

@@ -1,14 +0,0 @@
-local exists_key    = KEYS[1]
-local grabbed_key   = KEYS[2]
-local available_key = KEYS[3]
-local version_key   = KEYS[4]
-local unique_keys   = KEYS[5]
-local unique_digest = KEYS[6]     -- TODO: Legacy support (Remove in v6.1)
-
-redis.call('DEL', exists_key)
-redis.call('SREM', unique_keys, unique_digest)
-redis.call('DEL', grabbed_key)
-redis.call('DEL', available_key)
-redis.call('DEL', version_key)
-redis.call('DEL', 'uniquejobs')   -- TODO: Old job hash, just drop the darn thing
-redis.call('DEL', unique_digest)  -- TODO: Legacy support (Remove in v6.1)

data/redis/delete_by_digest.lua

@@ -1,23 +0,0 @@
--- redis.replicate_commands();
-local unique_keys       = KEYS[1]
-local unique_digest     = KEYS[2]
-local exists_key        = KEYS[3]
-local grabbed_key       = KEYS[4]
-local available_key     = KEYS[5]
-local version_key       = KEYS[6]
-local run_exists_key    = KEYS[7]
-local run_grabbed_key   = KEYS[8]
-local run_available_key = KEYS[9]
-local run_version_key   = KEYS[10]
-
-local count = redis.call('SREM', unique_keys, unique_digest)
-redis.call('DEL', exists_key)
-redis.call('DEL', grabbed_key)
-redis.call('DEL', available_key)
-redis.call('DEL', version_key)
-redis.call('DEL', run_exists_key)
-redis.call('DEL', run_grabbed_key)
-redis.call('DEL', run_available_key)
-redis.call('DEL', run_version_key)
-
-return count

data/redis/delete_job_by_digest.lua

@@ -1,60 +0,0 @@
-local queue         = KEYS[1]
-local schedule_set  = KEYS[2]
-local retry_set     = KEYS[3]
-local unique_digest = ARGV[1]
-
-local function delete_from_sorted_set(name, digest)
-  local per   = 50
-  local total = redis.call('zcard', name)
-  local index = 0
-  local result
-  -- redis.log(redis.LOG_DEBUG, "delete_from_sorted_set("..name..","..digest..")")
-  while (index < total) do
-    -- redis.log(redis.LOG_DEBUG, "delete_from_sorted_set("..name..","..digest..") - "..index.."-"..per)
-    local items = redis.call('ZRANGE', name, index, index + per -1)
-    for _, item in pairs(items) do
-      -- redis.log(redis.LOG_DEBUG, "delete_from_sorted_set("..name..","..digest..") - current item: " .. item)
-      if string.find(item, digest) then
-        -- redis.log(redis.LOG_DEBUG, "delete_from_sorted_set("..name..","..digest..") - deleting item")
-        redis.call('ZREM', name, item)
-        result = item
-        break
-      end
-    end
-    index = index + per
-  end
-  return result
-end
-
-local per     = 50
-local total   = redis.call('LLEN', queue)
-local index   = 0
-local result  = nil
-
--- redis.log(redis.LOG_DEBUG, "delete_job_by_digest.lua - looping through: " .. queue)
-while (index < total) do
-  -- redis.log(redis.LOG_DEBUG, "delete_job_by_digest.lua - " .. index .. "-" .. per)
-  local items = redis.call('LRANGE', queue, index, index + per -1)
-  for _, item in pairs(items) do
-    -- redis.log(redis.LOG_DEBUG, "delete_job_by_digest.lua - item: " .. item)
-    if string.find(item, unique_digest) then
-      -- redis.log(redis.LOG_DEBUG, "delete_job_by_digest.lua - found item with digest: " .. unique_digest .. " in: " ..queue)
-      redis.call('LREM', queue, 1, item)
-      result = item
-      break
-    end
-  end
-  index = index + per
-end
-
-if result then
-  return result
-end
-
-result = delete_from_sorted_set(schedule_set, unique_digest)
-if result then
-  return result
-end
-
-result = delete_from_sorted_set(retry_set, unique_digest)
-return result

data/redis/lock.lua

@@ -1,62 +0,0 @@
--- redis.replicate_commands();
-
-local exists_key    = KEYS[1]
-local grabbed_key   = KEYS[2]
-local available_key = KEYS[3]
-local unique_keys   = KEYS[4]
-local unique_digest = KEYS[5]
-
-local job_id = ARGV[1]
-local ttl    = tonumber(ARGV[2])
-local lock   = ARGV[3]
-
-local function current_time()
-  local time = redis.call('time')
-  local s = time[1]
-  local ms = time[2]
-  local number = tonumber((s .. '.' .. ms))
-
-  return number
-end
-
-local stored_token = redis.call('GET', exists_key)
-if stored_token and stored_token ~= job_id then
-  return stored_token
-end
-
-redis.call('SET', exists_key, job_id)
-
-----------------------------------------------------------------
--- TODO: Legacy support (Remove in v6.1)
-local old_token  = redis.call('GET', unique_digest)
-if old_token then
-  if old_token == job_id or old_token == '2' then
-    -- No need to return, we just delete the old key
-    redis.call('DEL', unique_digest)
-  else
-    return old_token
-  end
-end
-----------------------------------------------------------------
-
-redis.call('SADD', unique_keys, unique_digest)
-redis.call('DEL', grabbed_key)
--- TODO: Move this to LUA when redis 3.2 is the least supported
--- redis.call('HSET', grabbed_key, job_id, current_time())
----------------------------------------------------------------
-redis.call('DEL', available_key)
-redis.call('RPUSH', available_key, job_id)
-
--- The client should only set ttl for until_expired
--- The server should set ttl for all other jobs
--- redis.log(redis.LOG_WARNING, "lock: " .. lock .. ", ttl: " .. tostring(ttl))
-if lock == "until_expired" and ttl and ttl > 0 then
-  -- We can't keep the key here because it will otherwise never be deleted
-  redis.call('SREM', unique_keys, unique_digest)
-
-  redis.call('EXPIRE', available_key, ttl)
-  redis.call('EXPIRE', exists_key, ttl)
-  redis.call('EXPIRE', unique_digest, ttl)
-end
-
-return job_id

data/redis/release_stale_locks.lua

@@ -1,90 +0,0 @@
-redis.replicate_commands();
-
-local exists_key           = KEYS[1]
-local grabbed_key          = KEYS[2]
-local available_key        = KEYS[3]
-local release_key          = KEYS[4]
-local version_key          = KEYS[5]
-
-local expires_in           = tonumber(ARGV[1])
-local stale_client_timeout = tonumber(ARGV[2])
-local expiration           = tonumber(ARGV[3])
-
-local function current_time()
-  local time = redis.call('time')
-  local s = time[1]
-  local ms = time[2]
-  local number = tonumber((s .. '.' .. ms))
-
-  return number
-end
-
-local hgetall = function (key)
-  local bulk = redis.call('HGETALL', key)
-  local result = {}
-  local nextkey
-  for i, v in ipairs(bulk) do
-    if i % 2 == 1 then
-      nextkey = v
-    else
-      result[nextkey] = v
-    end
-  end
-  return result
-end
-
-local cached_current_time = current_time()
-redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - started at : " .. cached_current_time)
-
-local my_lock_expires_at = cached_current_time + expires_in + 1
-redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - my_lock_expires_at: " .. my_lock_expires_at)
-
-if not redis.call('SETNX', release_key, my_lock_expires_at) then
-  -- Check if expired
-  local other_lock_expires_at = tonumber(redis.call('GET', release_key))
-  redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - other_lock_expires_at: " .. other_lock_expires_at)
-
-  if other_lock_expires_at < cached_current_time then
-    local old_expires_at = tonumber(redis.call('GETSET', release_key, my_lock_expires_at))
-    redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - old_expires_at: " .. old_expires_at)
-
-    -- Check if another client started cleanup yet. If not,
-    -- then we now have the lock.
-    if not old_expires_at == other_lock_expires_at then
-      redis.log(redis.LOG_DEBUG, "release_stale_locks.lua -could not retrieve lock: exiting 0")
-      return 0
-    end
-  end
-end
-
-local keys = hgetall(grabbed_key)
-for key, locked_at in pairs(keys) do
-  local timed_out_at = tonumber(locked_at) + stale_client_timeout
-  redis.log(redis.LOG_DEBUG,
-    "release_stale_locks.lua - processing: " .. grabbed_key .. " key: " .. key .. " locked_at: " .. locked_at
-  )
-
-  if timed_out_at < current_time() then
-    redis.log(redis.LOG_DEBUG, "HDEL " .. grabbed_key .. ":" .. key)
-    redis.call('HDEL', grabbed_key, key)
-    redis.log(redis.LOG_DEBUG, "LPUSH " .. available_key .. ":" .. key)
-    redis.call('LPUSH', available_key, key)
-
-    if expiration then
-      redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - EXPIRE " .. available_key .. " with " .. expiration)
-      redis.call('EXPIRE', available_key, expiration)
-      redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - EXPIRE " .. exists_key .. " with " .. expiration)
-      redis.call('EXPIRE', exists_key, expiration)
-    end
-  end
-end
-
--- Make sure not to delete the lock in case someone else already expired
--- our lock, with one second in between to account for some lag.
-if my_lock_expires_at > (current_time() - 1) then
-  redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - DEL " .. release_key)
-  redis.call('DEL', release_key)
-end
-
-redis.log(redis.LOG_DEBUG, "release_stale_locks.lua - comleted at : " .. current_time())
-return 1

data/redis/unlock.lua

@@ -1,35 +0,0 @@
-local exists_key    = KEYS[1]
-local grabbed_key   = KEYS[2]
-local available_key = KEYS[3]
-local version_key   = KEYS[4]
-local unique_keys   = KEYS[5]
-local unique_digest = KEYS[6] -- TODO: Legacy support (Remove in v6.1)
-
-local token = ARGV[1]
-local ttl   = tonumber(ARGV[2])
-local lock  = ARGV[3]
-
-redis.call('SREM', unique_keys, unique_digest)
-
-if ttl then
-  redis.call('SREM', unique_keys, unique_digest)
-  redis.call('EXPIRE', exists_key, ttl)
-  redis.call('EXPIRE', grabbed_key, ttl)
-  redis.call('EXPIRE', available_key, ttl)
-  redis.call('EXPIRE', version_key, ttl)   -- TODO: Legacy support (Remove in v6.1)
-  redis.call('EXPIRE', unique_digest, ttl) -- TODO: Legacy support (Remove in v6.1)
-else
-  redis.call('DEL', exists_key)
-  redis.call('SREM', unique_keys, unique_digest)
-  redis.call('DEL', grabbed_key)
-  redis.call('DEL', available_key)
-  redis.call('DEL', version_key)    -- TODO: Legacy support (Remove in v6.1)
-  redis.call('DEL', 'uniquejobs')   -- TODO: Old job hash, just drop the darn thing  (Remove in v6.1)
-  redis.call('DEL', unique_digest)  -- TODO: Legacy support (Remove in v6.1)
-end
-
-redis.call('HDEL', grabbed_key, token)
-local count = redis.call('LPUSH', available_key, token)
-redis.call('EXPIRE', available_key, 5)
-return count
-