Skip to content

Commit

Permalink
refactor: EventCacheStore::handle_linked_chunk_updates takes a `Vec…
Browse files Browse the repository at this point in the history 
…<Update>`.

This patch updates `EventCacheStore::handle_linked_chunk_updates` to
take a `Vec<Update<Item, Gap>>` instead of `&[Update<Item, Gap>]`.
In fact, `linked_chunk::ObservableUpdates::take()` already returns a
`Vec<Update<Item, Gap>>`; we can simply forward this `Vec` up to here
without any further clones.
  • Loading branch information
@Hywan
Hywan committed Nov 25, 2024
1 parent d2bb09e commit fa07bd9
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 37 deletions.
4 changes: 2 additions & 2 deletions crates/matrix-sdk-base/src/event_cache/store/memory_store.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ impl EventCacheStore for MemoryStore {
async fn handle_linked_chunk_updates(
&self,
room_id: &RoomId,
updates: &[Update<Event, Gap>],
updates: Vec<Update<Event, Gap>>,
) -> Result<(), Self::Error> {
let mut inner = self.inner.write().unwrap();

Ok(inner.events.apply_updates(updates))
Ok(inner.events.apply_updates(room_id, updates))
}

async fn add_media_content(
Expand Down
4 changes: 2 additions & 2 deletions crates/matrix-sdk-base/src/event_cache/store/traits.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub trait EventCacheStore: AsyncTraitDeps {
async fn handle_linked_chunk_updates(
&self,
room_id: &RoomId,
updates: &[Update<Event, Gap>],
updates: Vec<Update<Event, Gap>>,
) -> Result<(), Self::Error>;

/// Add a media file's content in the media store.
Expand Down Expand Up @@ -146,7 +146,7 @@ impl<T: EventCacheStore> EventCacheStore for EraseEventCacheStoreError<T> {
async fn handle_linked_chunk_updates(
&self,
room_id: &RoomId,
updates: &[Update<Event, Gap>],
updates: Vec<Update<Event, Gap>>,
) -> Result<(), Self::Error> {
self.0.handle_linked_chunk_updates(room_id, updates).await.map_err(Into::into)
}
Expand Down
58 changes: 26 additions & 32 deletions crates/matrix-sdk-common/src/linked_chunk/relational.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,7 @@ impl<Item, Gap> RelationalLinkedChunk<Item, Gap> {

/// Apply [`Update`]s. That's the only way to write data inside this
/// relational linked chunk.
pub fn apply_updates(&mut self, room_id: &RoomId, updates: &[Update<Item, Gap>])
where
Item: Clone,
Gap: Clone,
{
pub fn apply_updates(&mut self, room_id: &RoomId, updates: Vec<Update<Item, Gap>>) {
for update in updates {
match update {
Update::NewItemsChunk { previous, new, next } => {
Expand All @@ -96,8 +92,8 @@ impl<Item, Gap> RelationalLinkedChunk<Item, Gap> {
insert_chunk(&mut self.chunks, room_id, previous, new, next);
self.items.push(ItemRow {
room_id: room_id.to_owned(),
position: Position::new(*new, 0),
item: Either::Gap(gap.clone()),
position: Position::new(new, 0),
item: Either::Gap(gap),
});
}

Expand All @@ -111,7 +107,7 @@ impl<Item, Gap> RelationalLinkedChunk<Item, Gap> {
.filter_map(
|(nth, ItemRow { room_id: room_id_candidate, position, .. })| {
(room_id == room_id_candidate
&& position.chunk_identifier() == *chunk_identifier)
&& position.chunk_identifier() == chunk_identifier)
.then_some(nth)
},
)
Expand All @@ -122,14 +118,12 @@ impl<Item, Gap> RelationalLinkedChunk<Item, Gap> {
}
}

Update::PushItems { at, items } => {
let mut at = *at;

Update::PushItems { mut at, items } => {
for item in items {
self.items.push(ItemRow {
room_id: room_id.to_owned(),
position: at,
item: Either::Item(item.clone()),
item: Either::Item(item),
});
at.increment_index();
}
Expand All @@ -147,7 +141,7 @@ impl<Item, Gap> RelationalLinkedChunk<Item, Gap> {
}

// Find the item to remove.
if position == at {
if *position == at {
debug_assert!(entry_to_remove.is_none(), "Found the same entry twice");

entry_to_remove = Some(nth);
Expand Down Expand Up @@ -191,55 +185,55 @@ impl<Item, Gap> RelationalLinkedChunk<Item, Gap> {
fn insert_chunk(
chunks: &mut Vec<ChunkRow>,
room_id: &RoomId,
previous: &Option<ChunkIdentifier>,
new: &ChunkIdentifier,
next: &Option<ChunkIdentifier>,
previous: Option<ChunkIdentifier>,
new: ChunkIdentifier,
next: Option<ChunkIdentifier>,
) {
// Find the previous chunk, and update its next chunk.
if let Some(previous) = previous {
let entry_for_previous_chunk = chunks
.iter_mut()
.find(|ChunkRow { room_id: room_id_candidate, chunk, .. }| {
room_id == room_id_candidate && chunk == previous
room_id == room_id_candidate && *chunk == previous
})
.expect("Previous chunk should be present");

// Insert the chunk.
entry_for_previous_chunk.next_chunk = Some(*new);
entry_for_previous_chunk.next_chunk = Some(new);
}

// Find the next chunk, and update its previous chunk.
if let Some(next) = next {
let entry_for_next_chunk = chunks
.iter_mut()
.find(|ChunkRow { room_id: room_id_candidate, chunk, .. }| {
room_id == room_id_candidate && chunk == next
room_id == room_id_candidate && *chunk == next
})
.expect("Next chunk should be present");

// Insert the chunk.
entry_for_next_chunk.previous_chunk = Some(*new);
entry_for_next_chunk.previous_chunk = Some(new);
}

// Insert the chunk.
chunks.push(ChunkRow {
room_id: room_id.to_owned(),
previous_chunk: *previous,
chunk: *new,
next_chunk: *next,
previous_chunk: previous,
chunk: new,
next_chunk: next,
});
}

fn remove_chunk(
chunks: &mut Vec<ChunkRow>,
room_id: &RoomId,
chunk_to_remove: &ChunkIdentifier,
chunk_to_remove: ChunkIdentifier,
) {
let entry_nth_to_remove = chunks
.iter()
.enumerate()
.find_map(|(nth, ChunkRow { room_id: room_id_candidate, chunk, .. })| {
(room_id == room_id_candidate && chunk == chunk_to_remove).then_some(nth)
(room_id == room_id_candidate && *chunk == chunk_to_remove).then_some(nth)
})
.expect("Remove an unknown chunk");

Expand Down Expand Up @@ -294,7 +288,7 @@ mod tests {

relational_linked_chunk.apply_updates(
room_id,
&[
vec![
// 0
Update::NewItemsChunk { previous: None, new: CId::new(0), next: None },
// 1 after 0
Expand Down Expand Up @@ -351,7 +345,7 @@ mod tests {

relational_linked_chunk.apply_updates(
room_id,
&[
vec![
// 0
Update::NewItemsChunk { previous: None, new: CId::new(0), next: None },
// 1 after 0
Expand Down Expand Up @@ -408,7 +402,7 @@ mod tests {

relational_linked_chunk.apply_updates(
room_id,
&[
vec![
// 0
Update::NewItemsChunk { previous: None, new: CId::new(0), next: None },
// 1 after 0
Expand Down Expand Up @@ -454,7 +448,7 @@ mod tests {

relational_linked_chunk.apply_updates(
room_id,
&[
vec![
// new chunk (this is not mandatory for this test, but let's try to be realistic)
Update::NewItemsChunk { previous: None, new: CId::new(0), next: None },
// new items on 0
Expand Down Expand Up @@ -541,7 +535,7 @@ mod tests {

relational_linked_chunk.apply_updates(
room_id,
&[
vec![
// new chunk (this is not mandatory for this test, but let's try to be realistic)
Update::NewItemsChunk { previous: None, new: CId::new(0), next: None },
// new items on 0
Expand Down Expand Up @@ -596,7 +590,7 @@ mod tests {

relational_linked_chunk.apply_updates(
room_id,
&[
vec![
// new chunk
Update::NewItemsChunk { previous: None, new: CId::new(0), next: None },
// new chunk
Expand Down Expand Up @@ -670,7 +664,7 @@ mod tests {
let mut relational_linked_chunk = RelationalLinkedChunk::<char, ()>::new();

relational_linked_chunk
.apply_updates(room_id, &[Update::StartReattachItems, Update::EndReattachItems]);
.apply_updates(room_id, vec![Update::StartReattachItems, Update::EndReattachItems]);

// Nothing happened.
assert!(relational_linked_chunk.chunks.is_empty());
Expand Down
2 changes: 1 addition & 1 deletion crates/matrix-sdk-sqlite/src/event_cache_store.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl EventCacheStore for SqliteEventCacheStore {
async fn handle_linked_chunk_updates(
&self,
_room_id: &RoomId,
_updates: &[Update<Event, Gap>],
_updates: Vec<Update<Event, Gap>>,
) -> Result<(), Self::Error> {
todo!()
}
Expand Down

0 comments on commit fa07bd9

Please sign in to comment.