magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor dyn KvTree out of services

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-28 22:51:39 +00:00
parent 57acc4f655
commit cb48e25783
69 changed files with 594 additions and 647 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/service/rooms/state_compressor/data.rs
View file

@ -1,9 +1,9 @@
use std::{collections::HashSet, mem::size_of, sync::Arc};
use database::KvTree;
use conduit::{utils, Error, Result};
use database::{Database, Map};
use super::CompressedStateEvent;
use crate::{utils, Error, KeyValueDatabase, Result};
pub(super) struct StateDiff {
pub(super) parent: Option<u64>,
@ -11,14 +11,14 @@ pub(super) struct StateDiff {
pub(super) removed: Arc<HashSet<CompressedStateEvent>>,
}
pub struct Data {
shortstatehash_statediff: Arc<dyn KvTree>,
pub(super) struct Data {
shortstatehash_statediff: Arc<Map>,
}
impl Data {
pub(super) fn new(db: &Arc<KeyValueDatabase>) -> Self {
pub(super) fn new(db: &Arc<Database>) -> Self {
Self {
shortstatehash_statediff: db.shortstatehash_statediff.clone(),
shortstatehash_statediff: db["shortstatehash_statediff"].clone(),
}
}

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

@ -1,21 +1,19 @@
use std::sync::Mutex as StdMutex;
use conduit::Server;
use database::KeyValueDatabase;
mod data;
use std::{
collections::HashSet,
mem::size_of,
sync::{Arc, Mutex},
sync::{Arc, Mutex as StdMutex, Mutex},
};
use conduit::{utils, Result, Server};
use data::Data;
use database::Database;
use lru_cache::LruCache;
use ruma::{EventId, RoomId};
use self::data::StateDiff;
use crate::{services, utils, Result};
use crate::services;
type StateInfoLruCache = Mutex<
LruCache<
@ -49,13 +47,13 @@ type HashSetCompressStateEvent = Result<(u64, Arc<HashSet<CompressedStateEvent>>
pub type CompressedStateEvent = [u8; 2 * size_of::<u64>()];
pub struct Service {
pub db: Data,
db: Data,
pub stateinfo_cache: StateInfoLruCache,
}
impl Service {
pub fn build(server: &Arc<Server>, db: &Arc<KeyValueDatabase>) -> Result<Self> {
pub fn build(server: &Arc<Server>, db: &Arc<Database>) -> Result<Self> {
let config = &server.config;
Ok(Self {
db: Data::new(db),