|
|
@ -88,7 +88,7 @@ pub struct Rooms {
|
|
|
|
pub(super) referencedevents: Arc<dyn Tree>,
|
|
|
|
pub(super) referencedevents: Arc<dyn Tree>,
|
|
|
|
|
|
|
|
|
|
|
|
pub(super) pdu_cache: Mutex<LruCache<EventId, Arc<PduEvent>>>,
|
|
|
|
pub(super) pdu_cache: Mutex<LruCache<EventId, Arc<PduEvent>>>,
|
|
|
|
pub(super) auth_chain_cache: Mutex<LruCache<Vec<EventId>, HashSet<EventId>>>,
|
|
|
|
pub(super) auth_chain_cache: Mutex<LruCache<u64, HashSet<u64>>>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Rooms {
|
|
|
|
impl Rooms {
|
|
|
@ -315,19 +315,7 @@ impl Rooms {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
let (shortstatehash, already_existed) =
|
|
|
|
let (shortstatehash, already_existed) =
|
|
|
|
match self.statehash_shortstatehash.get(&state_hash)? {
|
|
|
|
self.get_or_create_shortstatehash(&state_hash, &db.globals)?;
|
|
|
|
Some(shortstatehash) => (
|
|
|
|
|
|
|
|
utils::u64_from_bytes(&shortstatehash)
|
|
|
|
|
|
|
|
.map_err(|_| Error::bad_database("Invalid shortstatehash in db."))?,
|
|
|
|
|
|
|
|
true,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shortstatehash = db.globals.next_count()?;
|
|
|
|
|
|
|
|
self.statehash_shortstatehash
|
|
|
|
|
|
|
|
.insert(&state_hash, &shortstatehash.to_be_bytes())?;
|
|
|
|
|
|
|
|
(shortstatehash, false)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let new_state = if !already_existed {
|
|
|
|
let new_state = if !already_existed {
|
|
|
|
let mut new_state = HashSet::new();
|
|
|
|
let mut new_state = HashSet::new();
|
|
|
@ -352,25 +340,14 @@ impl Rooms {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
let shorteventid =
|
|
|
|
let shorteventid = self
|
|
|
|
match self.eventid_shorteventid.get(eventid.as_bytes()).ok()? {
|
|
|
|
.get_or_create_shorteventid(&eventid, &db.globals)
|
|
|
|
Some(shorteventid) => shorteventid.to_vec(),
|
|
|
|
.ok()?;
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shorteventid = db.globals.next_count().ok()?;
|
|
|
|
|
|
|
|
self.eventid_shorteventid
|
|
|
|
|
|
|
|
.insert(eventid.as_bytes(), &shorteventid.to_be_bytes())
|
|
|
|
|
|
|
|
.ok()?;
|
|
|
|
|
|
|
|
self.shorteventid_eventid
|
|
|
|
|
|
|
|
.insert(&shorteventid.to_be_bytes(), eventid.as_bytes())
|
|
|
|
|
|
|
|
.ok()?;
|
|
|
|
|
|
|
|
shorteventid.to_be_bytes().to_vec()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut state_id = shortstatehash.to_be_bytes().to_vec();
|
|
|
|
let mut state_id = shortstatehash.to_be_bytes().to_vec();
|
|
|
|
state_id.extend_from_slice(&shortstatekey);
|
|
|
|
state_id.extend_from_slice(&shortstatekey);
|
|
|
|
|
|
|
|
|
|
|
|
Some((state_id, shorteventid))
|
|
|
|
Some((state_id, shorteventid.to_be_bytes().to_vec()))
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
|
|
|
@ -428,6 +405,61 @@ impl Rooms {
|
|
|
|
Ok(())
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Returns (shortstatehash, already_existed)
|
|
|
|
|
|
|
|
fn get_or_create_shortstatehash(
|
|
|
|
|
|
|
|
&self,
|
|
|
|
|
|
|
|
state_hash: &StateHashId,
|
|
|
|
|
|
|
|
globals: &super::globals::Globals,
|
|
|
|
|
|
|
|
) -> Result<(u64, bool)> {
|
|
|
|
|
|
|
|
Ok(match self.statehash_shortstatehash.get(&state_hash)? {
|
|
|
|
|
|
|
|
Some(shortstatehash) => (
|
|
|
|
|
|
|
|
utils::u64_from_bytes(&shortstatehash)
|
|
|
|
|
|
|
|
.map_err(|_| Error::bad_database("Invalid shortstatehash in db."))?,
|
|
|
|
|
|
|
|
true,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shortstatehash = globals.next_count()?;
|
|
|
|
|
|
|
|
self.statehash_shortstatehash
|
|
|
|
|
|
|
|
.insert(&state_hash, &shortstatehash.to_be_bytes())?;
|
|
|
|
|
|
|
|
(shortstatehash, false)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Returns (shortstatehash, already_existed)
|
|
|
|
|
|
|
|
pub fn get_or_create_shorteventid(
|
|
|
|
|
|
|
|
&self,
|
|
|
|
|
|
|
|
event_id: &EventId,
|
|
|
|
|
|
|
|
globals: &super::globals::Globals,
|
|
|
|
|
|
|
|
) -> Result<u64> {
|
|
|
|
|
|
|
|
Ok(match self.eventid_shorteventid.get(event_id.as_bytes())? {
|
|
|
|
|
|
|
|
Some(shorteventid) => utils::u64_from_bytes(&shorteventid)
|
|
|
|
|
|
|
|
.map_err(|_| Error::bad_database("Invalid shorteventid in db."))?,
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shorteventid = globals.next_count()?;
|
|
|
|
|
|
|
|
self.eventid_shorteventid
|
|
|
|
|
|
|
|
.insert(event_id.as_bytes(), &shorteventid.to_be_bytes())?;
|
|
|
|
|
|
|
|
self.shorteventid_eventid
|
|
|
|
|
|
|
|
.insert(&shorteventid.to_be_bytes(), event_id.as_bytes())?;
|
|
|
|
|
|
|
|
shorteventid
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn get_eventid_from_short(&self, shorteventid: u64) -> Result<EventId> {
|
|
|
|
|
|
|
|
let bytes = self
|
|
|
|
|
|
|
|
.shorteventid_eventid
|
|
|
|
|
|
|
|
.get(&shorteventid.to_be_bytes())?
|
|
|
|
|
|
|
|
.ok_or_else(|| Error::bad_database("Shorteventid does not exist"))?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
EventId::try_from(
|
|
|
|
|
|
|
|
utils::string_from_bytes(&bytes).map_err(|_| {
|
|
|
|
|
|
|
|
Error::bad_database("EventID in roomid_pduleaves is invalid unicode.")
|
|
|
|
|
|
|
|
})?,
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
.map_err(|_| Error::bad_database("EventId in roomid_pduleaves is invalid."))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// Returns the full room state.
|
|
|
|
/// Returns the full room state.
|
|
|
|
#[tracing::instrument(skip(self))]
|
|
|
|
#[tracing::instrument(skip(self))]
|
|
|
|
pub fn room_state_full(
|
|
|
|
pub fn room_state_full(
|
|
|
@ -1116,17 +1148,7 @@ impl Rooms {
|
|
|
|
state: &StateMap<Arc<PduEvent>>,
|
|
|
|
state: &StateMap<Arc<PduEvent>>,
|
|
|
|
globals: &super::globals::Globals,
|
|
|
|
globals: &super::globals::Globals,
|
|
|
|
) -> Result<()> {
|
|
|
|
) -> Result<()> {
|
|
|
|
let shorteventid = match self.eventid_shorteventid.get(event_id.as_bytes())? {
|
|
|
|
let shorteventid = self.get_or_create_shorteventid(&event_id, globals)?;
|
|
|
|
Some(shorteventid) => shorteventid.to_vec(),
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shorteventid = globals.next_count()?;
|
|
|
|
|
|
|
|
self.eventid_shorteventid
|
|
|
|
|
|
|
|
.insert(event_id.as_bytes(), &shorteventid.to_be_bytes())?;
|
|
|
|
|
|
|
|
self.shorteventid_eventid
|
|
|
|
|
|
|
|
.insert(&shorteventid.to_be_bytes(), event_id.as_bytes())?;
|
|
|
|
|
|
|
|
shorteventid.to_be_bytes().to_vec()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let state_hash = self.calculate_hash(
|
|
|
|
let state_hash = self.calculate_hash(
|
|
|
|
&state
|
|
|
|
&state
|
|
|
@ -1135,69 +1157,45 @@ impl Rooms {
|
|
|
|
.collect::<Vec<_>>(),
|
|
|
|
.collect::<Vec<_>>(),
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
let shortstatehash = match self.statehash_shortstatehash.get(&state_hash)? {
|
|
|
|
let (shortstatehash, already_existed) =
|
|
|
|
Some(shortstatehash) => {
|
|
|
|
self.get_or_create_shortstatehash(&state_hash, globals)?;
|
|
|
|
// State already existed in db
|
|
|
|
|
|
|
|
self.shorteventid_shortstatehash
|
|
|
|
|
|
|
|
.insert(&shorteventid, &*shortstatehash)?;
|
|
|
|
|
|
|
|
return Ok(());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shortstatehash = globals.next_count()?;
|
|
|
|
|
|
|
|
self.statehash_shortstatehash
|
|
|
|
|
|
|
|
.insert(&state_hash, &shortstatehash.to_be_bytes())?;
|
|
|
|
|
|
|
|
shortstatehash.to_be_bytes().to_vec()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let batch = state
|
|
|
|
if !already_existed {
|
|
|
|
.iter()
|
|
|
|
let batch = state
|
|
|
|
.filter_map(|((event_type, state_key), pdu)| {
|
|
|
|
.iter()
|
|
|
|
let mut statekey = event_type.as_ref().as_bytes().to_vec();
|
|
|
|
.filter_map(|((event_type, state_key), pdu)| {
|
|
|
|
statekey.push(0xff);
|
|
|
|
let mut statekey = event_type.as_ref().as_bytes().to_vec();
|
|
|
|
statekey.extend_from_slice(&state_key.as_bytes());
|
|
|
|
statekey.push(0xff);
|
|
|
|
|
|
|
|
statekey.extend_from_slice(&state_key.as_bytes());
|
|
|
|
let shortstatekey = match self.statekey_shortstatekey.get(&statekey).ok()? {
|
|
|
|
|
|
|
|
Some(shortstatekey) => shortstatekey.to_vec(),
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shortstatekey = globals.next_count().ok()?;
|
|
|
|
|
|
|
|
self.statekey_shortstatekey
|
|
|
|
|
|
|
|
.insert(&statekey, &shortstatekey.to_be_bytes())
|
|
|
|
|
|
|
|
.ok()?;
|
|
|
|
|
|
|
|
shortstatekey.to_be_bytes().to_vec()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let shorteventid = match self
|
|
|
|
let shortstatekey = match self.statekey_shortstatekey.get(&statekey).ok()? {
|
|
|
|
.eventid_shorteventid
|
|
|
|
Some(shortstatekey) => shortstatekey.to_vec(),
|
|
|
|
.get(pdu.event_id.as_bytes())
|
|
|
|
None => {
|
|
|
|
.ok()?
|
|
|
|
let shortstatekey = globals.next_count().ok()?;
|
|
|
|
{
|
|
|
|
self.statekey_shortstatekey
|
|
|
|
Some(shorteventid) => shorteventid.to_vec(),
|
|
|
|
.insert(&statekey, &shortstatekey.to_be_bytes())
|
|
|
|
None => {
|
|
|
|
.ok()?;
|
|
|
|
let shorteventid = globals.next_count().ok()?;
|
|
|
|
shortstatekey.to_be_bytes().to_vec()
|
|
|
|
self.eventid_shorteventid
|
|
|
|
}
|
|
|
|
.insert(pdu.event_id.as_bytes(), &shorteventid.to_be_bytes())
|
|
|
|
};
|
|
|
|
.ok()?;
|
|
|
|
|
|
|
|
self.shorteventid_eventid
|
|
|
|
|
|
|
|
.insert(&shorteventid.to_be_bytes(), pdu.event_id.as_bytes())
|
|
|
|
|
|
|
|
.ok()?;
|
|
|
|
|
|
|
|
shorteventid.to_be_bytes().to_vec()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut state_id = shortstatehash.clone();
|
|
|
|
let shorteventid = self
|
|
|
|
state_id.extend_from_slice(&shortstatekey);
|
|
|
|
.get_or_create_shorteventid(&pdu.event_id, globals)
|
|
|
|
|
|
|
|
.ok()?;
|
|
|
|
|
|
|
|
|
|
|
|
Some((state_id, shorteventid))
|
|
|
|
let mut state_id = shortstatehash.to_be_bytes().to_vec();
|
|
|
|
})
|
|
|
|
state_id.extend_from_slice(&shortstatekey);
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
|
|
|
|
Some((state_id, shorteventid.to_be_bytes().to_vec()))
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
|
|
|
|
self.stateid_shorteventid
|
|
|
|
self.stateid_shorteventid
|
|
|
|
.insert_batch(&mut batch.into_iter())?;
|
|
|
|
.insert_batch(&mut batch.into_iter())?;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
self.shorteventid_shortstatehash
|
|
|
|
self.shorteventid_shortstatehash
|
|
|
|
.insert(&shorteventid, &*shortstatehash)?;
|
|
|
|
.insert(&shorteventid.to_be_bytes(), &shortstatehash.to_be_bytes())?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1212,26 +1210,16 @@ impl Rooms {
|
|
|
|
new_pdu: &PduEvent,
|
|
|
|
new_pdu: &PduEvent,
|
|
|
|
globals: &super::globals::Globals,
|
|
|
|
globals: &super::globals::Globals,
|
|
|
|
) -> Result<u64> {
|
|
|
|
) -> Result<u64> {
|
|
|
|
|
|
|
|
let shorteventid = self.get_or_create_shorteventid(&new_pdu.event_id, globals)?;
|
|
|
|
|
|
|
|
|
|
|
|
let old_state = if let Some(old_shortstatehash) =
|
|
|
|
let old_state = if let Some(old_shortstatehash) =
|
|
|
|
self.roomid_shortstatehash.get(new_pdu.room_id.as_bytes())?
|
|
|
|
self.roomid_shortstatehash.get(new_pdu.room_id.as_bytes())?
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Store state for event. The state does not include the event itself.
|
|
|
|
// Store state for event. The state does not include the event itself.
|
|
|
|
// Instead it's the state before the pdu, so the room's old state.
|
|
|
|
// Instead it's the state before the pdu, so the room's old state.
|
|
|
|
|
|
|
|
|
|
|
|
let shorteventid = match self.eventid_shorteventid.get(new_pdu.event_id.as_bytes())? {
|
|
|
|
|
|
|
|
Some(shorteventid) => shorteventid.to_vec(),
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shorteventid = globals.next_count()?;
|
|
|
|
|
|
|
|
self.eventid_shorteventid
|
|
|
|
|
|
|
|
.insert(new_pdu.event_id.as_bytes(), &shorteventid.to_be_bytes())?;
|
|
|
|
|
|
|
|
self.shorteventid_eventid
|
|
|
|
|
|
|
|
.insert(&shorteventid.to_be_bytes(), new_pdu.event_id.as_bytes())?;
|
|
|
|
|
|
|
|
shorteventid.to_be_bytes().to_vec()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.shorteventid_shortstatehash
|
|
|
|
self.shorteventid_shortstatehash
|
|
|
|
.insert(&shorteventid, &old_shortstatehash)?;
|
|
|
|
.insert(&shorteventid.to_be_bytes(), &old_shortstatehash)?;
|
|
|
|
|
|
|
|
|
|
|
|
if new_pdu.state_key.is_none() {
|
|
|
|
if new_pdu.state_key.is_none() {
|
|
|
|
return utils::u64_from_bytes(&old_shortstatehash).map_err(|_| {
|
|
|
|
return utils::u64_from_bytes(&old_shortstatehash).map_err(|_| {
|
|
|
|
Error::bad_database("Invalid shortstatehash in roomid_shortstatehash.")
|
|
|
|
Error::bad_database("Invalid shortstatehash in roomid_shortstatehash.")
|
|
|
@ -1264,19 +1252,7 @@ impl Rooms {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
let shorteventid = match self.eventid_shorteventid.get(new_pdu.event_id.as_bytes())? {
|
|
|
|
new_state.insert(shortstatekey, shorteventid.to_be_bytes().to_vec());
|
|
|
|
Some(shorteventid) => shorteventid.to_vec(),
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
let shorteventid = globals.next_count()?;
|
|
|
|
|
|
|
|
self.eventid_shorteventid
|
|
|
|
|
|
|
|
.insert(new_pdu.event_id.as_bytes(), &shorteventid.to_be_bytes())?;
|
|
|
|
|
|
|
|
self.shorteventid_eventid
|
|
|
|
|
|
|
|
.insert(&shorteventid.to_be_bytes(), new_pdu.event_id.as_bytes())?;
|
|
|
|
|
|
|
|
shorteventid.to_be_bytes().to_vec()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
new_state.insert(shortstatekey, shorteventid);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let new_state_hash = self.calculate_hash(
|
|
|
|
let new_state_hash = self.calculate_hash(
|
|
|
|
&new_state
|
|
|
|
&new_state
|
|
|
@ -1516,11 +1492,7 @@ impl Rooms {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
// Generate short event id
|
|
|
|
// Generate short event id
|
|
|
|
let shorteventid = db.globals.next_count()?;
|
|
|
|
let _shorteventid = self.get_or_create_shorteventid(&pdu.event_id, &db.globals)?;
|
|
|
|
self.eventid_shorteventid
|
|
|
|
|
|
|
|
.insert(pdu.event_id.as_bytes(), &shorteventid.to_be_bytes())?;
|
|
|
|
|
|
|
|
self.shorteventid_eventid
|
|
|
|
|
|
|
|
.insert(&shorteventid.to_be_bytes(), pdu.event_id.as_bytes())?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// We append to state before appending the pdu, so we don't have a moment in time with the
|
|
|
|
// We append to state before appending the pdu, so we don't have a moment in time with the
|
|
|
|
// pdu without it's state. This is okay because append_pdu can't fail.
|
|
|
|
// pdu without it's state. This is okay because append_pdu can't fail.
|
|
|
@ -2655,9 +2627,7 @@ impl Rooms {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[tracing::instrument(skip(self))]
|
|
|
|
#[tracing::instrument(skip(self))]
|
|
|
|
pub fn auth_chain_cache(
|
|
|
|
pub fn auth_chain_cache(&self) -> std::sync::MutexGuard<'_, LruCache<u64, HashSet<u64>>> {
|
|
|
|
&self,
|
|
|
|
|
|
|
|
) -> std::sync::MutexGuard<'_, LruCache<Vec<EventId>, HashSet<EventId>>> {
|
|
|
|
|
|
|
|
self.auth_chain_cache.lock().unwrap()
|
|
|
|
self.auth_chain_cache.lock().unwrap()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|