Merge branch 'perf/lhn-sort-cache' into perf/lhn-options-cache

Author: Bar-Maz

src/libs/ReportActionsUtils.ts

@@ -149,7 +149,8 @@ type SortedReportActionsCacheEntry = {
     lastAccessed: number;
 };
 
-const SORTED_REPORT_ACTIONS_CACHE_MAX_SIZE = 1000;
+const DEFAULT_SORTED_REPORT_ACTIONS_CACHE_MAX_SIZE = 1000;
+let sortedReportActionsCacheMaxSize = DEFAULT_SORTED_REPORT_ACTIONS_CACHE_MAX_SIZE;
 
 const sortedReportActionsCacheAscending = new Map<string, SortedReportActionsCacheEntry>();
 const sortedReportActionsCacheDescending = new Map<string, SortedReportActionsCacheEntry>();
@@ -643,14 +644,14 @@ function getCacheKeyForReportActions(reportActions: ReportAction[]): string {
  * Ensures cache doesn't exceed max size by removing least recently used entries (LRU).
  */
 function evictOldestCacheEntries(cache: Map<string, SortedReportActionsCacheEntry>): void {
-    if (cache.size <= SORTED_REPORT_ACTIONS_CACHE_MAX_SIZE) {
+    if (cache.size <= sortedReportActionsCacheMaxSize) {
         return;
     }
 
     const entries = Array.from(cache.entries());
     entries.sort((a, b) => a[1].lastAccessed - b[1].lastAccessed);
 
-    const entriesToRemove = cache.size - SORTED_REPORT_ACTIONS_CACHE_MAX_SIZE;
+    const entriesToRemove = cache.size - sortedReportActionsCacheMaxSize;
     for (let i = 0; i < entriesToRemove; i++) {
         const entry = entries.at(i);
         if (entry !== undefined) {
@@ -659,6 +660,23 @@ function evictOldestCacheEntries(cache: Map<string, SortedReportActionsCacheEntr
     }
 }
 
+/**
+ * Adjust the maximum size for the sorted report actions cache.
+ * Used by callers that know the current number of reports (e.g. LHN),
+ * while still enforcing a global hard cap for safety.
+ */
+function setSortedReportActionsCacheMaxSize(newSize: number): void {
+    if (!Number.isFinite(newSize) || newSize <= 0) {
+        sortedReportActionsCacheMaxSize = DEFAULT_SORTED_REPORT_ACTIONS_CACHE_MAX_SIZE;
+    } else {
+        sortedReportActionsCacheMaxSize = newSize;
+    }
+
+    // Immediately evict if current caches are above the new limit.
+    evictOldestCacheEntries(sortedReportActionsCacheAscending);
+    evictOldestCacheEntries(sortedReportActionsCacheDescending);
+}
+
 /**
  * Sort an array of reportActions by their created timestamp first, and reportActionID second
  * This gives us a stable order even in the case of multiple reportActions created on the same millisecond
@@ -4030,6 +4048,7 @@ function hasReasoning(action: OnyxInputOrEntry<ReportAction>): boolean {
 }
 
 export {
+    setSortedReportActionsCacheMaxSize,
     clearSortedReportActionsCache,
     doesReportHaveVisibleActions,
     extractLinksFromMessageHtml,

src/libs/SidebarUtils.ts

@@ -109,6 +109,7 @@ import {
     isTagModificationAction,
     isTaskAction,
     isTransactionThread,
+    setSortedReportActionsCacheMaxSize,
 } from './ReportActionsUtils';
 import type {OptionData} from './ReportUtils';
 import {
@@ -273,6 +274,10 @@ function getReportsToDisplayInLHN(
 ) {
     const isInFocusMode = priorityMode === CONST.PRIORITY_MODE.GSD;
     const allReportsDictValues = reports ?? {};
+    // Adjust the size of the sorted report actions cache to roughly match
+    // the current number of reports, while still respecting the global cap
+    // inside ReportActionsUtils to guard against excessive memory usage.
+    setSortedReportActionsCacheMaxSize(Object.keys(allReportsDictValues).length);
     const reportsToDisplay: ReportsToDisplayInLHN = {};
 
     for (const [reportID, report] of Object.entries(allReportsDictValues)) {

tests/unit/MiddlewareTest.ts

@@ -404,6 +404,7 @@ describe('Middleware', () => {
                 }),
             }));
 
+            (global.fetch as jest.Mock).mockClear();
             SequentialQueue.unpause();
             await waitForBatchedUpdates();