Skip to content

Commit fe7beea

Browse files
committed
For performance, switch to a row count estimate for users and devices
1 parent 1dbe2d3 commit fe7beea

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

crates/syn2mas/src/migration.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,10 @@ pub async fn migrate(
164164
counts
165165
.devices
166166
.try_into()
167-
.expect("More than usize::MAX devices — unable to handle this many!"),
167+
.expect("More than usize::MAX devices — unable to handle this many!")
168+
// Oversize the capacity, because the count is only an estimate and
169+
// we would like to avoid a reallocation
170+
* 3 / 2,
168171
);
169172

170173
span.pb_set_message("migrating access tokens");
@@ -252,8 +255,9 @@ async fn migrate_users(
252255
let mut user_buffer = MasWriteBuffer::new(mas, MasWriter::write_users);
253256
let mut password_buffer = MasWriteBuffer::new(mas, MasWriter::write_passwords);
254257
let mut users_stream = pin!(synapse.read_users());
255-
// TODO is 1:1 capacity enough for a hashmap?
256-
let mut user_localparts_to_uuid = HashMap::with_capacity(user_count_hint);
258+
// Oversize the capacity, because the count is only an estimate and
259+
// we would like to avoid a reallocation
260+
let mut user_localparts_to_uuid = HashMap::with_capacity(user_count_hint * 3 / 2);
257261
let mut synapse_admins = HashSet::new();
258262

259263
while let Some(user_res) = users_stream.next().await {

crates/syn2mas/src/synapse_reader/mod.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,24 +338,28 @@ impl<'conn> SynapseReader<'conn> {
338338
///
339339
/// - An underlying database error
340340
pub async fn count_rows(&mut self) -> Result<SynapseRowCounts, Error> {
341+
// We don't get to filter out application service users by using this estimate,
342+
// which is a shame, but on a large database this is way faster.
343+
// On matrix.org, counting users and devices properly takes around 1m10s,
344+
// which is unnecessary extra downtime during the migration, just to
345+
// show a more accurate progress bar and size a hash map accurately.
341346
let users: i64 = sqlx::query_scalar(
342347
"
343-
SELECT COUNT(1) FROM users
344-
WHERE appservice_id IS NULL
348+
SELECT reltuples::bigint AS estimate FROM pg_class WHERE oid = 'users'::regclass;
345349
",
346350
)
347351
.fetch_one(&mut *self.txn)
348352
.await
349-
.into_database("counting Synapse users")?;
353+
.into_database("estimating count of users")?;
350354

351355
let devices = sqlx::query_scalar(
352356
"
353-
SELECT COUNT(1) FROM devices
357+
SELECT reltuples::bigint AS estimate FROM pg_class WHERE oid = 'devices'::regclass;
354358
",
355359
)
356360
.fetch_one(&mut *self.txn)
357361
.await
358-
.into_database("counting Synapse devices")?;
362+
.into_database("estimating count of devices")?;
359363

360364
// For other rows, we don't particularly care about the number except for
361365
// progress bars, so retrieve a fast estimate from the statistics system

0 commit comments

Comments
 (0)