WIP

Author: schmidt-sebastian

firebase-firestore/src/test/java/com/google/firebase/firestore/local/CountingQueryEngine.java

@@ -41,6 +41,8 @@ class CountingQueryEngine extends QueryEngine {
 
   private final int[] mutationsReadByCollection = new int[] {0};
   private final int[] mutationsReadByKey = new int[] {0};
+  private final int[] overlaysReadByCollection = new int[] {0};
+  private final int[] overlaysReadByKey = new int[] {0};
   private final int[] documentsReadByCollection = new int[] {0};
   private final int[] documentsReadByKey = new int[] {0};
 
@@ -51,6 +53,8 @@ class CountingQueryEngine extends QueryEngine {
   void resetCounts() {
     mutationsReadByCollection[0] = 0;
     mutationsReadByKey[0] = 0;
+    overlaysReadByCollection[0] = 0;
+    mutationsReadByKey[0] = 0;
     documentsReadByCollection[0] = 0;
     documentsReadByKey[0] = 0;
   }
@@ -74,11 +78,6 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
     return queryEngine.getDocumentsMatchingQuery(query, lastLimboFreeSnapshotVersion, remoteKeys);
   }
 
-  /** Returns the query engine that is used as the backing implementation. */
-  QueryEngine getSubject() {
-    return queryEngine;
-  }
-
   /**
    * Returns the number of documents returned by the RemoteDocumentCache's `getAll()` API (since the
    * last call to `resetCounts()`)

firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexingEnabledSQLiteLocalStoreTest.java

@@ -22,6 +22,7 @@
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
 import static com.google.firebase.firestore.testutil.TestUtil.query;
+import static com.google.firebase.firestore.testutil.TestUtil.setMutation;
 import static com.google.firebase.firestore.testutil.TestUtil.updateRemoteEvent;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
@@ -87,7 +88,7 @@ public void testUsesIndexes() {
   }
 
   @Test
-  public void testUsesPartialIndexesWhenAvailable() {
+  public void testUsesPartialIndexedRemoteDocumentsWhenAvailable() {
     FieldIndex index = fieldIndex("coll", 0, FieldIndex.INITIAL_STATE, "matches", Kind.ASCENDING);
     configureFieldIndexes(singletonList(index));
 
@@ -104,6 +105,22 @@ public void testUsesPartialIndexesWhenAvailable() {
     assertQueryReturned("coll/a", "coll/b");
   }
 
+  @Test
+  public void testUsesPartialIndexedOverlaysWhenAvailable() {
+    FieldIndex index = fieldIndex("coll", 0, FieldIndex.INITIAL_STATE, "matches", Kind.ASCENDING);
+    configureFieldIndexes(singletonList(index));
+
+    writeMutation(setMutation("coll/a", map("matches", true)));
+    backfillIndexes();
+
+    writeMutation(setMutation("coll/b", map("matches", true)));
+
+    Query query = query("coll").filter(filter("matches", "==", true));
+    executeQuery(query);
+    assertMutationsRead(/* byKey= */ 1, /* byCollection= */ 1);
+    assertQueryReturned("coll/a", "coll/b");
+  }
+
   @Test
   public void testDeletedDocumentRemovesIndex() {
     FieldIndex index = fieldIndex("coll", 0, FieldIndex.INITIAL_STATE, "matches", Kind.ASCENDING);

firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java

@@ -136,7 +136,7 @@ public void tearDown() {
     localStorePersistence.shutdown();
   }
 
-  private void writeMutation(Mutation mutation) {
+  protected void writeMutation(Mutation mutation) {
     writeMutations(asList(mutation));
   }
 
@@ -327,7 +327,7 @@ private void assertHasNamedQuery(NamedQuery expectedNamedQuery) {
    * Asserts the expected numbers of mutations read by the MutationQueue since the last call to
    * `resetPersistenceStats()`.
    */
-  private void assertMutationsRead(int byKey, int byCollection) {
+  protected void assertMutationsRead(int byKey, int byCollection) {
     assertEquals(
         "Mutations read (by collection)", byCollection, queryEngine.getMutationsReadByCollection());
     assertEquals("Mutations read (by key)", byKey, queryEngine.getMutationsReadByKey());