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

Fix infinite loop when looking for missing state groups

Browse Source 
The code which handles state groups which appear in state_group_edges but not
state_groups_state would get confused if such state_groups did not themselves
have a prev_state_group.
This commit is contained in:
Richard van der Hoff
2019-08-12 00:06:30 +01:00
parent 71a143193c
commit cdb734f58c
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/database.rs
View File

@@ -43,7 +43,7 @@ pub fn get_data_from_db(
// Since the returned groups may themselves reference groups we don't have, // Since the returned groups may themselves reference groups we don't have,
// we need to do this recursively until we don't find any more missing. // we need to do this recursively until we don't find any more missing.
loop { loop {
let missing_sgs: Vec<_> = state_group_map let mut missing_sgs: Vec<_> = state_group_map
.iter() .iter()
.filter_map(|(_sg, entry)| { .filter_map(|(_sg, entry)| {
if let Some(prev_sg) = entry.prev_state_group { if let Some(prev_sg) = entry.prev_state_group {
@@ -59,9 +59,13 @@ pub fn get_data_from_db(
.collect(); .collect();
if missing_sgs.is_empty() { if missing_sgs.is_empty() {
println!("No missing state groups");
break; break;
} }
missing_sgs.sort_unstable();
missing_sgs.dedup();
println!("Missing {} state groups", missing_sgs.len()); println!("Missing {} state groups", missing_sgs.len());
let map = get_missing_from_db(&conn, &missing_sgs); let map = get_missing_from_db(&conn, &missing_sgs);
@@ -154,13 +158,16 @@ fn get_missing_from_db(conn: &Connection, missing_sgs: &[i64]) -> BTreeMap<i64,
let mut rows = stmt.lazy_query(&trans, &[&missing_sgs], 100).unwrap(); let mut rows = stmt.lazy_query(&trans, &[&missing_sgs], 100).unwrap();
let mut state_group_map: BTreeMap<i64, StateGroupEntry> = BTreeMap::new(); // initialise the map with empty entries (the missing group may not
// have a prev_state_group either)
let mut state_group_map: BTreeMap<i64, StateGroupEntry> =
missing_sgs.iter()
.map(|sg| (*sg, StateGroupEntry::default()))
.collect();
while let Some(row) = rows.next().unwrap() { while let Some(row) = rows.next().unwrap() {
let state_group = row.get(0); let state_group = row.get(0);
let entry = state_group_map.get_mut(&state_group).unwrap();
let entry = state_group_map.entry(state_group).or_default();
entry.prev_state_group = row.get(1); entry.prev_state_group = row.get(1);
} }