Remove TargetIdGenerator

Author: schmidt-sebastian

packages/firestore/src/core/sync_engine.ts

@@ -51,7 +51,6 @@ import { ListenSequence } from './listen_sequence';
 import { Query, LimitType } from './query';
 import { SnapshotVersion } from './snapshot_version';
 import { Target } from './target';
-import { TargetIdGenerator } from './target_id_generator';
 import { Transaction } from './transaction';
 import {
   BatchId,
@@ -161,7 +160,7 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
   };
   /** Stores user callbacks waiting for all pending writes to be acknowledged. */
   private pendingWritesCallbacks = new Map<BatchId, Array<Deferred<void>>>();
-  private limboTargetIdGenerator = TargetIdGenerator.forSyncEngine();
+  private nextLimboTargetId = 1;
 
   // The primary state is set to `true` or `false` immediately after Firestore
   // startup. In the interim, a client should only be considered primary if
@@ -770,7 +769,11 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
     const key = limboChange.key;
     if (!this.limboTargetsByKey.get(key)) {
       logDebug(LOG_TAG, 'New document in limbo: ' + key);
-      const limboTargetId = this.limboTargetIdGenerator.next();
+
+      const limboTargetId = this.nextLimboTargetId;
+      // Target IDs in persistence are odd (and start at 1).
+      this.nextLimboTargetId += 2;
+
       const query = Query.atPath(key.path);
       this.limboResolutionsByTarget[limboTargetId] = new LimboResolution(key);
       this.remoteStore.listen(

packages/firestore/src/core/target_id_generator.ts

@@ -23,7 +23,6 @@ import { DocumentKey } from '../model/document_key';
 import { assert } from '../util/assert';
 import { immediateSuccessor } from '../util/misc';
 
-import { TargetIdGenerator } from '../core/target_id_generator';
 import * as EncodedResourcePath from './encoded_resource_path';
 import {
   IndexedDbLruDelegate,
@@ -60,15 +59,12 @@ export class IndexedDbTargetCache implements TargetCache {
   // to IndexedDb whenever we need to read metadata. We can revisit if it turns
   // out to have a meaningful performance impact.
 
-  private targetIdGenerator = TargetIdGenerator.forTargetCache();
-
   allocateTargetId(
     transaction: PersistenceTransaction
   ): PersistencePromise<TargetId> {
     return this.retrieveMetadata(transaction).next(metadata => {
-      metadata.highestTargetId = this.targetIdGenerator.after(
-        metadata.highestTargetId
-      );
+      // Target IDs in persistence are even.
+      metadata.highestTargetId = metadata.highestTargetId + 2;
       return this.saveMetadata(transaction, metadata).next(
         () => metadata.highestTargetId
       );

packages/firestore/src/local/indexeddb_target_cache.ts

@@ -16,7 +16,6 @@
  */
 
 import { SnapshotVersion } from '../core/snapshot_version';
-import { TargetIdGenerator } from '../core/target_id_generator';
 import { ListenSequenceNumber, TargetId } from '../core/types';
 import { DocumentKeySet } from '../model/collections';
 import { DocumentKey } from '../model/document_key';
@@ -52,8 +51,6 @@ export class MemoryTargetCache implements TargetCache {
 
   private targetCount = 0;
 
-  private targetIdGenerator = TargetIdGenerator.forTargetCache();
-
   constructor(private readonly persistence: MemoryPersistence) {}
 
   forEachTarget(
@@ -79,9 +76,9 @@ export class MemoryTargetCache implements TargetCache {
   allocateTargetId(
     transaction: PersistenceTransaction
   ): PersistencePromise<TargetId> {
-    const nextTargetId = this.targetIdGenerator.after(this.highestTargetId);
-    this.highestTargetId = nextTargetId;
-    return PersistencePromise.resolve(nextTargetId);
+    // Target IDs in persistence are even.
+    this.highestTargetId = this.highestTargetId + 2;
+    return PersistencePromise.resolve(this.highestTargetId);
   }
 
   setTargetsMetadata(
@@ -100,10 +97,6 @@ export class MemoryTargetCache implements TargetCache {
 
   private saveTargetData(targetData: TargetData): void {
     this.targets.set(targetData.target, targetData);
-    const targetId = targetData.targetId;
-    if (targetId > this.highestTargetId) {
-      this.highestTargetId = targetId;
-    }
     if (targetData.sequenceNumber > this.highestSequenceNumber) {
       this.highestSequenceNumber = targetData.sequenceNumber;
     }