From 62bff27d50b1103f518116602697949bf7ed2f82 Mon Sep 17 00:00:00 2001 From: Lambda Date: Mon, 20 May 2024 16:13:58 +0000 Subject: [PATCH] Remove unused cache --- src/service.rs | 7 ------- src/service/rooms/timeline.rs | 9 +++------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/service.rs b/src/service.rs index 65548616..b610f6fc 100644 --- a/src/service.rs +++ b/src/service.rs @@ -124,7 +124,6 @@ impl Services { }, timeline: rooms::timeline::Service { db, - lasttimelinecount_cache: Mutex::new(HashMap::new()), }, threads: rooms::threads::Service { db, @@ -173,8 +172,6 @@ impl Services { .len(); let stateinfo_cache = self.rooms.state_compressor.stateinfo_cache.lock().unwrap().len(); - let lasttimelinecount_cache = - self.rooms.timeline.lasttimelinecount_cache.lock().await.len(); let roomid_spacechunk_cache = self.rooms.spaces.roomid_spacechunk_cache.lock().await.len(); @@ -184,7 +181,6 @@ lazy_load_waiting: {lazy_load_waiting} server_visibility_cache: {server_visibility_cache} user_visibility_cache: {user_visibility_cache} stateinfo_cache: {stateinfo_cache} -lasttimelinecount_cache: {lasttimelinecount_cache} roomid_spacechunk_cache: {roomid_spacechunk_cache}" ) } @@ -212,9 +208,6 @@ roomid_spacechunk_cache: {roomid_spacechunk_cache}" if amount > 3 { self.rooms.state_compressor.stateinfo_cache.lock().unwrap().clear(); } - if amount > 4 { - self.rooms.timeline.lasttimelinecount_cache.lock().await.clear(); - } if amount > 5 { self.rooms.spaces.roomid_spacechunk_cache.lock().await.clear(); } diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs index 1cc479fc..9ef5758b 100644 --- a/src/service/rooms/timeline.rs +++ b/src/service/rooms/timeline.rs @@ -2,7 +2,7 @@ mod data; use std::{ cmp::Ordering, - collections::{BTreeMap, HashMap, HashSet}, + collections::{BTreeMap, HashSet}, sync::Arc, }; @@ -23,12 +23,11 @@ use ruma::{ serde::Base64, state_res::{self, Event, RoomVersion}, uint, user_id, CanonicalJsonObject, CanonicalJsonValue, EventId, - OwnedEventId, OwnedRoomId, OwnedServerName, RoomId, RoomVersionId, - ServerName, UserId, + OwnedEventId, OwnedServerName, RoomId, RoomVersionId, ServerName, UserId, }; use serde::Deserialize; use serde_json::value::{to_raw_value, RawValue as RawJsonValue}; -use tokio::sync::{Mutex, MutexGuard, RwLock}; +use tokio::sync::{MutexGuard, RwLock}; use tracing::{error, info, warn}; use super::state_compressor::CompressedStateEvent; @@ -92,8 +91,6 @@ impl Ord for PduCount { pub(crate) struct Service { pub(crate) db: &'static dyn Data, - - pub(crate) lasttimelinecount_cache: Mutex>, } impl Service {