Merge

Author: schmidt-sebastian

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/RemoteStoreTest.java

@@ -21,11 +21,11 @@
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.core.OnlineState;
-import com.google.firebase.firestore.local.DefaultQueryEngine;
 import com.google.firebase.firestore.local.IndexBackfiller;
 import com.google.firebase.firestore.local.LocalStore;
 import com.google.firebase.firestore.local.MemoryPersistence;
 import com.google.firebase.firestore.local.Persistence;
+import com.google.firebase.firestore.local.QueryEngine;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.mutation.MutationBatchResult;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
@@ -76,7 +76,7 @@ public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {
         };
 
     FakeConnectivityMonitor connectivityMonitor = new FakeConnectivityMonitor();
-    DefaultQueryEngine queryEngine = new DefaultQueryEngine();
+    QueryEngine queryEngine = new QueryEngine();
     Persistence persistence = MemoryPersistence.createEagerGcMemoryPersistence();
     persistence.start();
     IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());

firebase-firestore/src/main/java/com/google/firebase/firestore/core/MemoryComponentProvider.java

@@ -16,11 +16,11 @@
 
 import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedSet;
-import com.google.firebase.firestore.local.DefaultQueryEngine;
 import com.google.firebase.firestore.local.IndexBackfiller;
 import com.google.firebase.firestore.local.LocalStore;
 import com.google.firebase.firestore.local.MemoryPersistence;
 import com.google.firebase.firestore.local.Persistence;
+import com.google.firebase.firestore.local.QueryEngine;
 import com.google.firebase.firestore.local.Scheduler;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.mutation.MutationBatchResult;
@@ -54,10 +54,7 @@ protected EventManager createEventManager(Configuration configuration) {
   @Override
   protected LocalStore createLocalStore(Configuration configuration) {
     return new LocalStore(
-        getPersistence(),
-        getIndexBackfiller(),
-        new DefaultQueryEngine(),
-        configuration.getInitialUser());
+        getPersistence(), getIndexBackfiller(), new QueryEngine(), configuration.getInitialUser());
   }
 
   @Override

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

@@ -169,8 +169,7 @@ public LocalStore(
         new LocalDocumentsView(remoteDocuments, mutationQueue, documentOverlayCache, indexManager);
     this.queryEngine = queryEngine;
     this.indexBackfiller = indexBackfiller;
-    queryEngine.setLocalDocumentsView(localDocuments);
-    queryEngine.setIndexManager(indexManager);
+    queryEngine.initialize(localDocuments, indexManager);
 
     localViewReferences = new ReferenceSet();
     persistence.getReferenceDelegate().setInMemoryPins(localViewReferences);
@@ -215,8 +214,7 @@ public ImmutableSortedMap<DocumentKey, Document> handleUserChange(User user) {
     // Recreate our LocalDocumentsView using the new MutationQueue.
     localDocuments =
         new LocalDocumentsView(remoteDocuments, mutationQueue, documentOverlayCache, indexManager);
-    queryEngine.setLocalDocumentsView(localDocuments);
-    queryEngine.setIndexManager(indexManager);
+    queryEngine.initialize(localDocuments, indexManager);
 
     // TODO(indexing): Add spec tests that test these components change after a user change
     remoteDocuments.setIndexManager(indexManager);
@@ -496,6 +494,7 @@ private DocumentChangeResult populateDocumentChanges(
       @Nullable Map<DocumentKey, SnapshotVersion> documentVersions,
       SnapshotVersion globalVersion) {
     Map<DocumentKey, MutableDocument> changedDocs = new HashMap<>();
+    List<DocumentKey> removedDocs = new ArrayList<>();
     Set<DocumentKey> conditionChanged = new HashSet<>();
 
     // Each loop iteration only affects its "own" doc, so it's safe to get all the remote
@@ -519,7 +518,7 @@ private DocumentChangeResult populateDocumentChanges(
       if (doc.isNoDocument() && doc.getVersion().equals(SnapshotVersion.NONE)) {
         // NoDocuments with SnapshotVersion.NONE are used in manufactured events. We remove
         // these documents from cache since we lost access.
-        remoteDocuments.remove(doc.getKey());
+        removedDocs.add(doc.getKey());
         changedDocs.put(key, doc);
       } else if (!existingDoc.isValidDocument()
           || doc.getVersion().compareTo(existingDoc.getVersion()) > 0
@@ -539,6 +538,7 @@ private DocumentChangeResult populateDocumentChanges(
             doc.getVersion());
       }
     }
+    remoteDocuments.removeAll(removedDocs);
     return new DocumentChangeResult(changedDocs, conditionChanged);
   }
 
@@ -849,7 +849,7 @@ public QueryResult executeQuery(Query query, boolean usePreviousResults) {
         queryEngine.getDocumentsMatchingQuery(
             query,
             usePreviousResults ? lastLimboFreeSnapshotVersion : SnapshotVersion.NONE,
-            usePreviousResults ? remoteKeys : DocumentKey.emptyKeySet());
+            remoteKeys);
     return new QueryResult(documents, remoteKeys);
   }