Skip to content

Commit ddd141f

Browse files
committed
Set up record connecting to two shards in test app
1 parent 18e7b0e commit ddd141f

8 files changed

+79
-135
lines changed

.rubocop.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ inherit_gem: { rubocop-rails-omakase: rubocop.yml }
66
AllCops:
77
TargetRubyVersion: 3.3
88
Exclude:
9-
- "test/dummy/db/schema.rb"
10-
- "test/dummy/db/queue_schema.rb"
9+
- "**/*_schema.rb"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
class ShardedJobResult < ShardedRecord
2+
end
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
class ShardedRecord < ApplicationRecord
2+
self.abstract_class = true
3+
4+
connects_to shards: {
5+
shard_one: { writing: :shard_one },
6+
shard_two: { writing: :shard_two }
7+
}
8+
end

test/dummy/config/database.yml

+19-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<% if ENV["TARGET_DB"] == "sqlite" %>
1111
default: &default
1212
adapter: sqlite3
13-
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 50 } %>
13+
pool: 50
1414
retries: 100
1515

1616
<% elsif ENV["TARGET_DB"] == "postgres" %>
1717
default: &default
1818
adapter: postgresql
1919
encoding: unicode
2020
username: postgres
21-
pool: 5
21+
pool: 20
2222
host: "127.0.0.1"
2323
port: 55432
2424
gssencmode: disable # https://github.com/ged/ruby-pg/issues/311
@@ -27,7 +27,7 @@ default: &default
2727
default: &default
2828
adapter: mysql2
2929
username: root
30-
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
30+
pool: 20
3131
host: "127.0.0.1"
3232
port: 33060
3333
<% end %>
@@ -36,6 +36,14 @@ development:
3636
primary:
3737
<<: *default
3838
database: <%= database_name_from("development") %>
39+
shard_one:
40+
<<: *default
41+
database: <%= database_name_from("development_shard_one") %>
42+
migrations_paths: db/migrate_shards
43+
shard_two:
44+
<<: *default
45+
database: <%= database_name_from("development_shard_two") %>
46+
migrations_paths: db/migrate_shards
3947
queue:
4048
<<: *default
4149
database: <%= database_name_from("development_queue") %>
@@ -44,10 +52,16 @@ development:
4452
test:
4553
primary:
4654
<<: *default
47-
pool: 20
4855
database: <%= database_name_from("test") %>
56+
shard_one:
57+
<<: *default
58+
database: <%= database_name_from("test_shard_one") %>
59+
migrations_paths: db/migrate_shards
60+
shard_two:
61+
<<: *default
62+
database: <%= database_name_from("test_shard_two") %>
63+
migrations_paths: db/migrate_shards
4964
queue:
5065
<<: *default
51-
pool: 20
5266
database: <%= database_name_from("test_queue") %>
5367
migrations_paths: db/queue_migrate
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
class CreateShardedJobResults < ActiveRecord::Migration[7.1]
2+
def change
3+
create_table :sharded_job_results do |t|
4+
t.string :value
5+
6+
t.timestamps
7+
end
8+
end
9+
end

test/dummy/db/schema.rb

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

test/dummy/db/shard_one_schema.rb

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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[7.1].define(version: 2024_12_05_195735) do
14+
create_table "sharded_job_results", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
15+
t.string "value"
16+
t.datetime "created_at", null: false
17+
t.datetime "updated_at", null: false
18+
end
19+
20+
end

test/dummy/db/shard_two_schema.rb

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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[7.1].define(version: 2024_12_05_195735) do
14+
create_table "sharded_job_results", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
15+
t.string "value"
16+
t.datetime "created_at", null: false
17+
t.datetime "updated_at", null: false
18+
end
19+
20+
end

0 commit comments

Comments
 (0)