Simplify

Author: tom-andersen

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

@@ -23,7 +23,7 @@ public int getDocumentReadCount() {
     return documentReadCount;
   }
 
-  public void incrementDocumentReadCount() {
-    documentReadCount++;
+  public void incrementDocumentReadCount(int cnt) {
+    documentReadCount += cnt;
   }
 }

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

@@ -159,7 +159,7 @@ public Map<DocumentKey, MutableDocument> getAll(
     if (collections.isEmpty()) {
       return Collections.emptyMap();
     } else if (BINDS_PER_STATEMENT * collections.size() < SQLitePersistence.MAX_ARGS) {
-      return getAll(collections, offset, limit, /*filter*/ null);
+      return getAll(collections, offset, limit, /*filter*/ null, /*context*/ null);
     } else {
       // We need to fan out our collection scan since SQLite only supports 999 binds per statement.
       Map<DocumentKey, MutableDocument> results = new HashMap<>();
@@ -170,7 +170,8 @@ public Map<DocumentKey, MutableDocument> getAll(
                 collections.subList(i, Math.min(collections.size(), i + pageSize)),
                 offset,
                 limit,
-                /*filter*/ null));
+                /*filter*/ null,
+                /*context*/ null));
       }
       return firstNEntries(results, limit, IndexOffset.DOCUMENT_COMPARATOR);
     }
@@ -218,27 +219,16 @@ private Map<DocumentKey, MutableDocument> getAll(
 
     BackgroundQueue backgroundQueue = new BackgroundQueue();
     Map<DocumentKey, MutableDocument> results = new HashMap<>();
-    db.query(sql.toString())
+    int cnt = db.query(sql.toString())
         .binding(bindVars)
-        .forEach(
-            row -> {
-              processRowInBackground(backgroundQueue, results, row, filter);
-              if (context != null) {
-                context.incrementDocumentReadCount();
-              }
-            });
+        .forEach(row -> processRowInBackground(backgroundQueue, results, row, filter));
+    if (context != null) {
+      context.incrementDocumentReadCount(cnt);
+    }
     backgroundQueue.drain();
     return results;
   }
 
-  private Map<DocumentKey, MutableDocument> getAll(
-      List<ResourcePath> collections,
-      IndexOffset offset,
-      int count,
-      @Nullable Predicate<MutableDocument> filter) {
-    return getAll(collections, offset, count, filter, /*context*/ null);
-  }
-
   private void processRowInBackground(
       BackgroundQueue backgroundQueue,
       Map<DocumentKey, MutableDocument> results,