Skip to content

Delete ready_executions by PK instead of job_id when claiming #240

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Delete ready_executions by PK instead of job_id when claiming #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/models/solid_queue/ready_execution.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,21 @@ def select_and_lock(queue_relation, process_id, limit)
return [] if limit <= 0

transaction do
job_ids = select_candidates(queue_relation, limit)
lock_candidates(job_ids, process_id)
candidates = select_candidates(queue_relation, limit)
lock_candidates(candidates, process_id)
end
end

def select_candidates(queue_relation, limit)
queue_relation.ordered.limit(limit).non_blocking_lock.pluck(:job_id)
queue_relation.ordered.limit(limit).non_blocking_lock.select(:id, :job_id)
end

def lock_candidates(job_ids, process_id)
return [] if job_ids.none?
def lock_candidates(executions, process_id)
return [] if executions.none?

SolidQueue::ClaimedExecution.claiming(job_ids, process_id) do |claimed|
where(job_id: claimed.pluck(:job_id)).delete_all
SolidQueue::ClaimedExecution.claiming(executions.map(&:job_id), process_id) do |claimed|
ids_to_delete = executions.index_by(&:job_id).values_at(*claimed.map(&:job_id)).map(&:id)
where(id: ids_to_delete).delete_all
end
end

Expand Down