heimoshuiyu/rust-synapse-compress-state
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify get_initial_data_from_db

Browse Source 
From Jörg Sommer's PR:
https://github.com/matrix-org/rust-synapse-compress-state/pull/10
This commit is contained in:
Jan Alexander Steffens (heftig)
2019-12-26 03:47:00 +01:00
parent c31ba2750f
commit 76ddeab12c
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/database.rs
View File

@@ -77,25 +77,21 @@ fn get_initial_data_from_db(
room_id: &str, room_id: &str,
max_state_group: Option<i64>, max_state_group: Option<i64>,
) -> BTreeMap<i64, StateGroupEntry> { ) -> BTreeMap<i64, StateGroupEntry> {
let sql = format!( let sql = r#"
r#"
SELECT m.id, prev_state_group, type, state_key, s.event_id SELECT m.id, prev_state_group, type, state_key, s.event_id
FROM state_groups AS m FROM state_groups AS m
LEFT JOIN state_groups_state AS s ON (m.id = s.state_group) LEFT JOIN state_groups_state AS s ON (m.id = s.state_group)
LEFT JOIN state_group_edges AS e ON (m.id = e.state_group) LEFT JOIN state_group_edges AS e ON (m.id = e.state_group)
WHERE m.room_id = $1 {} WHERE m.room_id = $1
"#, "#;
if max_state_group.is_some() {
"AND m.id <= $2"
} else {
""
}
);
let mut rows = if let Some(s) = max_state_group { let mut rows = if let Some(s) = max_state_group {
client.query_raw(&sql[..], vec![&room_id as _, &s as _]) client.query_raw(
format!(r"{} AND m.id <= $2", sql).as_str(),
vec![&room_id as _, &s as _],
)
} else { } else {
client.query_raw(&sql[..], iter::once(&room_id as _)) client.query_raw(sql, iter::once(&room_id as _))
} }
.unwrap(); .unwrap();
@@ -109,14 +105,11 @@ fn get_initial_data_from_db(
let mut num_rows = 0; let mut num_rows = 0;
while let Some(row) = rows.next().unwrap() { while let Some(row) = rows.next().unwrap() {
let state_group = row.get(0); let entry = state_group_map.entry(row.get(0)).or_default();
let entry = state_group_map.entry(state_group).or_default();
entry.prev_state_group = row.get(1); entry.prev_state_group = row.get(1);
let etype: Option<String> = row.get(2);
if let Some(etype) = etype { if let Some(etype) = row.get::<_, Option<String>>(2) {
entry.state_map.insert( entry.state_map.insert(
&etype, &etype,
&row.get::<_, String>(3), &row.get::<_, String>(3),