use documentKeySet.

Author: ehsannas

packages/firestore/src/local/memory_document_overlay_cache.ts

@@ -16,6 +16,7 @@
  */
 
 import {
+  documentKeySet,
   DocumentKeySet,
   DocumentKeyToMutationMap,
   DocumentKeyToOverlayMap,
@@ -26,7 +27,6 @@ import { Mutation } from '../model/mutation';
 import { Overlay } from '../model/overlay';
 import { ResourcePath } from '../model/path';
 import { SortedMap } from '../util/sorted_map';
-import { SortedSet } from '../util/sorted_set';
 
 import { DocumentOverlayCache } from './document_overlay_cache';
 import { PersistencePromise } from './persistence_promise';
@@ -173,7 +173,7 @@ export class MemoryDocumentOverlayCache implements DocumentOverlayCache {
     // Create the association of this overlay to the given largestBatchId.
     let batch = this.overlayByBatchId.get(largestBatchId);
     if (batch === undefined) {
-      batch = new SortedSet(DocumentKey.comparator);
+      batch = documentKeySet();
       this.overlayByBatchId.set(largestBatchId, batch);
     }
     this.overlayByBatchId.set(largestBatchId, batch.add(mutation.key));

packages/firestore/test/unit/local/document_overlay_cache.test.ts

@@ -21,14 +21,11 @@ import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
 import { Persistence } from '../../../src/local/persistence';
 import {
   documentKeySet,
-  DocumentKeySet,
   DocumentKeyToMutationMap,
   DocumentKeyToOverlayMap,
   newDocumentKeyToMutationMap
 } from '../../../src/model/collections';
-import { DocumentKey } from '../../../src/model/document_key';
 import { Mutation, mutationEquals } from '../../../src/model/mutation';
-import { SortedSet } from '../../../src/util/sorted_set';
 import { addEqualityMatcher } from '../../util/equality_matcher';
 import {
   deleteMutation,
@@ -124,10 +121,10 @@ function genericDocumentOverlayCacheTests(): void {
     overlays: DocumentKeyToOverlayMap,
     ...keys: string[]
   ): void {
-    const overlayKeys: DocumentKeySet = new SortedSet(DocumentKey.comparator);
-    overlays.forEach(overlayKey => overlayKeys.add(overlayKey));
-    const expectedKeys: DocumentKeySet = new SortedSet(DocumentKey.comparator);
-    keys.forEach(value => expectedKeys.add(key(value)));
+    let overlayKeys = documentKeySet();
+    overlays.forEach(overlayKey => (overlayKeys = overlayKeys.add(overlayKey)));
+    let expectedKeys = documentKeySet();
+    keys.forEach(value => (expectedKeys = expectedKeys.add(key(value))));
     expect(overlayKeys.isEqual(expectedKeys)).to.deep.equal(true);
   }