New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(queue): different score purpose per state #2133
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
2219498
fix(queue): different score purpose per state
roggervalf 7695e43
chore: remove debug statements
roggervalf 6d90230
docs: add todo comment for perf change
roggervalf 32ee8cf
refactor(clean): set rangeEnd outside cleanSet
roggervalf 35f4a44
perf(clean): do not compare timestamp for finished states as we are d…
roggervalf 1cb3163
refactor: consider timestamp value when comparing grace period
roggervalf 4ccb045
chore: merge branch 'master' into fix-clean-differentiate-score
roggervalf 3d1cb37
chore: merge branch 'master' into fix-clean-differentiate-score
roggervalf File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,8 @@ | |
--- @include "getTimestamp" | ||
--- @include "removeJob" | ||
|
||
local function cleanSet(setKey, jobKeyPrefix, rangeStart, rangeEnd, timestamp, limit, attributes) | ||
local jobs = getJobsInZset(setKey, rangeStart, rangeEnd, timestamp, limit) | ||
local function cleanSet(setKey, jobKeyPrefix, rangeEnd, timestamp, limit, attributes, isFinished) | ||
local jobs = getJobsInZset(setKey, rangeEnd, limit) | ||
local deleted = {} | ||
local deletedCount = 0 | ||
local jobTS | ||
|
@@ -20,12 +20,18 @@ local function cleanSet(setKey, jobKeyPrefix, rangeStart, rangeEnd, timestamp, l | |
end | ||
|
||
local jobKey = jobKeyPrefix .. job | ||
-- * finishedOn says when the job was completed, but it isn't set unless the job has actually completed | ||
jobTS = getTimestamp(jobKey, attributes) | ||
if (not jobTS or jobTS < timestamp) then | ||
if isFinished then | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. when clean is made for completed or failed states, we should be ok deleting job keys without timestamp check, as when we get these records we uses timestamp as one of the limits, this is why I'm using <= to be consistent on the other states |
||
removeJob(job, true, jobKeyPrefix) | ||
deletedCount = deletedCount + 1 | ||
table.insert(deleted, job) | ||
else | ||
-- * finishedOn says when the job was completed, but it isn't set unless the job has actually completed | ||
jobTS = getTimestamp(jobKey, attributes) | ||
if (not jobTS or jobTS <= timestamp) then | ||
removeJob(job, true, jobKeyPrefix) | ||
deletedCount = deletedCount + 1 | ||
table.insert(deleted, job) | ||
end | ||
end | ||
end | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
zsets uses +inf instead of -1 on lists