nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix: some compile time errors

Browse source 
Only 174 errors left!
This commit is contained in:
Timo Kösters 2022-09-06 23:15:09 +02:00 • committed by Nyaaori
parent 82e7f57b38
commit 057f8364cc
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
118 changed files with 2139 additions and 2433 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/service/rooms/state_compressor/mod.rs
View file

@ -1,7 +1,12 @@
mod data;
pub use data::Data;
pub mod data;
use std::{mem::size_of, sync::Arc, collections::HashSet};
use crate::service::*;
pub use data::Data;
use ruma::{EventId, RoomId};
use crate::{service::*, utils};
use self::data::StateDiff;
pub struct Service<D: Data> {
db: D,
@ -30,9 +35,9 @@ impl Service<_> {
return Ok(r.clone());
}
self.db.get_statediff(shortstatehash)?;
let StateDiff { parent, added, removed } = self.db.get_statediff(shortstatehash)?;
if parent != 0_u64 {
if let Some(parent) = parent {
let mut response = self.load_shortstatehash_info(parent)?;
let mut state = response.last().unwrap().1.clone();
state.extend(added.iter().copied());
@ -155,7 +160,7 @@ impl Service<_> {
if parent_states.is_empty() {
// There is no parent layer, create a new state
self.db.save_statediff(shortstatehash, StateDiff { parent: 0, new: statediffnew, removed: statediffremoved })?;
self.db.save_statediff(shortstatehash, StateDiff { parent: None, added: statediffnew, removed: statediffremoved })?;
return Ok(());
};
@ -197,7 +202,7 @@ impl Service<_> {
)?;
} else {
// Diff small enough, we add diff as layer on top of parent
self.db.save_statediff(shortstatehash, StateDiff { parent: parent.0, new: statediffnew, removed: statediffremoved })?;
self.db.save_statediff(shortstatehash, StateDiff { parent: Some(parent.0), added: statediffnew, removed: statediffremoved })?;
}
Ok(())