git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-10 19:42:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(hydra): Working? State res v2.1

Browse source
This commit is contained in:
nexy7574 2025-09-02 00:13:46 +01:00
commit 67193f7a5b
No known key found for this signature in database
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/matrix/state_res/mod.rs
View file

@ -183,6 +183,9 @@ where
// sort the remaining events using the mainline of the resolved power level. // sort the remaining events using the mainline of the resolved power level.
let deduped_power_ev: HashSet<_> = sorted_control_levels.into_iter().collect(); let deduped_power_ev: HashSet<_> = sorted_control_levels.into_iter().collect();
debug!(count = deduped_power_ev.len(), "deduped power events");
trace!(set = ?deduped_power_ev, "deduped power events");
// This removes the control events that passed auth and more importantly those // This removes the control events that passed auth and more importantly those
// that failed auth // that failed auth
let events_to_resolve: Vec<_> = all_conflicted let events_to_resolve: Vec<_> = all_conflicted
@ -209,7 +212,7 @@ where
&room_version, &room_version,
stateres_version, stateres_version,
sorted_left_events.iter().stream().map(AsRef::as_ref), sorted_left_events.iter().stream().map(AsRef::as_ref),
resolved_control, // The control events are added to the final resolved state resolved_control.clone(), // The control events are added to the final resolved state
&event_fetch, &event_fetch,
) )
.await?; .await?;
@ -217,6 +220,8 @@ where
// Add unconflicted state to the resolved state // Add unconflicted state to the resolved state
// We priorities the unconflicting state // We priorities the unconflicting state
resolved_state.extend(clean); resolved_state.extend(clean);
resolved_state.extend(resolved_control); // TODO(hydra): this feels disgusting and wrong but it allows
// the state to resolve properly?
debug!("state resolution finished"); debug!("state resolution finished");
trace!( map = ?resolved_state, "final resolved state" ); trace!( map = ?resolved_state, "final resolved state" );
@ -289,11 +294,11 @@ where
let mut path: Vec<OwnedEventId> = Vec::new(); let mut path: Vec<OwnedEventId> = Vec::new();
let mut seen: HashSet<OwnedEventId> = HashSet::new(); let mut seen: HashSet<OwnedEventId> = HashSet::new();
let next_event = |stack: &mut Vec<Vec<_>>, path: &mut Vec<_>| { let next_event = |stack: &mut Vec<Vec<_>>, path: &mut Vec<_>| {
while stack.last().is_some_and(std::vec::Vec::is_empty) { while stack.last().is_some_and(Vec::is_empty) {
stack.pop(); stack.pop();
path.pop(); path.pop();
} }
stack.last_mut().and_then(std::vec::Vec::pop) stack.last_mut().and_then(Vec::pop)
}; };
while let Some(event_id) = next_event(&mut stack, &mut path) { while let Some(event_id) = next_event(&mut stack, &mut path) {
path.push(event_id.clone()); path.push(event_id.clone());

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

@ -452,7 +452,7 @@ async fn get_statediff(&self, shortstatehash: ShortStateHash) -> Result<StateDif
.ok() .ok()
.take_if(|parent| *parent != 0); .take_if(|parent| *parent != 0);
debug_assert!(value.len() % STRIDE == 0, "value not aligned to stride"); debug_assert!(value.len().is_multiple_of(STRIDE), "value not aligned to stride");
let _num_values = value.len() / STRIDE; let _num_values = value.len() / STRIDE;
let mut add_mode = true; let mut add_mode = true;