Skip to content

Commit 920ef31

Browse files
bpurintonbpurinton
committed
Fix for background jobs
1 parent f5221d9 commit 920ef31

6 files changed

+292
-150
lines changed

‎db/cable_schema.rb

+1-10
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,8 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema[8.0].define(version: 1) do
13+
ActiveRecord::Schema[8.0].define(version: 0) do
1414
# These are extensions that must be enabled in order to support this database
1515
enable_extension "pg_catalog.plpgsql"
1616

17-
create_table "solid_cable_messages", force: :cascade do |t|
18-
t.binary "channel", null: false
19-
t.binary "payload", null: false
20-
t.datetime "created_at", null: false
21-
t.bigint "channel_hash", null: false
22-
t.index ["channel"], name: "index_solid_cable_messages_on_channel"
23-
t.index ["channel_hash"], name: "index_solid_cable_messages_on_channel_hash"
24-
t.index ["created_at"], name: "index_solid_cable_messages_on_created_at"
25-
end
2617
end

‎db/cache_schema.rb

+1-11
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,8 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema[8.0].define(version: 1) do
13+
ActiveRecord::Schema[8.0].define(version: 0) do
1414
# These are extensions that must be enabled in order to support this database
1515
enable_extension "pg_catalog.plpgsql"
1616

17-
create_table "solid_cache_entries", force: :cascade do |t|
18-
t.binary "key", null: false
19-
t.binary "value", null: false
20-
t.datetime "created_at", null: false
21-
t.bigint "key_hash", null: false
22-
t.integer "byte_size", null: false
23-
t.index ["byte_size"], name: "index_solid_cache_entries_on_byte_size"
24-
t.index ["key_hash", "byte_size"], name: "index_solid_cache_entries_on_key_hash_and_byte_size"
25-
t.index ["key_hash"], name: "index_solid_cache_entries_on_key_hash", unique: true
26-
end
2717
end

‎db/migrate/20250313202310_solid_queue.rb

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
class SolidQueue < ActiveRecord::Migration[8.0]
2+
def change
3+
# These are extensions that must be enabled in order to support this database
4+
enable_extension "pg_catalog.plpgsql"
5+
6+
create_table "solid_queue_blocked_executions", force: :cascade do |t|
7+
t.bigint "job_id", null: false
8+
t.string "queue_name", null: false
9+
t.integer "priority", default: 0, null: false
10+
t.string "concurrency_key", null: false
11+
t.datetime "expires_at", null: false
12+
t.datetime "created_at", null: false
13+
t.index [ "concurrency_key", "priority", "job_id" ], name: "index_solid_queue_blocked_executions_for_release"
14+
t.index [ "expires_at", "concurrency_key" ], name: "index_solid_queue_blocked_executions_for_maintenance"
15+
t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
16+
end
17+
18+
create_table "solid_queue_claimed_executions", force: :cascade do |t|
19+
t.bigint "job_id", null: false
20+
t.bigint "process_id"
21+
t.datetime "created_at", null: false
22+
t.index [ "job_id" ], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
23+
t.index [ "process_id", "job_id" ], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
24+
end
25+
26+
create_table "solid_queue_failed_executions", force: :cascade do |t|
27+
t.bigint "job_id", null: false
28+
t.text "error"
29+
t.datetime "created_at", null: false
30+
t.index [ "job_id" ], name: "index_solid_queue_failed_executions_on_job_id", unique: true
31+
end
32+
33+
create_table "solid_queue_jobs", force: :cascade do |t|
34+
t.string "queue_name", null: false
35+
t.string "class_name", null: false
36+
t.text "arguments"
37+
t.integer "priority", default: 0, null: false
38+
t.string "active_job_id"
39+
t.datetime "scheduled_at"
40+
t.datetime "finished_at"
41+
t.string "concurrency_key"
42+
t.datetime "created_at", null: false
43+
t.datetime "updated_at", null: false
44+
t.index [ "active_job_id" ], name: "index_solid_queue_jobs_on_active_job_id"
45+
t.index [ "class_name" ], name: "index_solid_queue_jobs_on_class_name"
46+
t.index [ "finished_at" ], name: "index_solid_queue_jobs_on_finished_at"
47+
t.index [ "queue_name", "finished_at" ], name: "index_solid_queue_jobs_for_filtering"
48+
t.index [ "scheduled_at", "finished_at" ], name: "index_solid_queue_jobs_for_alerting"
49+
end
50+
51+
create_table "solid_queue_pauses", force: :cascade do |t|
52+
t.string "queue_name", null: false
53+
t.datetime "created_at", null: false
54+
t.index [ "queue_name" ], name: "index_solid_queue_pauses_on_queue_name", unique: true
55+
end
56+
57+
create_table "solid_queue_processes", force: :cascade do |t|
58+
t.string "kind", null: false
59+
t.datetime "last_heartbeat_at", null: false
60+
t.bigint "supervisor_id"
61+
t.integer "pid", null: false
62+
t.string "hostname"
63+
t.text "metadata"
64+
t.datetime "created_at", null: false
65+
t.string "name", null: false
66+
t.index [ "last_heartbeat_at" ], name: "index_solid_queue_processes_on_last_heartbeat_at"
67+
t.index [ "name", "supervisor_id" ], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true
68+
t.index [ "supervisor_id" ], name: "index_solid_queue_processes_on_supervisor_id"
69+
end
70+
71+
create_table "solid_queue_ready_executions", force: :cascade do |t|
72+
t.bigint "job_id", null: false
73+
t.string "queue_name", null: false
74+
t.integer "priority", default: 0, null: false
75+
t.datetime "created_at", null: false
76+
t.index [ "job_id" ], name: "index_solid_queue_ready_executions_on_job_id", unique: true
77+
t.index [ "priority", "job_id" ], name: "index_solid_queue_poll_all"
78+
t.index [ "queue_name", "priority", "job_id" ], name: "index_solid_queue_poll_by_queue"
79+
end
80+
81+
create_table "solid_queue_recurring_executions", force: :cascade do |t|
82+
t.bigint "job_id", null: false
83+
t.string "task_key", null: false
84+
t.datetime "run_at", null: false
85+
t.datetime "created_at", null: false
86+
t.index [ "job_id" ], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
87+
t.index [ "task_key", "run_at" ], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
88+
end
89+
90+
create_table "solid_queue_recurring_tasks", force: :cascade do |t|
91+
t.string "key", null: false
92+
t.string "schedule", null: false
93+
t.string "command", limit: 2048
94+
t.string "class_name"
95+
t.text "arguments"
96+
t.string "queue_name"
97+
t.integer "priority", default: 0
98+
t.boolean "static", default: true, null: false
99+
t.text "description"
100+
t.datetime "created_at", null: false
101+
t.datetime "updated_at", null: false
102+
t.index [ "key" ], name: "index_solid_queue_recurring_tasks_on_key", unique: true
103+
t.index [ "static" ], name: "index_solid_queue_recurring_tasks_on_static"
104+
end
105+
106+
create_table "solid_queue_scheduled_executions", force: :cascade do |t|
107+
t.bigint "job_id", null: false
108+
t.string "queue_name", null: false
109+
t.integer "priority", default: 0, null: false
110+
t.datetime "scheduled_at", null: false
111+
t.datetime "created_at", null: false
112+
t.index [ "job_id" ], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
113+
t.index [ "scheduled_at", "priority", "job_id" ], name: "index_solid_queue_dispatch_all"
114+
end
115+
116+
create_table "solid_queue_semaphores", force: :cascade do |t|
117+
t.string "key", null: false
118+
t.integer "value", default: 1, null: false
119+
t.datetime "expires_at", null: false
120+
t.datetime "created_at", null: false
121+
t.datetime "updated_at", null: false
122+
t.index [ "expires_at" ], name: "index_solid_queue_semaphores_on_expires_at"
123+
t.index [ "key", "value" ], name: "index_solid_queue_semaphores_on_key_and_value"
124+
t.index [ "key" ], name: "index_solid_queue_semaphores_on_key", unique: true
125+
end
126+
127+
add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
128+
add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
129+
add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
130+
add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
131+
add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
132+
add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
133+
end
134+
end

‎db/migrate/20250313202311_solid_cache.rb

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
class SolidCache < ActiveRecord::Migration[8.0]
2+
def change
3+
enable_extension "pg_catalog.plpgsql"
4+
5+
create_table "solid_cache_entries", force: :cascade do |t|
6+
t.binary "key", null: false
7+
t.binary "value", null: false
8+
t.datetime "created_at", null: false
9+
t.bigint "key_hash", null: false
10+
t.integer "byte_size", null: false
11+
t.index [ "byte_size" ], name: "index_solid_cache_entries_on_byte_size"
12+
t.index [ "key_hash", "byte_size" ], name: "index_solid_cache_entries_on_key_hash_and_byte_size"
13+
t.index [ "key_hash" ], name: "index_solid_cache_entries_on_key_hash", unique: true
14+
end
15+
end
16+
end

‎db/queue_schema.rb

+1-128
Original file line numberDiff line numberDiff line change
@@ -10,135 +10,8 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema[8.0].define(version: 1) do
13+
ActiveRecord::Schema[8.0].define(version: 0) do
1414
# These are extensions that must be enabled in order to support this database
1515
enable_extension "pg_catalog.plpgsql"
1616

17-
create_table "solid_queue_blocked_executions", force: :cascade do |t|
18-
t.bigint "job_id", null: false
19-
t.string "queue_name", null: false
20-
t.integer "priority", default: 0, null: false
21-
t.string "concurrency_key", null: false
22-
t.datetime "expires_at", null: false
23-
t.datetime "created_at", null: false
24-
t.index ["concurrency_key", "priority", "job_id"], name: "index_solid_queue_blocked_executions_for_release"
25-
t.index ["expires_at", "concurrency_key"], name: "index_solid_queue_blocked_executions_for_maintenance"
26-
t.index ["job_id"], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
27-
end
28-
29-
create_table "solid_queue_claimed_executions", force: :cascade do |t|
30-
t.bigint "job_id", null: false
31-
t.bigint "process_id"
32-
t.datetime "created_at", null: false
33-
t.index ["job_id"], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
34-
t.index ["process_id", "job_id"], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
35-
end
36-
37-
create_table "solid_queue_failed_executions", force: :cascade do |t|
38-
t.bigint "job_id", null: false
39-
t.text "error"
40-
t.datetime "created_at", null: false
41-
t.index ["job_id"], name: "index_solid_queue_failed_executions_on_job_id", unique: true
42-
end
43-
44-
create_table "solid_queue_jobs", force: :cascade do |t|
45-
t.string "queue_name", null: false
46-
t.string "class_name", null: false
47-
t.text "arguments"
48-
t.integer "priority", default: 0, null: false
49-
t.string "active_job_id"
50-
t.datetime "scheduled_at"
51-
t.datetime "finished_at"
52-
t.string "concurrency_key"
53-
t.datetime "created_at", null: false
54-
t.datetime "updated_at", null: false
55-
t.index ["active_job_id"], name: "index_solid_queue_jobs_on_active_job_id"
56-
t.index ["class_name"], name: "index_solid_queue_jobs_on_class_name"
57-
t.index ["finished_at"], name: "index_solid_queue_jobs_on_finished_at"
58-
t.index ["queue_name", "finished_at"], name: "index_solid_queue_jobs_for_filtering"
59-
t.index ["scheduled_at", "finished_at"], name: "index_solid_queue_jobs_for_alerting"
60-
end
61-
62-
create_table "solid_queue_pauses", force: :cascade do |t|
63-
t.string "queue_name", null: false
64-
t.datetime "created_at", null: false
65-
t.index ["queue_name"], name: "index_solid_queue_pauses_on_queue_name", unique: true
66-
end
67-
68-
create_table "solid_queue_processes", force: :cascade do |t|
69-
t.string "kind", null: false
70-
t.datetime "last_heartbeat_at", null: false
71-
t.bigint "supervisor_id"
72-
t.integer "pid", null: false
73-
t.string "hostname"
74-
t.text "metadata"
75-
t.datetime "created_at", null: false
76-
t.string "name", null: false
77-
t.index ["last_heartbeat_at"], name: "index_solid_queue_processes_on_last_heartbeat_at"
78-
t.index ["name", "supervisor_id"], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true
79-
t.index ["supervisor_id"], name: "index_solid_queue_processes_on_supervisor_id"
80-
end
81-
82-
create_table "solid_queue_ready_executions", force: :cascade do |t|
83-
t.bigint "job_id", null: false
84-
t.string "queue_name", null: false
85-
t.integer "priority", default: 0, null: false
86-
t.datetime "created_at", null: false
87-
t.index ["job_id"], name: "index_solid_queue_ready_executions_on_job_id", unique: true
88-
t.index ["priority", "job_id"], name: "index_solid_queue_poll_all"
89-
t.index ["queue_name", "priority", "job_id"], name: "index_solid_queue_poll_by_queue"
90-
end
91-
92-
create_table "solid_queue_recurring_executions", force: :cascade do |t|
93-
t.bigint "job_id", null: false
94-
t.string "task_key", null: false
95-
t.datetime "run_at", null: false
96-
t.datetime "created_at", null: false
97-
t.index ["job_id"], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
98-
t.index ["task_key", "run_at"], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
99-
end
100-
101-
create_table "solid_queue_recurring_tasks", force: :cascade do |t|
102-
t.string "key", null: false
103-
t.string "schedule", null: false
104-
t.string "command", limit: 2048
105-
t.string "class_name"
106-
t.text "arguments"
107-
t.string "queue_name"
108-
t.integer "priority", default: 0
109-
t.boolean "static", default: true, null: false
110-
t.text "description"
111-
t.datetime "created_at", null: false
112-
t.datetime "updated_at", null: false
113-
t.index ["key"], name: "index_solid_queue_recurring_tasks_on_key", unique: true
114-
t.index ["static"], name: "index_solid_queue_recurring_tasks_on_static"
115-
end
116-
117-
create_table "solid_queue_scheduled_executions", force: :cascade do |t|
118-
t.bigint "job_id", null: false
119-
t.string "queue_name", null: false
120-
t.integer "priority", default: 0, null: false
121-
t.datetime "scheduled_at", null: false
122-
t.datetime "created_at", null: false
123-
t.index ["job_id"], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
124-
t.index ["scheduled_at", "priority", "job_id"], name: "index_solid_queue_dispatch_all"
125-
end
126-
127-
create_table "solid_queue_semaphores", force: :cascade do |t|
128-
t.string "key", null: false
129-
t.integer "value", default: 1, null: false
130-
t.datetime "expires_at", null: false
131-
t.datetime "created_at", null: false
132-
t.datetime "updated_at", null: false
133-
t.index ["expires_at"], name: "index_solid_queue_semaphores_on_expires_at"
134-
t.index ["key", "value"], name: "index_solid_queue_semaphores_on_key_and_value"
135-
t.index ["key"], name: "index_solid_queue_semaphores_on_key", unique: true
136-
end
137-
138-
add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
139-
add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
140-
add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
141-
add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
142-
add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
143-
add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
14417
end

0 commit comments

Comments
 (0)