Remove FSTMutationQueue

Firestore/Example/Tests/Local/FSTLRUGarbageCollectorTests.mm

@@ -24,13 +24,13 @@
 #import "FIRTimestamp.h"
 #import "Firestore/Example/Tests/Util/FSTHelpers.h"
 #import "Firestore/Source/Local/FSTLRUGarbageCollector.h"
-#import "Firestore/Source/Local/FSTMutationQueue.h"
 #import "Firestore/Source/Local/FSTPersistence.h"
 #import "Firestore/Source/Model/FSTDocument.h"
 #import "Firestore/Source/Model/FSTFieldValue.h"
 #import "Firestore/Source/Model/FSTMutation.h"
 #import "Firestore/Source/Util/FSTClasses.h"
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
+#include "Firestore/core/src/firebase/firestore/local/mutation_queue.h"
 #include "Firestore/core/src/firebase/firestore/local/query_cache.h"
 #include "Firestore/core/src/firebase/firestore/local/reference_set.h"
 #include "Firestore/core/src/firebase/firestore/local/remote_document_cache.h"
@@ -44,6 +44,7 @@
 using firebase::firestore::auth::User;
 using firebase::firestore::local::LruParams;
 using firebase::firestore::local::LruResults;
+using firebase::firestore::local::MutationQueue;
 using firebase::firestore::local::QueryCache;
 using firebase::firestore::local::ReferenceSet;
 using firebase::firestore::local::RemoteDocumentCache;
@@ -64,7 +65,7 @@ @implementation FSTLRUGarbageCollectorTests {
   id<FSTPersistence> _persistence;
   QueryCache *_queryCache;
   RemoteDocumentCache *_documentCache;
-  id<FSTMutationQueue> _mutationQueue;
+  MutationQueue *_mutationQueue;
   id<FSTLRUDelegate> _lruDelegate;
   FSTLRUGarbageCollector *_gc;
   ListenSequenceNumber _initialSequenceNumber;
@@ -96,7 +97,7 @@ - (void)newTestResourcesWithLruParams:(LruParams)lruParams {
   _mutationQueue = [_persistence mutationQueueForUser:_user];
   _lruDelegate = (id<FSTLRUDelegate>)_persistence.referenceDelegate;
   _initialSequenceNumber = _persistence.run("start querycache", [&]() -> ListenSequenceNumber {
-    [_mutationQueue start];
+    _mutationQueue->Start();
     _gc = _lruDelegate.gc;
     return _persistence.currentSequenceNumber;
   });
@@ -447,7 +448,7 @@ - (void)testRemoveOrphanedDocuments {
   // serve to keep the mutated documents from being GC'd while the mutations are outstanding.
   _persistence.run("actually register the mutations", [&]() {
     FIRTimestamp *writeTime = [FIRTimestamp timestamp];
-    [_mutationQueue addMutationBatchWithWriteTime:writeTime mutations:mutations];
+    _mutationQueue->AddMutationBatch(writeTime, mutations);
   });
 
   // Mark 5 documents eligible for GC. This simulates documents that were mutated then ack'd.

Firestore/Example/Tests/Local/FSTLevelDBMigrationsTests.mm

@@ -23,7 +23,6 @@
 #import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
 #import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
 #import "Firestore/Source/Local/FSTLevelDB.h"
-#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h"
 
 #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_migrations.h"

Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h"
-
 #import <XCTest/XCTest.h>
 
 #include <string>
@@ -81,7 +79,7 @@ - (void)setUp {
   _db = [FSTPersistenceTestHelpers levelDBPersistence];
   [_db.referenceDelegate addInMemoryPins:&_additionalReferences];
 
-  self.mutationQueue = [_db mutationQueueForUser:User("user")].mutationQueue;
+  self.mutationQueue = [_db mutationQueueForUser:User("user")];
   self.persistence = _db;
 
   self.persistence.run("Setup", [&]() { self.mutationQueue->Start(); });

Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.mm

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#import "Firestore/Source/Local/FSTMemoryMutationQueue.h"
-
 #import "Firestore/Source/Local/FSTMemoryPersistence.h"
 
 #import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h"
@@ -43,7 +41,7 @@ - (void)setUp {
 
   self.persistence = [FSTPersistenceTestHelpers eagerGCMemoryPersistence];
   [self.persistence.referenceDelegate addInMemoryPins:&_additionalReferences];
-  self.mutationQueue = [self.persistence mutationQueueForUser:User("user")].mutationQueue;
+  self.mutationQueue = [self.persistence mutationQueueForUser:User("user")];
 }
 
 @end

Firestore/Source/Local/FSTLRUGarbageCollector.mm

@@ -20,7 +20,6 @@
 #include <queue>
 #include <utility>
 
-#import "Firestore/Source/Local/FSTMutationQueue.h"
 #import "Firestore/Source/Local/FSTPersistence.h"
 #include "Firestore/core/include/firebase/firestore/timestamp.h"
 #include "Firestore/core/src/firebase/firestore/model/document_key.h"

Firestore/Source/Local/FSTLevelDB.mm

@@ -22,14 +22,14 @@
 
 #import "FIRFirestoreErrors.h"
 #import "Firestore/Source/Local/FSTLRUGarbageCollector.h"
-#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h"
 #import "Firestore/Source/Remote/FSTSerializerBeta.h"
 
 #include "Firestore/core/include/firebase/firestore/firestore_errors.h"
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
 #include "Firestore/core/src/firebase/firestore/core/database_info.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_migrations.h"
+#include "Firestore/core/src/firebase/firestore/local/leveldb_mutation_queue.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_query_cache.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_transaction.h"
@@ -63,6 +63,7 @@
 using firebase::firestore::local::LevelDbDocumentTargetKey;
 using firebase::firestore::local::LevelDbMigrations;
 using firebase::firestore::local::LevelDbMutationKey;
+using firebase::firestore::local::LevelDbMutationQueue;
 using firebase::firestore::local::LevelDbQueryCache;
 using firebase::firestore::local::LevelDbRemoteDocumentCache;
 using firebase::firestore::local::LevelDbTransaction;
@@ -93,7 +94,9 @@ - (size_t)byteSize;
 
 @property(nonatomic, assign, getter=isStarted) BOOL started;
 
-- (firebase::firestore::local::LevelDbQueryCache *)queryCache;
+- (LevelDbQueryCache *)queryCache;
+
+- (LevelDbMutationQueue *)mutationQueueForUser:(const User &)user;
 
 @end
 
@@ -280,6 +283,7 @@ @implementation FSTLevelDB {
   FSTLevelDBLRUDelegate *_referenceDelegate;
   std::unique_ptr<LevelDbQueryCache> _queryCache;
   std::set<std::string> _users;
+  std::unique_ptr<LevelDbMutationQueue> _currentMutationQueue;
 }
 
 /**
@@ -463,9 +467,10 @@ - (LevelDbTransaction *)currentTransaction {
 
 #pragma mark - Persistence Factory methods
 
-- (id<FSTMutationQueue>)mutationQueueForUser:(const User &)user {
+- (LevelDbMutationQueue *)mutationQueueForUser:(const User &)user {
   _users.insert(user.uid());
-  return [FSTLevelDBMutationQueue mutationQueueWithUser:user db:self serializer:self.serializer];
+  _currentMutationQueue.reset(new LevelDbMutationQueue(user, self, self.serializer));
+  return _currentMutationQueue.get();
 }
 
 - (LevelDbQueryCache *)queryCache {