TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fmt

Browse source
This commit is contained in:
Timo Kösters 2021-08-21 14:24:10 +02:00 • committed by Jonas Zohren
parent 8784df0d3a
commit d058f6522e
2 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/database.rs
View file

@ -636,7 +636,11 @@ impl Database {
if db.globals.database_version()? < 9 {
// Update tokenids db layout
let batch = db.rooms.tokenids.iter().filter_map(|(key, _)| {
let batch = db
.rooms
.tokenids
.iter()
.filter_map(|(key, _)| {
if !key.starts_with(b"!") {
return None;
}
@ -659,25 +663,33 @@ impl Database {
println!("old {:?}", key);
println!("new {:?}", new_key);
Some((new_key, Vec::new()))
}).collect::<Vec<_>>();
})
.collect::<Vec<_>>();
let mut iter = batch.into_iter().peekable();
while iter.peek().is_some() {
db.rooms.tokenids.insert_batch(&mut iter.by_ref().take(1000))?;
db.rooms
.tokenids
.insert_batch(&mut iter.by_ref().take(1000))?;
println!("smaller batch done");
}
println!("Deleting starts");
let batch2 = db.rooms.tokenids.iter().filter_map(|(key, _)| {
let batch2 = db
.rooms
.tokenids
.iter()
.filter_map(|(key, _)| {
if key.starts_with(b"!") {
println!("del {:?}", key);
Some(key)
} else {
None
}
}).collect::<Vec<_>>();
})
.collect::<Vec<_>>();
for key in batch2 {
println!("del");

2
src/server_server.rs
View file

@ -912,7 +912,7 @@ pub async fn handle_incoming_pdu<'a>(
// Max limit reached
warn!("Max prev event limit reached!");
graph.insert(prev_event_id.clone(), HashSet::new());
continue
continue;
}
if let Some(json) =