More fixes

Author: wu-hui

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

@@ -24,10 +24,7 @@ import { PersistencePromise } from '../../../src/local/persistence_promise';
 import { PersistenceTransaction } from '../../../src/local/persistence_transaction';
 import { QueryEngine } from '../../../src/local/query_engine';
 import { RemoteDocumentCache } from '../../../src/local/remote_document_cache';
-import {
-  DocumentKeySet,
-  DocumentMap
-} from '../../../src/model/collections';
+import { DocumentKeySet, DocumentMap } from '../../../src/model/collections';
 import { MutationType } from '../../../src/model/mutation';
 
 /**
@@ -157,8 +154,8 @@ export class CountingQueryEngine extends QueryEngine {
     return {
       getOverlay: (transaction, key) => {
         return subject.getOverlay(transaction, key).next(result => {
+          this.overlaysReadByKey += 1;
           if (!!result) {
-            this.overlaysReadByKey += 1;
             this.overlayTypes[key.toString()] = result.mutation.type;
           }
           return result;
@@ -167,7 +164,7 @@ export class CountingQueryEngine extends QueryEngine {
 
       getOverlays: (transaction, keys) => {
         return subject.getOverlays(transaction, keys).next(result => {
-          this.overlaysReadByKey += result.size();
+          this.overlaysReadByKey += keys.length;
           result.forEach((key, overlay) => {
             this.overlayTypes[key.toString()] = overlay.mutation.type;
           });

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

@@ -46,7 +46,7 @@ import {
   IndexKind,
   IndexOffset
 } from '../../../src/model/field_index';
-import { Mutation } from '../../../src/model/mutation';
+import { Mutation, MutationType } from '../../../src/model/mutation';
 import { MutationBatch } from '../../../src/model/mutation_batch';
 import { RemoteEvent } from '../../../src/remote/remote_event';
 import {
@@ -156,7 +156,11 @@ class AsyncLocalStoreTester {
     );
   }
 
-  assertOverlaysRead(byKey: number, byCollection: number): void {
+  assertOverlaysRead(
+    byKey: number,
+    byCollection: number,
+    overlayTypes: { [k: string]: MutationType }
+  ): void {
     expect(this.queryEngine.overlaysReadByCollection).to.equal(
       byCollection,
       'Overlays read (by collection)'
@@ -165,6 +169,10 @@ class AsyncLocalStoreTester {
       byKey,
       'Overlays read (by key)'
     );
+    expect(this.queryEngine.overlayTypes).to.deep.equal(
+      overlayTypes,
+      'Overlay types read'
+    );
   }
 
   assertQueryReturned(...keys: string[]): void {
@@ -354,7 +362,10 @@ describe('LocalStore w/ IndexedDB Persistence (Non generic)', () => {
 
     const queryMatches = query('coll', filter('matches', '==', true));
     await test.executeQuery(queryMatches);
-    test.assertOverlaysRead(1, 1);
+    test.assertOverlaysRead(1, 1, {
+      [key('coll/a').toString()]: MutationType.Set,
+      [key('coll/b').toString()]: MutationType.Set
+    });
     test.assertQueryReturned('coll/a', 'coll/b');
   });
 
@@ -390,7 +401,9 @@ describe('LocalStore w/ IndexedDB Persistence (Non generic)', () => {
     // The query engine first reads the documents by key and then re-runs the query without limit.
     await test.executeQuery(queryCount);
     test.assertRemoteDocumentsRead(5, 0);
-    test.assertOverlaysRead(5, 1);
+    test.assertOverlaysRead(5, 1, {
+      [key('coll/b').toString()]: MutationType.Delete
+    });
     test.assertQueryReturned('coll/a', 'coll/c');
   });
 
@@ -423,7 +436,7 @@ describe('LocalStore w/ IndexedDB Persistence (Non generic)', () => {
 
     await test.executeQuery(queryCount);
     test.assertRemoteDocumentsRead(2, 0);
-    test.assertOverlaysRead(2, 0);
+    test.assertOverlaysRead(2, 0, {});
     test.assertQueryReturned('coll/a', 'coll/c');
   });
 
@@ -441,7 +454,9 @@ describe('LocalStore w/ IndexedDB Persistence (Non generic)', () => {
 
     const queryTime = query('coll', orderBy('time', 'asc'));
     await test.executeQuery(queryTime);
-    test.assertOverlaysRead(1, 0);
+    test.assertOverlaysRead(1, 0, {
+      [key('coll/a').toString()]: MutationType.Set
+    });
     test.assertQueryReturned('coll/a');
   });
 });