cleanup

Author: MarkDuckworth

packages/firestore/src/index/index_entry.ts

@@ -65,10 +65,10 @@ export class IndexEntry {
   ): DbIndexEntry {
     return {
       indexId: this._indexId,
-      uid, // this.uid,
+      uid,
       arrayValue: indexSafeUint8Array(this._arrayValue),
       directionalValue: indexSafeUint8Array(this._directionalValue),
-      orderedDocumentKey: indexSafeUint8Array(orderedDocumentKey), // this.encodeDirectionalKey(fieldIndex, document.key),
+      orderedDocumentKey: indexSafeUint8Array(orderedDocumentKey),
       documentKey: documentKey.path.toArray()
     };
   }

packages/firestore/src/local/indexeddb_index_manager.ts

@@ -298,90 +298,79 @@ export class IndexedDbIndexManager implements IndexManager {
     let canServeTarget = true;
     const indexes = new Map<Target, FieldIndex | null>();
 
-    return indexEntries
-      .count()
-      .next(count => {
-        //console.log(`INDEX ENTRY COUNT: ${count}`);
-        return PersistencePromise.forEach(
-          this.getSubTargets(target),
-          (subTarget: Target) => {
-            return this.getFieldIndex(transaction, subTarget).next(index => {
-              canServeTarget &&= !!index;
-              indexes.set(subTarget, index);
-            });
-          }
-        );
-      })
-      .next(() => {
-        if (!canServeTarget) {
-          return PersistencePromise.resolve(null as DocumentKey[] | null);
-        } else {
-          let existingKeys = documentKeySet();
-          const result: DocumentKey[] = [];
-          return PersistencePromise.forEach(indexes, (index, subTarget) => {
-            logDebug(
-              LOG_TAG,
-              `Using index ${fieldIndexToString(
-                index!
-              )} to execute ${canonifyTarget(target)}`
-            );
-
-            const arrayValues = targetGetArrayValues(subTarget, index!);
-            const notInValues = targetGetNotInValues(subTarget, index!);
-            const lowerBound = targetGetLowerBound(subTarget, index!);
-            const upperBound = targetGetUpperBound(subTarget, index!);
-
-            const lowerBoundEncoded = this.encodeBound(
-              index!,
-              subTarget,
-              lowerBound
-            );
-            const upperBoundEncoded = this.encodeBound(
-              index!,
-              subTarget,
-              upperBound
-            );
-            const notInEncoded = this.encodeValues(
-              index!,
-              subTarget,
-              notInValues
-            );
-
-            const indexRanges = this.generateIndexRanges(
-              index!.indexId,
-              arrayValues,
-              lowerBoundEncoded,
-              lowerBound.inclusive,
-              upperBoundEncoded,
-              upperBound.inclusive,
-              notInEncoded
-            );
-            return PersistencePromise.forEach(
-              indexRanges,
-              (indexRange: IDBKeyRange) => {
-                // console.log(`indexRange lower: ${JSON.stringify(indexRange.lower)}, upper: ${JSON.stringify(indexRange.upper)}`);
-                // console.log(`indexRange lower: ${JSON.stringify(indexRange.lower[2])}, upper: ${JSON.stringify(indexRange.upper[2])}`);
-                // console.log(`indexRange lower: ${JSON.stringify(indexRange.lowerOpen)}, upper: ${JSON.stringify(indexRange.upperOpen)}`);
-                // console.log(`target.limit: ${target.limit}`);
-                return indexEntries
-                  .loadFirst(indexRange, target.limit)
-                  .next(entries => {
-                    // console.log(JSON.stringify(entries));
-                    entries.forEach(entry => {
-                      const documentKey = DocumentKey.fromSegments(
-                        entry.documentKey
-                      );
-                      if (!existingKeys.has(documentKey)) {
-                        existingKeys = existingKeys.add(documentKey);
-                        result.push(documentKey);
-                      }
-                    });
+    return PersistencePromise.forEach(
+      this.getSubTargets(target),
+      (subTarget: Target) => {
+        return this.getFieldIndex(transaction, subTarget).next(index => {
+          canServeTarget &&= !!index;
+          indexes.set(subTarget, index);
+        });
+      }
+    ).next(() => {
+      if (!canServeTarget) {
+        return PersistencePromise.resolve(null as DocumentKey[] | null);
+      } else {
+        let existingKeys = documentKeySet();
+        const result: DocumentKey[] = [];
+        return PersistencePromise.forEach(indexes, (index, subTarget) => {
+          logDebug(
+            LOG_TAG,
+            `Using index ${fieldIndexToString(
+              index!
+            )} to execute ${canonifyTarget(target)}`
+          );
+
+          const arrayValues = targetGetArrayValues(subTarget, index!);
+          const notInValues = targetGetNotInValues(subTarget, index!);
+          const lowerBound = targetGetLowerBound(subTarget, index!);
+          const upperBound = targetGetUpperBound(subTarget, index!);
+
+          const lowerBoundEncoded = this.encodeBound(
+            index!,
+            subTarget,
+            lowerBound
+          );
+          const upperBoundEncoded = this.encodeBound(
+            index!,
+            subTarget,
+            upperBound
+          );
+          const notInEncoded = this.encodeValues(
+            index!,
+            subTarget,
+            notInValues
+          );
+
+          const indexRanges = this.generateIndexRanges(
+            index!.indexId,
+            arrayValues,
+            lowerBoundEncoded,
+            lowerBound.inclusive,
+            upperBoundEncoded,
+            upperBound.inclusive,
+            notInEncoded
+          );
+          return PersistencePromise.forEach(
+            indexRanges,
+            (indexRange: IDBKeyRange) => {
+              return indexEntries
+                .loadFirst(indexRange, target.limit)
+                .next(entries => {
+                  entries.forEach(entry => {
+                    const documentKey = DocumentKey.fromSegments(
+                      entry.documentKey
+                    );
+                    if (!existingKeys.has(documentKey)) {
+                      existingKeys = existingKeys.add(documentKey);
+                      result.push(documentKey);
+                    }
                   });
-              }
-            );
-          }).next(() => result as DocumentKey[] | null);
-        }
-      });
+                });
+            }
+          );
+        }).next(() => result as DocumentKey[] | null);
+      }
+    });
   }
 
   private getSubTargets(target: Target): Target[] {
@@ -475,8 +464,8 @@ export class IndexedDbIndexManager implements IndexManager {
   /** Generates the lower bound for `arrayValue` and `directionalValue`. */
   private generateLowerBound(
     indexId: number,
-    arrayValue: Uint8Array | number[],
-    directionalValue: Uint8Array | number[],
+    arrayValue: Uint8Array,
+    directionalValue: Uint8Array,
     inclusive: boolean
   ): IndexEntry {
     const entry = new IndexEntry(
@@ -491,8 +480,8 @@ export class IndexedDbIndexManager implements IndexManager {
   /** Generates the upper bound for `arrayValue` and `directionalValue`. */
   private generateUpperBound(
     indexId: number,
-    arrayValue: Uint8Array | number[],
-    directionalValue: Uint8Array | number[],
+    arrayValue: Uint8Array,
+    directionalValue: Uint8Array,
     inclusive: boolean
   ): IndexEntry {
     const entry = new IndexEntry(