matrix-rust-sdk

public

Star0

Fork 0

Watch0

21 commits 4 branches 0 tags 0 releases16.6 MiB

Commit `fce0cc4a7e8c`

tarball

atagen <boss@atagen.co>2026-10-25 08:58 UTC

2 files changed+22-24

event-cache: reset loaded views when a store failure clears the room

The pagination and shrink error paths sent a raw Update::Clear for the room, which now also deletes thread and pinned chunks, while memory and the loaded views kept writing against chunk ids that no longer existed. They now go through reset_internal so memory and the views clear with the store, and the pagination path publishes the clear because it returns the error instead of diffs.

Modified file: crates/matrix-sdk/src/event_cache/caches/room/pagination.rs+3 additions−14 deletions@@ -28,7 +28,7 @@ use eyeball_im::VectorDiff;
 use futures_core::{Stream, ready};
 use matrix_sdk_base::{
     event_cache::{Event, Gap},
-    linked_chunk::{ChunkContent, LinkedChunkId, Update},
+    linked_chunk::{ChunkContent, LinkedChunkId},
 };
 use pin_project_lite::pin_project;
 use ruma::api::Direction;
@@ -216,11 +216,7 @@ impl PaginatedCache for Arc<RoomEventCacheInner> {
             Err(err) => {
                 error!("error when loading the previous chunk of a linked chunk: {err}");
 
-                // Clear storage for this room.
-                state
-                    .store
-                    .handle_linked_chunk_updates(linked_chunk_id, vec![Update::Clear])
-                    .await?;
+                state.reset_after_store_failure().await?;
 
                 // Return the error.
                 return Err(err.into());
@@ -239,14 +235,7 @@ impl PaginatedCache for Arc<RoomEventCacheInner> {
         if let Err(err) = state.room_linked_chunk_mut().insert_new_chunk_as_first(new_first_chunk) {
             error!("error when inserting the previous chunk into its linked chunk: {err}");
 
-            // Clear storage for this room.
-            state
-                .store
-                .handle_linked_chunk_updates(
-                    LinkedChunkId::Room(&state.state.room_id),
-                    vec![Update::Clear],
-                )
-                .await?;
+            state.reset_after_store_failure().await?;
 
             // Return the error.
             return Err(err.into());

Modified file: crates/matrix-sdk/src/event_cache/caches/room/state.rs+19 additions−10 deletions@@ -30,9 +30,8 @@ use matrix_sdk_base::{
         store::{EventCacheStoreLock, EventCacheStoreLockGuard, EventCacheStoreLockState},
     },
     linked_chunk::{
-        ChunkContent, ChunkIdentifierGenerator, ChunkMetadata, LinkedChunkId, OwnedLinkedChunkId,
-        Position,
-        Update, lazy_loader,
+        ChunkContent, ChunkMetadata, LinkedChunkId, OwnedLinkedChunkId, Position, Update,
+        lazy_loader,
     },
     serde_helpers::{extract_edit_target, extract_thread_root},
     sync::Timeline,
@@ -631,13 +630,7 @@ impl<'a> RoomEventCacheStateLockWriteGuard<'a> {
                     // If loading the last chunk failed, clear the entire linked chunk.
                     error!("error when reloading a linked chunk from memory: {err}");
 
-                    // Clear storage for this room.
-                    self.store
-                        .handle_linked_chunk_updates(linked_chunk_id, vec![Update::Clear])
-                        .await?;
-
-                    // Restart with an empty linked chunk.
-                    (None, ChunkIdentifierGenerator::new_from_scratch())
+                    return self.reset_internal().await;
                 }
             };
 
@@ -874,6 +867,22 @@ impl<'a> RoomEventCacheStateLockWriteGuard<'a> {
         Ok(())
     }
 
+    /// Reset after a store read failed, publishing the clear right away since
+    /// the caller returns the failure rather than its diffs.
+    pub(super) async fn reset_after_store_failure(&mut self) -> Result<(), EventCacheError> {
+        self.reset_internal().await?;
+        let diffs = self.state.room_linked_chunk.updates_as_vector_diffs();
+        self.state.update_sender.send(
+            RoomEventCacheUpdate::UpdateTimelineEvents(TimelineVectorDiffs {
+                diffs,
+                history_gaps: Some(super::history::gap_positions(&self.state.room_linked_chunk)),
+                origin: EventsOrigin::Cache,
+            }),
+            Some(RoomEventCacheGenericUpdate { room_id: self.state.room_id.clone() }),
+        );
+        Ok(())
+    }
+
     async fn reset_internal(&mut self) -> Result<(), EventCacheError> {
         let mut replacement = EventLinkedChunk::new();
         replacement.reset();

matrix-rust-sdk

Commit fce0cc4a7e8c

Commit `fce0cc4a7e8c`