Format

Author: schmidt-sebastian

firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexBackfiller.java

@@ -158,7 +158,8 @@ private IndexOffset getNewOffset(IndexOffset existingOffset, LocalDocumentsResul
       IndexOffset latestOffset = existingOffset;
       for (Map.Entry<DocumentKey, Document> entry : lookupResult.getDocuments()) {
         IndexOffset newOffset =
-            IndexOffset.fromDocument(entry.getValue(), lookupResult.getLargestBatchId());
+            IndexOffset.create(
+                entry.getValue().getReadTime(), entry.getKey(), lookupResult.getLargestBatchId());
         if (newOffset.compareTo(latestOffset) > 0) {
           latestOffset = newOffset;
         }

firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryRemoteDocumentCache.java

@@ -121,7 +121,7 @@ public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOf
         continue;
       }
 
-      if (IndexOffset.fromDocument(doc, 0).compareTo(offset) <= 0) {
+      if (IndexOffset.fromDocument(doc).compareTo(offset) <= 0) {
         // The document sorts before the offset.
         continue;
       }

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

@@ -117,7 +117,7 @@ public void testUsesPartialIndexedOverlaysWhenAvailable() {
 
     Query query = query("coll").filter(filter("matches", "==", true));
     executeQuery(query);
-    assertMutationsRead(/* byKey= */ 1, /* byCollection= */ 1);
+    assertOverlaysRead(/* byKey= */ 1, /* byCollection= */ 1);
     assertQueryReturned("coll/a", "coll/b");
   }
 

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

@@ -327,7 +327,7 @@ private void assertHasNamedQuery(NamedQuery expectedNamedQuery) {
    * Asserts the expected numbers of mutations read by the OverlayQueue since the last call to
    * `resetPersistenceStats()`.
    */
-  private void assertOverlaysRead(int byKey, int byCollection) {
+  protected void assertOverlaysRead(int byKey, int byCollection) {
     assertEquals("Overlays read (by key)", byKey, queryEngine.getOverlaysReadByKey());
     assertEquals(
         "Overlays read (by collection)", byCollection, queryEngine.getOverlaysReadByCollection());