Cleanup

Author: schmidt-sebastian

packages/firestore/exp/src/api/database.ts

@@ -41,7 +41,7 @@ import {
 } from '../../../lite/src/api/database';
 import { Code, FirestoreError } from '../../../src/util/error';
 import { Deferred } from '../../../src/util/promise';
-import { LruParams } from '../../../src/local/lru_garbage_collector';
+import { LRU_MINIMUM_CACHE_SIZE_BYTES } from '../../../src/local/lru_garbage_collector';
 import {
   CACHE_SIZE_UNLIMITED,
   configureFirestore,
@@ -117,11 +117,11 @@ export function initializeFirestore(
   if (
     settings.cacheSizeBytes !== undefined &&
     settings.cacheSizeBytes !== CACHE_SIZE_UNLIMITED &&
-    settings.cacheSizeBytes < LruParams.MINIMUM_CACHE_SIZE_BYTES
+    settings.cacheSizeBytes < LRU_MINIMUM_CACHE_SIZE_BYTES
   ) {
     throw new FirestoreError(
       Code.INVALID_ARGUMENT,
-      `cacheSizeBytes must be at least ${LruParams.MINIMUM_CACHE_SIZE_BYTES}`
+      `cacheSizeBytes must be at least ${LRU_MINIMUM_CACHE_SIZE_BYTES}`
     );
   }
 

packages/firestore/src/local/lru_garbage_collector.ts

@@ -176,9 +176,6 @@ export const LRU_MINIMUM_CACHE_SIZE_BYTES = 1 * 1024 * 1024;
 export const LRU_DEFAULT_CACHE_SIZE_BYTES = 40 * 1024 * 1024;
 
 export class LruParams {
-  static readonly COLLECTION_DISABLED = LRU_COLLECTION_DISABLED;
-  static readonly MINIMUM_CACHE_SIZE_BYTES = LRU_MINIMUM_CACHE_SIZE_BYTES;
-  static readonly DEFAULT_CACHE_SIZE_BYTES = LRU_DEFAULT_CACHE_SIZE_BYTES;
   private static readonly DEFAULT_COLLECTION_PERCENTILE = 10;
   private static readonly DEFAULT_MAX_SEQUENCE_NUMBERS_TO_COLLECT = 1000;
 
@@ -191,13 +188,13 @@ export class LruParams {
   }
 
   static readonly DEFAULT: LruParams = new LruParams(
-    LruParams.DEFAULT_CACHE_SIZE_BYTES,
+    LRU_DEFAULT_CACHE_SIZE_BYTES,
     LruParams.DEFAULT_COLLECTION_PERCENTILE,
     LruParams.DEFAULT_MAX_SEQUENCE_NUMBERS_TO_COLLECT
   );
 
   static readonly DISABLED: LruParams = new LruParams(
-    LruParams.COLLECTION_DISABLED,
+    LRU_COLLECTION_DISABLED,
     0,
     0
   );
@@ -241,7 +238,7 @@ export class LruScheduler implements GarbageCollectionScheduler {
     );
     if (
       this.garbageCollector.params.cacheSizeCollectionThreshold !==
-      LruParams.COLLECTION_DISABLED
+      LRU_COLLECTION_DISABLED
     ) {
       this.scheduleGC(localStore);
     }
@@ -358,9 +355,7 @@ export class LruGarbageCollector {
     txn: PersistenceTransaction,
     activeTargetIds: ActiveTargets
   ): PersistencePromise<LruResults> {
-    if (
-      this.params.cacheSizeCollectionThreshold === LruParams.COLLECTION_DISABLED
-    ) {
+    if (this.params.cacheSizeCollectionThreshold === LRU_COLLECTION_DISABLED) {
       logDebug('LruGarbageCollector', 'Garbage collection skipped; disabled');
       return PersistencePromise.resolve(GC_DID_NOT_RUN);
     }