Misc. fixes. (#2145)

Author: Michael Lehenbauer

packages/firestore/src/local/indexeddb_persistence.ts

@@ -70,7 +70,6 @@ import { QueryData } from './query_data';
 import { ReferenceSet } from './reference_set';
 import { ClientId } from './shared_client_state';
 import { SimpleDb, SimpleDbStore, SimpleDbTransaction } from './simple_db';
-import { SnapshotVersion } from '../core/snapshot_version';
 
 const LOG_TAG = 'IndexedDbPersistence';
 

packages/firestore/src/local/memory_persistence.ts

@@ -49,7 +49,6 @@ import { PersistencePromise } from './persistence_promise';
 import { QueryData } from './query_data';
 import { ReferenceSet } from './reference_set';
 import { ClientId } from './shared_client_state';
-import { SnapshotVersion } from '../core/snapshot_version';
 
 const LOG_TAG = 'MemoryPersistence';
 

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

@@ -133,12 +133,12 @@ function eagerRemoteDocumentCacheTests(
     const totalSize = await cache.getSize();
     expect(totalSize).to.equal(0);
 
-    await cache.removeEntry(doc2.key, version(3));
+    await cache.removeEntry(doc2.key);
 
     const currentSize = await cache.getSize();
     expect(currentSize).to.equal(0);
 
-    await cache.removeEntry(doc1.key, version(4));
+    await cache.removeEntry(doc1.key);
 
     const finalSize = await cache.getSize();
     expect(finalSize).to.equal(0);
@@ -171,12 +171,12 @@ function lruRemoteDocumentCacheTests(
     const totalSize = await cache.getSize();
     expect(totalSize).to.be.greaterThan(doc1Size);
 
-    await cache.removeEntry(doc2.key, version(3));
+    await cache.removeEntry(doc2.key);
 
     const currentSize = await cache.getSize();
     expect(currentSize).to.equal(doc1Size);
 
-    await cache.removeEntry(doc1.key, version(4));
+    await cache.removeEntry(doc1.key);
 
     const finalSize = await cache.getSize();
     expect(finalSize).to.equal(0);
@@ -282,7 +282,7 @@ function genericRemoteDocumentCacheTests(
     return cache
       .addEntry(doc(DOC_PATH, VERSION, DOC_DATA))
       .then(() => {
-        return cache.removeEntry(key(DOC_PATH), version(VERSION));
+        return cache.removeEntry(key(DOC_PATH));
       })
       .then(() => {
         return cache.getEntry(key(DOC_PATH));
@@ -294,7 +294,7 @@ function genericRemoteDocumentCacheTests(
 
   it('can remove nonexistent document', () => {
     // no-op, but make sure it doesn't fail.
-    return cache.removeEntry(key(DOC_PATH), version(1));
+    return cache.removeEntry(key(DOC_PATH));
   });
 
   it('can get documents matching query', async () => {
@@ -360,7 +360,7 @@ function genericRemoteDocumentCacheTests(
       ],
       version(3)
     );
-    await cache.removeEntry(key('a/2'), version(4));
+    await cache.removeEntry(key('a/2'));
 
     const changedDocs = await cache.getNewDocumentChanges();
     assertMatches(

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

@@ -76,17 +76,14 @@ export class TestRemoteDocumentCache {
     return this.addEntries([maybeDocument], maybeDocument.version);
   }
 
-  removeEntry(
-    documentKey: DocumentKey,
-    readTime: SnapshotVersion
-  ): Promise<void> {
+  removeEntry(documentKey: DocumentKey): Promise<void> {
     return this.persistence.runTransaction(
       'removeEntry',
       'readwrite-primary',
       txn => {
-        const changeBuffer = this.newChangeBuffer({ trackRemovals: true });
+        const changeBuffer = this.newChangeBuffer();
         return changeBuffer.getEntry(txn, documentKey).next(() => {
-          changeBuffer.removeEntry(documentKey, readTime);
+          changeBuffer.removeEntry(documentKey);
           return changeBuffer.apply(txn);
         });
       }
@@ -131,9 +128,7 @@ export class TestRemoteDocumentCache {
     );
   }
 
-  newChangeBuffer(options?: {
-    trackRemovals: boolean;
-  }): RemoteDocumentChangeBuffer {
-    return this.cache.newChangeBuffer(options);
+  newChangeBuffer(): RemoteDocumentChangeBuffer {
+    return this.cache.newChangeBuffer();
   }
 }