Cleanup

Author: schmidt-sebastian

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

@@ -281,46 +281,4 @@ private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingCollection
 
     return results;
   }
-
-  /** Queries the remote documents and mutation queue, by doing a full collection scan. */
-  private ImmutableSortedMap<DocumentKey, Document>
-      getDocumentsMatchingCollectionQueryFromMutationQueue(Query query, IndexOffset offset) {
-    Map<DocumentKey, MutableDocument> remoteDocuments =
-        remoteDocumentCache.getAll(query.getPath(), offset);
-
-    // TODO(indexing): We should plumb sinceReadTime through to the mutation queue
-    List<MutationBatch> matchingBatches = mutationQueue.getAllMutationBatchesAffectingQuery(query);
-
-    for (MutationBatch batch : matchingBatches) {
-      for (Mutation mutation : batch.getMutations()) {
-        // Only process documents belonging to the collection.
-        if (!query.getPath().isImmediateParentOf(mutation.getKey().getPath())) {
-          continue;
-        }
-
-        DocumentKey key = mutation.getKey();
-        MutableDocument document = remoteDocuments.get(key);
-        if (document == null) {
-          // Create invalid document to apply mutations on top of
-          document = MutableDocument.newInvalidDocument(key);
-          remoteDocuments.put(key, document);
-        }
-        mutation.applyToLocalView(
-            document, FieldMask.fromSet(new HashSet<>()), batch.getLocalWriteTime());
-        if (!document.isFoundDocument()) {
-          remoteDocuments.remove(key);
-        }
-      }
-    }
-
-    ImmutableSortedMap<DocumentKey, Document> results = emptyDocumentMap();
-    for (Map.Entry<DocumentKey, MutableDocument> docEntry : remoteDocuments.entrySet()) {
-      // Finally, insert the documents that still match the query
-      if (query.matches(docEntry.getValue())) {
-        results = results.insert(docEntry.getKey(), docEntry.getValue());
-      }
-    }
-
-    return results;
-  }
 }

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

@@ -154,26 +154,15 @@ public Map<DocumentKey, MutableDocument> getAll(Iterable<DocumentKey> documentKe
       public Map<DocumentKey, MutableDocument> getAll(
           String collectionGroup, IndexOffset offset, int limit) {
         Map<DocumentKey, MutableDocument> result = subject.getAll(collectionGroup, offset, limit);
-<<<<<<< HEAD
         documentsReadByCollection[0] += result.size();
-=======
-        documentsReadByQuery[0] += result.size();
->>>>>>> master
+
         return result;
       }
 
       @Override
-<<<<<<< HEAD
       public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOffset offset) {
         Map<DocumentKey, MutableDocument> result = subject.getAll(collection, offset);
         documentsReadByCollection[0] += result.size();
-=======
-      public ImmutableSortedMap<DocumentKey, MutableDocument> getAllDocumentsMatchingQuery(
-          Query query, IndexOffset offset) {
-        ImmutableSortedMap<DocumentKey, MutableDocument> result =
-            subject.getAllDocumentsMatchingQuery(query, offset);
-        documentsReadByQuery[0] += result.size();
->>>>>>> master
         return result;
       }
 

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

@@ -979,20 +979,9 @@ public void testReadsAllDocumentsForInitialCollectionQueries() {
     resetPersistenceStats();
 
     localStore.executeQuery(query, /* usePreviousResults= */ true);
-<<<<<<< HEAD
     assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
-    if (Persistence.OVERLAY_SUPPORT_ENABLED) {
-      // No mutations are read because only overlay is needed.
-      assertMutationsRead(/* byKey= */ 0, /* byCollection= */ 0);
-    } else {
-      assertMutationsRead(/* byKey= */ 0, /* byCollection= */ 1);
-    }
-=======
-
-    assertRemoteDocumentsRead(/* byKey= */ 0, /* byQuery= */ 2);
     // No mutations are read because only overlay is needed.
-    assertMutationsRead(/* byKey= */ 0, /* byQuery= */ 0);
->>>>>>> master
+    assertMutationsRead(/* byKey= */ 0, /* byCollection= */ 0);
   }
 
   @Test