backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-16 15:21:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move statekeyshort_cache to service

Browse source
This commit is contained in:
Charles Hall 2024-10-08 13:27:02 -07:00
parent 2b2b4169df
commit 190b788683
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
5 changed files with 79 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/database.rs
View file

@ -236,8 +236,6 @@ pub(crate) struct KeyValueDatabase {
pub(super) senderkey_pusher: Arc<dyn KvTree>,
// Uncategorized trees
pub(super) statekeyshort_cache:
Mutex<LruCache<(StateEventType, String), ShortStateKey>>,
pub(super) shortstatekey_cache:
Mutex<LruCache<ShortStateKey, (StateEventType, String)>>,
pub(super) our_real_users_cache:
@ -471,14 +469,6 @@ impl KeyValueDatabase {
shortstatekey_cache: Mutex::new(LruCache::new(
(100_000.0 * config.cache_capacity_modifier) as usize,
)),
#[allow(
clippy::as_conversions,
clippy::cast_sign_loss,
clippy::cast_possible_truncation
)]
statekeyshort_cache: Mutex::new(LruCache::new(
(100_000.0 * config.cache_capacity_modifier) as usize,
)),
our_real_users_cache: RwLock::new(HashMap::new()),
appservice_in_room_cache: RwLock::new(HashMap::new()),
lasttimelinecount_cache: Mutex::new(HashMap::new()),

61
src/database/key_value/rooms/short.rs
View file

@ -47,18 +47,6 @@ impl service::rooms::short::Data for KeyValueDatabase {
event_type: &StateEventType,
state_key: &str,
) -> Result<Option<ShortStateKey>> {
let lookup = Lookup::StateKeyToShort;
if let Some(short) = self
.statekeyshort_cache
.lock()
.unwrap()
.get_mut(&(event_type.clone(), state_key.to_owned()))
{
METRICS.record_lookup(lookup, FoundIn::Cache);
return Ok(Some(*short));
}
let mut db_key = event_type.to_string().as_bytes().to_vec();
db_key.push(0xFF);
db_key.extend_from_slice(state_key.as_bytes());
@ -75,17 +63,6 @@ impl service::rooms::short::Data for KeyValueDatabase {
})
.transpose()?;
if let Some(s) = short {
METRICS.record_lookup(lookup, FoundIn::Database);
self.statekeyshort_cache
.lock()
.unwrap()
.insert((event_type.clone(), state_key.to_owned()), s);
} else {
METRICS.record_lookup(lookup, FoundIn::Nothing);
}
Ok(short)
}
@ -94,50 +71,32 @@ impl service::rooms::short::Data for KeyValueDatabase {
&self,
event_type: &StateEventType,
state_key: &str,
) -> Result<ShortStateKey> {
let lookup = Lookup::CreateStateKeyToShort;
if let Some(short) = self
.statekeyshort_cache
.lock()
.unwrap()
.get_mut(&(event_type.clone(), state_key.to_owned()))
{
METRICS.record_lookup(lookup, FoundIn::Cache);
return Ok(*short);
}
) -> Result<(ShortStateKey, bool)> {
let mut db_key = event_type.to_string().as_bytes().to_vec();
db_key.push(0xFF);
db_key.extend_from_slice(state_key.as_bytes());
let short = if let Some(shortstatekey) =
let (short, created) = if let Some(shortstatekey) =
self.statekey_shortstatekey.get(&db_key)?
{
METRICS.record_lookup(lookup, FoundIn::Database);
utils::u64_from_bytes(&shortstatekey).map_err(|_| {
Error::bad_database("Invalid shortstatekey in db.")
})?
(
utils::u64_from_bytes(&shortstatekey).map_err(|_| {
Error::bad_database("Invalid shortstatekey in db.")
})?,
false,
)
} else {
METRICS.record_lookup(lookup, FoundIn::Nothing);
let shortstatekey = services().globals.next_count()?;
self.statekey_shortstatekey
.insert(&db_key, &shortstatekey.to_be_bytes())?;
self.shortstatekey_statekey
.insert(&shortstatekey.to_be_bytes(), &db_key)?;
shortstatekey
(shortstatekey, true)
};
let short = ShortStateKey::new(short);
self.statekeyshort_cache
.lock()
.unwrap()
.insert((event_type.clone(), state_key.to_owned()), short);
Ok(short)
Ok((short, created))
}
#[tracing::instrument(skip(self))]

8
src/service.rs
View file

@ -120,6 +120,14 @@ impl Services {
{
(100_000.0 * config.cache_capacity_modifier) as usize
},
#[allow(
clippy::as_conversions,
clippy::cast_sign_loss,
clippy::cast_possible_truncation
)]
{
(100_000.0 * config.cache_capacity_modifier) as usize
},
),
state: rooms::state::Service {
db,

61
src/service/rooms/short.rs
View file

@ -39,6 +39,8 @@ pub(crate) struct Service {
db: &'static dyn Data,
shorteventid_cache: Mutex<LruCache<ShortEventId, Arc<EventId>>>,
eventidshort_cache: Mutex<LruCache<OwnedEventId, ShortEventId>>,
statekeyshort_cache:
Mutex<LruCache<(StateEventType, String), ShortStateKey>>,
}
impl Service {
@ -46,6 +48,7 @@ impl Service {
db: &'static dyn Data,
shorteventid_cache_size: usize,
eventidshort_cache_size: usize,
statekeyshort_cache_size: usize,
) -> Self {
Self {
db,
@ -55,6 +58,9 @@ impl Service {
eventidshort_cache: Mutex::new(LruCache::new(
eventidshort_cache_size,
)),
statekeyshort_cache: Mutex::new(LruCache::new(
statekeyshort_cache_size,
)),
}
}
@ -92,7 +98,32 @@ impl Service {
event_type: &StateEventType,
state_key: &str,
) -> Result<Option<ShortStateKey>> {
self.db.get_shortstatekey(event_type, state_key)
let lookup = Lookup::StateKeyToShort;
if let Some(short) = self
.statekeyshort_cache
.lock()
.unwrap()
.get_mut(&(event_type.clone(), state_key.to_owned()))
{
METRICS.record_lookup(lookup, FoundIn::Cache);
return Ok(Some(*short));
}
let short = self.db.get_shortstatekey(event_type, state_key)?;
if let Some(short) = short {
METRICS.record_lookup(lookup, FoundIn::Database);
self.statekeyshort_cache
.lock()
.unwrap()
.insert((event_type.clone(), state_key.to_owned()), short);
} else {
METRICS.record_lookup(lookup, FoundIn::Nothing);
}
Ok(short)
}
pub(crate) fn get_or_create_shortstatekey(
@ -100,7 +131,33 @@ impl Service {
event_type: &StateEventType,
state_key: &str,
) -> Result<ShortStateKey> {
self.db.get_or_create_shortstatekey(event_type, state_key)
let lookup = Lookup::CreateStateKeyToShort;
if let Some(short) = self
.statekeyshort_cache
.lock()
.unwrap()
.get_mut(&(event_type.clone(), state_key.to_owned()))
{
METRICS.record_lookup(lookup, FoundIn::Cache);
return Ok(*short);
}
let (short, created) =
self.db.get_or_create_shortstatekey(event_type, state_key)?;
if created {
METRICS.record_lookup(lookup, FoundIn::Nothing);
} else {
METRICS.record_lookup(lookup, FoundIn::Database);
}
self.statekeyshort_cache
.lock()
.unwrap()
.insert((event_type.clone(), state_key.to_owned()), short);
Ok(short)
}
pub(crate) fn get_eventid_from_short(

3
src/service/rooms/short/data.rs
View file

@ -18,11 +18,12 @@ pub(crate) trait Data: Send + Sync {
state_key: &str,
) -> Result<Option<ShortStateKey>>;
/// The returned bool indicates whether it was created
fn get_or_create_shortstatekey(
&self,
event_type: &StateEventType,
state_key: &str,
) -> Result<ShortStateKey>;
) -> Result<(ShortStateKey, bool)>;
fn get_eventid_from_short(
&self,