Skip to content

Commit 7bdfdf5

Browse files
committed
Use the new Execution.create_all_from_jobs to perform_all_later
1 parent ca1f276 commit 7bdfdf5

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

app/models/solid_queue/job.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class SolidQueue::Job < SolidQueue::Record
1313
DEFAULT_QUEUE_NAME = "default"
1414

1515
class << self
16-
def enqueue_active_jobs(active_jobs)
16+
def enqueue_all_active_jobs(active_jobs)
1717
scheduled_jobs, immediate_jobs = active_jobs.partition(&:scheduled_at)
1818
with_concurrency_limits, without_concurrency_limits = immediate_jobs.partition(&:concurrency_limited?)
1919

@@ -23,18 +23,16 @@ def enqueue_active_jobs(active_jobs)
2323

2424
transaction do
2525
job_rows = scheduled_jobs.map { |job| attributes_from_active_job(job) }
26-
self.insert_all(job_rows)
26+
insert_all(job_rows)
2727
inserted_jobs = where(active_job_id: scheduled_jobs.map(&:job_id))
28-
execution_rows = inserted_jobs.map { |job| job.attributes.slice("queue_name", "priority", "scheduled_at").merge(job_id: job.id) }
29-
SolidQueue::ScheduledExecution.insert_all(execution_rows)
28+
SolidQueue::ScheduledExecution.create_all_from_jobs(inserted_jobs)
3029
end
3130

3231
transaction do
3332
job_rows = without_concurrency_limits.map { |job| attributes_from_active_job(job) }
34-
self.insert_all(job_rows)
33+
insert_all(job_rows)
3534
inserted_jobs = where(active_job_id: without_concurrency_limits.map(&:job_id))
36-
execution_rows = inserted_jobs.map { |job| job.attributes.slice("queue_name", "priority").merge(job_id: job.id) }
37-
SolidQueue::ReadyExecution.insert_all(execution_rows)
35+
SolidQueue::ReadyExecution.create_all_from_jobs(inserted_jobs)
3836
end
3937
end
4038

lib/active_job/queue_adapters/solid_queue_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def enqueue_at(active_job, timestamp) # :nodoc:
2121
end
2222

2323
def enqueue_all(active_jobs) # :nodoc:
24-
SolidQueue::Job.enqueue_active_jobs(active_jobs)
24+
SolidQueue::Job.enqueue_all_active_jobs(active_jobs)
2525
end
2626
end
2727
end

0 commit comments

Comments
 (0)