Port "Stop persisting last acknowledged batch ID" from iOS

A straightforward port of firebase/firebase-ios-sdk#2243.

Author: var-const

packages/firestore/src/local/indexeddb_mutation_queue.ts

@@ -117,13 +117,6 @@ export class IndexedDbMutationQueue implements MutationQueue {
     streamToken: ProtoByteString
   ): PersistencePromise<void> {
     return this.getMutationQueueMetadata(transaction).next(metadata => {
-      const batchId = batch.batchId;
-      assert(
-        batchId > metadata.lastAcknowledgedBatchId,
-        'Mutation batchIDs must be acknowledged in order'
-      );
-
-      metadata.lastAcknowledgedBatchId = batchId;
       metadata.lastStreamToken = convertStreamToken(streamToken);
 
       return mutationQueuesStore(transaction).put(metadata);
@@ -233,11 +226,7 @@ export class IndexedDbMutationQueue implements MutationQueue {
     batchId: BatchId
   ): PersistencePromise<MutationBatch | null> {
     return this.getMutationQueueMetadata(transaction).next(metadata => {
-      // All batches with batchId <= this.metadata.lastAcknowledgedBatchId have
-      // been acknowledged so the first unacknowledged batch after batchID will
-      // have a batchID larger than both of these values.
-      const nextBatchId =
-        Math.max(batchId, metadata.lastAcknowledgedBatchId) + 1;
+      const nextBatchId = batchId + 1;
 
       const range = IDBKeyRange.lowerBound([this.userId, nextBatchId]);
       let foundBatch: MutationBatch | null = null;

packages/firestore/src/local/indexeddb_schema.ts

@@ -305,6 +305,8 @@ export class DbMutationQueue {
      * by the server. All MutationBatches in this queue with batchIds less
      * than or equal to this value are considered to have been acknowledged by
      * the server.
+     *
+     * NOTE: this is deprecated and no longer used by the code.
      */
     public lastAcknowledgedBatchId: number,
     /**

packages/firestore/src/local/memory_mutation_queue.ts

@@ -20,7 +20,7 @@ import { BatchId, ProtoByteString } from '../core/types';
 import { DocumentKeySet } from '../model/collections';
 import { DocumentKey } from '../model/document_key';
 import { Mutation } from '../model/mutation';
-import { BATCHID_UNKNOWN, MutationBatch } from '../model/mutation_batch';
+import { MutationBatch } from '../model/mutation_batch';
 import { emptyByteString } from '../platform/platform';
 import { assert } from '../util/assert';
 import { primitiveComparator } from '../util/misc';
@@ -44,9 +44,6 @@ export class MemoryMutationQueue implements MutationQueue {
   /** Next value to use when assigning sequential IDs to each mutation batch. */
   private nextBatchId: BatchId = 1;
 
-  /** The highest acknowledged mutation in the queue. */
-  private highestAcknowledgedBatchId: BatchId = BATCHID_UNKNOWN;
-
   /** The last received stream token from the server, used to acknowledge which
    * responses the client has processed. Stream tokens are opaque checkpoint
    * markers whose only real value is their inclusion in the next request.
@@ -68,11 +65,6 @@ export class MemoryMutationQueue implements MutationQueue {
     streamToken: ProtoByteString
   ): PersistencePromise<void> {
     const batchId = batch.batchId;
-    assert(
-      batchId > this.highestAcknowledgedBatchId,
-      'Mutation batchIDs must be acknowledged in order'
-    );
-
     const batchIndex = this.indexOfExistingBatchId(batchId, 'acknowledged');
     assert(
       batchIndex === 0,
@@ -89,7 +81,6 @@ export class MemoryMutationQueue implements MutationQueue {
         check.batchId
     );
 
-    this.highestAcknowledgedBatchId = batchId;
     this.lastStreamToken = streamToken;
     return PersistencePromise.resolve();
   }
@@ -161,10 +152,7 @@ export class MemoryMutationQueue implements MutationQueue {
     transaction: PersistenceTransaction,
     batchId: BatchId
   ): PersistencePromise<MutationBatch | null> {
-    // All batches with batchId <= this.highestAcknowledgedBatchId have been
-    // acknowledged so the first unacknowledged batch after batchID will have a
-    // batchID larger than both of these values.
-    const nextBatchId = Math.max(batchId, this.highestAcknowledgedBatchId) + 1;
+    const nextBatchId = batchId + 1;
 
     // The requested batchId may still be out of range so normalize it to the
     // start of the queue.

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

@@ -21,10 +21,7 @@ import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
 import { Persistence } from '../../../src/local/persistence';
 import { ReferenceSet } from '../../../src/local/reference_set';
 import { documentKeySet } from '../../../src/model/collections';
-import {
-  BATCHID_UNKNOWN,
-  MutationBatch
-} from '../../../src/model/mutation_batch';
+import { MutationBatch } from '../../../src/model/mutation_batch';
 import { emptyByteString } from '../../../src/platform/platform';
 import {
   expectEqualArrays,
@@ -218,24 +215,6 @@ function genericMutationQueueTests(): void {
     expect(notFound).to.be.null;
   });
 
-  it('getNextMutationBatchAfterBatchId() skips acknowledged batches', async () => {
-    const batches = await createBatches(3);
-    expect(
-      await mutationQueue.getNextMutationBatchAfterBatchId(BATCHID_UNKNOWN)
-    ).to.deep.equal(batches[0]);
-
-    await mutationQueue.acknowledgeBatch(batches[0], emptyByteString());
-    expect(
-      await mutationQueue.getNextMutationBatchAfterBatchId(BATCHID_UNKNOWN)
-    ).to.deep.equal(batches[1]);
-    expect(
-      await mutationQueue.getNextMutationBatchAfterBatchId(batches[0].batchId)
-    ).to.deep.equal(batches[1]);
-    expect(
-      await mutationQueue.getNextMutationBatchAfterBatchId(batches[1].batchId)
-    ).to.deep.equal(batches[2]);
-  });
-
   it('can getAllMutationBatchesAffectingDocumentKey()', async () => {
     const mutations = [
       setMutation('fob/bar', { a: 1 }),