Skip to content

Commit ee4a384

Browse files
committed
Make memory lru gc the default
1 parent 8e9aac2 commit ee4a384

File tree

4 files changed

+4023
-4418
lines changed

4 files changed

+4023
-4418
lines changed

packages/firestore/src/api/cache_config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ class MemoryLocalCacheImpl implements MemoryLocalCache {
6262
this._offlineComponentProvider =
6363
settings.garbageCollector._offlineComponentProvider;
6464
} else {
65-
this._offlineComponentProvider = new MemoryOfflineComponentProvider();
65+
this._offlineComponentProvider = new LruGcMemoryOfflineComponentProvider(
66+
undefined
67+
);
6668
}
6769
}
6870

packages/firestore/src/core/firestore_client.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import { Aggregate } from './aggregate';
6262
import { NamedQuery } from './bundle';
6363
import {
6464
ComponentConfiguration,
65+
LruGcMemoryOfflineComponentProvider,
6566
MemoryOfflineComponentProvider,
6667
OfflineComponentProvider,
6768
OnlineComponentProvider
@@ -336,7 +337,7 @@ async function ensureOfflineComponents(
336337
logDebug(LOG_TAG, 'Using default OfflineComponentProvider');
337338
await setOfflineComponentProvider(
338339
client,
339-
new MemoryOfflineComponentProvider()
340+
new LruGcMemoryOfflineComponentProvider(undefined)
340341
);
341342
}
342343
}

packages/firestore/test/integration/util/helpers.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
DocumentData,
2626
DocumentReference,
2727
Firestore,
28+
memoryEagerGarbageCollector,
2829
memoryLocalCache,
2930
memoryLruGarbageCollector,
3031
newTestApp,
@@ -148,10 +149,14 @@ export function withTestDb(
148149
export function withEnsuredEagerGcTestDb(
149150
fn: (db: Firestore) => Promise<void>
150151
): Promise<void> {
152+
const newSettings = { ...DEFAULT_SETTINGS };
153+
newSettings.localCache = memoryLocalCache({
154+
garbageCollector: memoryEagerGarbageCollector()
155+
});
151156
return withTestDbsSettings(
152157
false,
153158
DEFAULT_PROJECT_ID,
154-
{ ...DEFAULT_SETTINGS, cacheSizeBytes: 1 * 1024 * 1024 },
159+
newSettings,
155160
1,
156161
async ([db]) => {
157162
return fn(db);

0 commit comments

Comments
 (0)