Skip to content

Commit beedd39

Browse files
committed
Fix for background jobs
1 parent a5bf545 commit beedd39

7 files changed

+360
-150
lines changed

db/cable_schema.rb

+16-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
ActiveRecord::Schema[7.1].define(version: 1) do
2-
create_table "solid_cable_messages", force: :cascade do |t|
3-
t.binary "channel", limit: 1024, null: false
4-
t.binary "payload", limit: 536870912, null: false
5-
t.datetime "created_at", null: false
6-
t.integer "channel_hash", limit: 8, null: false
7-
t.index ["channel"], name: "index_solid_cable_messages_on_channel"
8-
t.index ["channel_hash"], name: "index_solid_cable_messages_on_channel_hash"
9-
t.index ["created_at"], name: "index_solid_cable_messages_on_created_at"
10-
end
1+
# This file is auto-generated from the current state of the database. Instead
2+
# of editing this file, please use the migrations feature of Active Record to
3+
# incrementally modify your database, and then regenerate this schema definition.
4+
#
5+
# This file is the source Rails uses to define your schema when running `bin/rails
6+
# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
7+
# be faster and is potentially less error prone than running all of your
8+
# migrations from scratch. Old migrations may fail to apply correctly if those
9+
# migrations use external dependencies or application code.
10+
#
11+
# It's strongly recommended that you check this file into your version control system.
12+
13+
ActiveRecord::Schema[8.0].define(version: 0) do
14+
# These are extensions that must be enabled in order to support this database
15+
enable_extension "pg_catalog.plpgsql"
16+
1117
end

db/cache_schema.rb

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
# frozen_string_literal: true
1+
# This file is auto-generated from the current state of the database. Instead
2+
# of editing this file, please use the migrations feature of Active Record to
3+
# incrementally modify your database, and then regenerate this schema definition.
4+
#
5+
# This file is the source Rails uses to define your schema when running `bin/rails
6+
# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
7+
# be faster and is potentially less error prone than running all of your
8+
# migrations from scratch. Old migrations may fail to apply correctly if those
9+
# migrations use external dependencies or application code.
10+
#
11+
# It's strongly recommended that you check this file into your version control system.
12+
13+
ActiveRecord::Schema[8.0].define(version: 0) do
14+
# These are extensions that must be enabled in order to support this database
15+
enable_extension "pg_catalog.plpgsql"
216

3-
ActiveRecord::Schema[7.2].define(version: 1) do
4-
create_table "solid_cache_entries", force: :cascade do |t|
5-
t.binary "key", limit: 1024, null: false
6-
t.binary "value", limit: 536870912, null: false
7-
t.datetime "created_at", null: false
8-
t.integer "key_hash", limit: 8, null: false
9-
t.integer "byte_size", limit: 4, null: false
10-
t.index ["byte_size"], name: "index_solid_cache_entries_on_byte_size"
11-
t.index ["key_hash", "byte_size"], name: "index_solid_cache_entries_on_key_hash_and_byte_size"
12-
t.index ["key_hash"], name: "index_solid_cache_entries_on_key_hash", unique: true
13-
end
1417
end
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
class SolidCable < ActiveRecord::Migration[8.0]
2+
def change
3+
enable_extension "pg_catalog.plpgsql"
4+
5+
create_table "solid_cable_messages", force: :cascade do |t|
6+
t.binary "channel", null: false
7+
t.binary "payload", null: false
8+
t.datetime "created_at", null: false
9+
t.bigint "channel_hash", null: false
10+
t.index [ "channel" ], name: "index_solid_cable_messages_on_channel"
11+
t.index [ "channel_hash" ], name: "index_solid_cable_messages_on_channel_hash"
12+
t.index [ "created_at" ], name: "index_solid_cable_messages_on_created_at"
13+
end
14+
end
15+
end
+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
+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

+15-127
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,17 @@
1-
ActiveRecord::Schema[7.1].define(version: 1) do
2-
create_table "solid_queue_blocked_executions", force: :cascade do |t|
3-
t.bigint "job_id", null: false
4-
t.string "queue_name", null: false
5-
t.integer "priority", default: 0, null: false
6-
t.string "concurrency_key", null: false
7-
t.datetime "expires_at", null: false
8-
t.datetime "created_at", null: false
9-
t.index [ "concurrency_key", "priority", "job_id" ], name: "index_solid_queue_blocked_executions_for_release"
10-
t.index [ "expires_at", "concurrency_key" ], name: "index_solid_queue_blocked_executions_for_maintenance"
11-
t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
12-
end
1+
# This file is auto-generated from the current state of the database. Instead
2+
# of editing this file, please use the migrations feature of Active Record to
3+
# incrementally modify your database, and then regenerate this schema definition.
4+
#
5+
# This file is the source Rails uses to define your schema when running `bin/rails
6+
# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
7+
# be faster and is potentially less error prone than running all of your
8+
# migrations from scratch. Old migrations may fail to apply correctly if those
9+
# migrations use external dependencies or application code.
10+
#
11+
# It's strongly recommended that you check this file into your version control system.
12+
13+
ActiveRecord::Schema[8.0].define(version: 0) do
14+
# These are extensions that must be enabled in order to support this database
15+
enable_extension "pg_catalog.plpgsql"
1316

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

0 commit comments

Comments
 (0)