char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move comments about Rooms trees to doc comments

next
Devin Ragotzy 2021-02-28 18:53:17 -05:00
parent 0dd8a15c49
commit f3253f2033
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/database/rooms.rs
View File

@ -63,8 +63,11 @@ pub struct Rooms {
/// Remember the state hash at events in the past. /// Remember the state hash at events in the past.
pub(super) pduid_statehash: sled::Tree, pub(super) pduid_statehash: sled::Tree,
/// The state for a given state hash. /// The state for a given state hash.
pub(super) statekey_short: sled::Tree, // StateKey = EventType + StateKey, Short = Count ///
pub(super) stateid_pduid: sled::Tree, // StateId = StateHash + Short, PduId = Count (without roomid) /// StateKey = EventType + StateKey, Short = Count
pub(super) statekey_short: sled::Tree,
/// StateId = StateHash + Short, PduId = Count (without roomid)
pub(super) stateid_pduid: sled::Tree,
/// RoomId + EventId -> outlier PDU. /// RoomId + EventId -> outlier PDU.
/// Any pdu that has passed the steps 1-8 in the incoming event /federation/send/txn. /// Any pdu that has passed the steps 1-8 in the incoming event /federation/send/txn.
@ -583,11 +586,11 @@ impl Rooms {
let mut hash = hash?.to_vec(); let mut hash = hash?.to_vec();
hash.extend_from_slice(&short.to_be_bytes()); hash.extend_from_slice(&short.to_be_bytes());
let _ = self.stateid_pduid.compare_and_swap( let _ = dbg!(self.stateid_pduid.compare_and_swap(
hash, hash,
Some(pdu.event_id().as_bytes()), Some(pdu.event_id().as_bytes()),
Some(pdu_id.as_ref()), Some(pdu_id.as_ref()),
)?; )?);
} }
} }
} }
@ -921,12 +924,12 @@ impl Rooms {
content.clone(), content.clone(),
prev_event, prev_event,
None, // TODO: third party invite None, // TODO: third party invite
&auth_events dbg!(&auth_events
.iter() .iter()
.map(|((ty, key), pdu)| { .map(|((ty, key), pdu)| {
Ok(((ty.clone(), key.clone()), Arc::new(pdu.clone()))) Ok(((ty.clone(), key.clone()), Arc::new(pdu.clone())))
}) })
.collect::<Result<StateMap<_>>>()?, .collect::<Result<StateMap<_>>>()?),
) )
.map_err(|e| { .map_err(|e| {
log::error!("{}", e); log::error!("{}", e);