chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

state-res: Take ownership of events to sort in reverse_topological_power_sort

Browse Source 
Avoids clones.
This commit is contained in:
Jonas Platte 2021-08-31 19:12:30 +02:00
parent ebd812bcda
commit cc9336e444
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ruma-state-res/src/lib.rs
View File

@ -115,7 +115,7 @@ impl StateResolution {
// Sort the control events based on power_level/clock/event_id and outgoing/incoming edges // Sort the control events based on power_level/clock/event_id and outgoing/incoming edges
let sorted_control_levels = StateResolution::reverse_topological_power_sort( let sorted_control_levels = StateResolution::reverse_topological_power_sort(
&control_events, control_events,
&all_conflicted, &all_conflicted,
&fetch_event, &fetch_event,
)?; )?;
@ -231,7 +231,7 @@ impl StateResolution {
/// The power level is negative because a higher power level is equated to an /// The power level is negative because a higher power level is equated to an
/// earlier (further back in time) origin server timestamp. /// earlier (further back in time) origin server timestamp.
pub fn reverse_topological_power_sort<E, F>( pub fn reverse_topological_power_sort<E, F>(
events_to_sort: &[EventId], events_to_sort: Vec<EventId>,
auth_diff: &HashSet<EventId>, auth_diff: &HashSet<EventId>,
fetch_event: F, fetch_event: F,
) -> Result<Vec<EventId>> ) -> Result<Vec<EventId>>
@ -242,7 +242,7 @@ impl StateResolution {
debug!("reverse topological sort of power events"); debug!("reverse topological sort of power events");
let mut graph = HashMap::new(); let mut graph = HashMap::new();
for event_id in events_to_sort.iter() { for event_id in events_to_sort {
StateResolution::add_event_and_auth_chain_to_graph( StateResolution::add_event_and_auth_chain_to_graph(
&mut graph, &mut graph,
event_id, event_id,
@ -608,14 +608,14 @@ impl StateResolution {
fn add_event_and_auth_chain_to_graph<E, F>( fn add_event_and_auth_chain_to_graph<E, F>(
graph: &mut HashMap<EventId, HashSet<EventId>>, graph: &mut HashMap<EventId, HashSet<EventId>>,
event_id: &EventId, event_id: EventId,
auth_diff: &HashSet<EventId>, auth_diff: &HashSet<EventId>,
fetch_event: F, fetch_event: F,
) where ) where
E: Event, E: Event,
F: Fn(&EventId) -> Option<Arc<E>>, F: Fn(&EventId) -> Option<Arc<E>>,
{ {
let mut state = vec![event_id.clone()]; let mut state = vec![event_id];
while let Some(eid) = state.pop() { while let Some(eid) = state.pop() {
graph.entry(eid.clone()).or_default(); graph.entry(eid.clone()).or_default();
// Prefer the store to event as the store filters dedups the events // Prefer the store to event as the store filters dedups the events

2
crates/ruma-state-res/tests/event_sorting.rs
View File

@ -27,7 +27,7 @@ fn test_event_sort() {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let sorted_power_events = let sorted_power_events =
StateResolution::reverse_topological_power_sort(&power_events, &auth_chain, |id| { StateResolution::reverse_topological_power_sort(power_events, &auth_chain, |id| {
events.get(id).map(Arc::clone) events.get(id).map(Arc::clone)
}) })
.unwrap(); .unwrap();