Manual merge

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_persistence.ts

@@ -422,9 +422,7 @@ export class IndexedDbPersistence implements Persistence {
       return false;
     } else if (updateTimeMs > maxAcceptable) {
       log.error(
-        `Detected an update time that is in the future: ${updateTimeMs} > ${
-          maxAcceptable
-        }`
+        `Detected an update time that is in the future: ${updateTimeMs} > ${maxAcceptable}`
       );
       return false;
     }

packages/firestore/src/local/indexeddb_schema.ts

@@ -62,13 +62,15 @@ export function createOrUpgradeDb(
 
   if (fromVersion < 2 && toVersion >= 2) {
     p = ensureTargetGlobalExists(txn).next(targetGlobal =>
-        saveTargetCount(txn, targetGlobal)
+      saveTargetCount(txn, targetGlobal)
     );
   }
 
   if (fromVersion < 3 && toVersion >= 3) {
-    createClientMetadataStore(db);
-    createTargetChangeStore(db);
+    p = p.next(() => {
+      createClientMetadataStore(db);
+      createTargetChangeStore(db);
+    });
   }
   return p;
 }
@@ -517,11 +519,11 @@ function createQueryCache(db: IDBDatabase): void {
  * global singleton.
  */
 function saveTargetCount(
-    txn: SimpleDbTransaction,
-    metadata: DbTargetGlobal
+  txn: SimpleDbTransaction,
+  metadata: DbTargetGlobal
 ): PersistencePromise<void> {
   const globalStore = txn.store<DbTargetGlobalKey, DbTargetGlobal>(
-      DbTargetGlobal.store
+    DbTargetGlobal.store
   );
   const targetStore = txn.store<DbTargetKey, DbTarget>(DbTarget.store);
   return targetStore.count().next(count => {
@@ -537,24 +539,24 @@ function saveTargetCount(
  * @param {IDBTransaction} txn The version upgrade transaction for indexeddb
  */
 function ensureTargetGlobalExists(
-    txn: SimpleDbTransaction
+  txn: SimpleDbTransaction
 ): PersistencePromise<DbTargetGlobal> {
   const globalStore = txn.store<DbTargetGlobalKey, DbTargetGlobal>(
-      DbTargetGlobal.store
+    DbTargetGlobal.store
   );
   return globalStore.get(DbTargetGlobal.key).next(metadata => {
-        if (metadata != null) {
-          return PersistencePromise.resolve(metadata);
-        } else {
-          metadata = new DbTargetGlobal(
-              /*highestTargetId=*/ 0,
-              /*lastListenSequenceNumber=*/ 0,
-              SnapshotVersion.MIN.toTimestamp(),
-              /*targetCount=*/ 0
-          );
-          return globalStore.put(DbTargetGlobal.key, metadata).next(() => metadata);
-        }
-      });
+    if (metadata != null) {
+      return PersistencePromise.resolve(metadata);
+    } else {
+      metadata = new DbTargetGlobal(
+        /*highestTargetId=*/ 0,
+        /*lastListenSequenceNumber=*/ 0,
+        SnapshotVersion.MIN.toTimestamp(),
+        /*targetCount=*/ 0
+      );
+      return globalStore.put(DbTargetGlobal.key, metadata).next(() => metadata);
+    }
+  });
 }
 
 /**
@@ -642,11 +644,19 @@ export const V1_STORES = [
   DbTargetDocument.store
 ];
 
-const V3_STORES = [DbClientMetadata.store, DbTargetChange.store];
+// Visible for testing
+export const V2_STORES = V1_STORES;
+
+// Visible for testing
+export const V3_STORES = [
+  ...V2_STORES,
+  DbClientMetadata.store,
+  DbTargetChange.store
+];
 
 /**
  * The list of all default IndexedDB stores used throughout the SDK. This is
  * used when creating transactions so that access across all stores is done
  * atomically.
  */
-export const ALL_STORES = [...V1_STORES, ...V3_STORES];
+export const ALL_STORES = V3_STORES;

packages/firestore/src/local/memory_persistence.ts

@@ -52,14 +52,10 @@ export class MemoryPersistence implements Persistence {
 
   private started = false;
 
-<<<<<<< HEAD
   constructor(private readonly queue: AsyncQueue) {}
 
-  start(): Promise<void> {
-=======
   async start(): Promise<void> {
     // No durable state to read on startup.
->>>>>>> master
     assert(!this.started, 'MemoryPersistence double-started!');
     this.started = true;
   }

packages/firestore/src/util/async_queue.ts

@@ -56,7 +56,7 @@ export enum TimerId {
    * A timer used to update the client metadata in IndexedDb, which is used
    * to determine the primary leaseholder.
    */
-  ClientMetadataRefresh = 'client_metadata_refresh',
+  ClientMetadataRefresh = 'client_metadata_refresh'
 }
 
 /**

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

@@ -17,11 +17,13 @@
 import { expect } from 'chai';
 import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
 import {
-  ALL_STORES,
   createOrUpgradeDb,
   DbTarget,
   DbTargetGlobal,
-  DbTargetGlobalKey
+  DbTargetGlobalKey,
+  V1_STORES,
+  V2_STORES,
+  V3_STORES
 } from '../../../src/local/indexeddb_schema';
 import { SimpleDb, SimpleDbTransaction } from '../../../src/local/simple_db';
 import { PersistencePromise } from '../../../src/local/persistence_promise';
@@ -88,11 +90,10 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
   beforeEach(() => SimpleDb.delete(INDEXEDDB_TEST_DATABASE));
 
   it('can install schema version 1', () => {
-    return withDb(1, db => {
+    return withDb(1, async db => {
       expect(db.version).to.equal(1);
       // Version 1 adds all of the stores so far.
-      expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
-      return Promise.resolve();
+      expect(getAllObjectStores(db)).to.have.members(V1_STORES);
     });
   });
 
@@ -101,14 +102,21 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
       expect(db.version).to.equal(2);
       // We should have all of the stores, we should have the target global row
       // and we should not have any targets counted, because there are none.
-      expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
+      expect(getAllObjectStores(db)).to.have.members(V2_STORES);
       // Check the target count. We haven't added any targets, so we expect 0.
       return getTargetCount(db).then(targetCount => {
         expect(targetCount).to.equal(0);
       });
     });
   });
 
+  it('can install schema version 3', () => {
+    return withDb(3, async db => {
+      expect(db.version).to.be.equal(3);
+      expect(getAllObjectStores(db)).to.have.members(V3_STORES);
+    });
+  });
+
   it('can upgrade from schema version 1 to 2', () => {
     const expectedTargetCount = 5;
     return withDb(1, db => {
@@ -126,11 +134,20 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
     }).then(() =>
       withDb(2, db => {
         expect(db.version).to.equal(2);
-        expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
+        expect(getAllObjectStores(db)).to.have.members(V2_STORES);
         return getTargetCount(db).then(targetCount => {
           expect(targetCount).to.equal(expectedTargetCount);
         });
       })
     );
   });
+
+  it('can upgrade from schema version 2 to 3', () => {
+    return withDb(2, async () => {}).then(() =>
+      withDb(3, async db => {
+        expect(db.version).to.be.equal(3);
+        expect(getAllObjectStores(db)).to.have.members(V3_STORES);
+      })
+    );
+  });
 });

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

@@ -43,7 +43,7 @@ export class TestQueryCache {
   }
 
   updateQueryData(queryData: QueryData): Promise<void> {
-    return this.persistence.runTransaction('updateQueryData', txn => {
+    return this.persistence.runTransaction('updateQueryData', true, txn => {
       return this.cache.updateQueryData(txn, queryData);
     });
   }

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

@@ -20,7 +20,7 @@ import { doc, path } from '../../util/helpers';
 
 import { describeSpec, specTest } from './describe_spec';
 import { client, spec } from './spec_builder';
-import {TimerId} from '../../../src/util/async_queue';
+import { TimerId } from '../../../src/util/async_queue';
 
 describeSpec('Persistence:', [], () => {
   specTest('Local mutations are persisted and re-sent', [], () => {
@@ -223,7 +223,7 @@ describeSpec('Persistence:', [], () => {
         .runTimer(TimerId.ClientMetadataRefresh)
         .expectPrimaryState(false)
         .client(2)
-          .runTimer(TimerId.ClientMetadataRefresh)
+        .runTimer(TimerId.ClientMetadataRefresh)
         .expectPrimaryState(true)
     );
   });

packages/firestore/test/unit/specs/persistence_spec.test.ts

@@ -209,7 +209,7 @@ export class SpecBuilder {
   becomeVisible(): SpecBuilder {
     this.nextStep();
     this.currentStep = {
-      applyClientState: {visibility: 'visible'}
+      applyClientState: { visibility: 'visible' }
     };
     return this;
   }