diff options
20 files changed, 0 insertions, 51 deletions
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.mm index 929ab9e..6e64998 100644 --- a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.mm +++ b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.mm @@ -42,7 +42,6 @@ NS_ASSUME_NONNULL_BEGIN } - (void)tearDown { - [self.queryCache shutdown]; self.persistence = nil; self.queryCache = nil; diff --git a/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm index 638ab2f..d69e613 100644 --- a/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm +++ b/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm @@ -58,7 +58,6 @@ static const char *kDummy = "1"; } - (void)tearDown { - [self.remoteDocumentCache shutdown]; self.remoteDocumentCache = nil; self.persistence = nil; _db = nil; diff --git a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm index 7c3b977..2ef3acf 100644 --- a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm +++ b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm @@ -88,7 +88,6 @@ FSTDocumentVersionDictionary *FSTVersionDictionary(FSTMutation *mutation, } - (void)tearDown { - [self.localStore shutdown]; [self.localStorePersistence shutdown]; [super tearDown]; @@ -109,8 +108,6 @@ FSTDocumentVersionDictionary *FSTVersionDictionary(FSTMutation *mutation, /** Restarts the local store using the FSTNoOpGarbageCollector instead of the default. */ - (void)restartWithNoopGarbageCollector { - [self.localStore shutdown]; - id<FSTGarbageCollector> garbageCollector = [[FSTNoOpGarbageCollector alloc] init]; self.localStore = [[FSTLocalStore alloc] initWithPersistence:self.localStorePersistence garbageCollector:garbageCollector diff --git a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.mm b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.mm index fb7df6b..530c508 100644 --- a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.mm +++ b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.mm @@ -42,7 +42,6 @@ NS_ASSUME_NONNULL_BEGIN } - (void)tearDown { - [self.queryCache shutdown]; self.persistence = nil; self.queryCache = nil; diff --git a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.mm b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.mm index 162eef0..d5ab62d 100644 --- a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.mm +++ b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.mm @@ -39,7 +39,6 @@ } - (void)tearDown { - [self.remoteDocumentCache shutdown]; self.persistence = nil; self.remoteDocumentCache = nil; diff --git a/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm b/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm index 202a39c..465a2cb 100644 --- a/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm +++ b/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm @@ -40,7 +40,6 @@ NS_ASSUME_NONNULL_BEGIN @implementation FSTMutationQueueTests - (void)tearDown { - [self.mutationQueue shutdown]; [self.persistence shutdown]; [super tearDown]; } @@ -143,7 +142,6 @@ NS_ASSUME_NONNULL_BEGIN XCTAssertEqual([self.mutationQueue highestAcknowledgedBatchID], batch2.batchID); // Restart the queue so that nextBatchID will be reset. - [self.mutationQueue shutdown]; self.mutationQueue = [self.persistence mutationQueueForUser:User("user")]; FSTWriteGroup *group = [self.persistence startGroupWithAction:@"Start MutationQueue"]; diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm index 21dceb4..b575004 100644 --- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm +++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm @@ -324,7 +324,6 @@ NS_ASSUME_NONNULL_BEGIN [self.persistence commitGroup:group]; // Verify that the highestTargetID even survives restarts. - [self.queryCache shutdown]; self.queryCache = [self.persistence queryCache]; [self.queryCache start]; XCTAssertEqual([self.queryCache highestListenSequenceNumber], 100); @@ -374,7 +373,6 @@ NS_ASSUME_NONNULL_BEGIN XCTAssertEqual([self.queryCache highestTargetID], 42); [self.persistence commitGroup:group]; // Verify that the highestTargetID even survives restarts. - [self.queryCache shutdown]; self.queryCache = [self.persistence queryCache]; [self.queryCache start]; XCTAssertEqual([self.queryCache highestTargetID], 42); diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm index 42a0ac0..91140bf 100644 --- a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm +++ b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm @@ -191,7 +191,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)shutdown { [self.dispatchQueue dispatchSync:^{ [self.remoteStore shutdown]; - [self.localStore shutdown]; }]; } diff --git a/Firestore/Source/Core/FSTFirestoreClient.mm b/Firestore/Source/Core/FSTFirestoreClient.mm index 9f0779a..c0d38ca 100644 --- a/Firestore/Source/Core/FSTFirestoreClient.mm +++ b/Firestore/Source/Core/FSTFirestoreClient.mm @@ -241,7 +241,6 @@ NS_ASSUME_NONNULL_BEGIN self->_credentialsProvider->SetUserChangeListener(nullptr); [self.remoteStore shutdown]; - [self.localStore shutdown]; [self.persistence shutdown]; if (completion) { [self.userDispatchQueue dispatchAsync:^{ diff --git a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm index a1e9e4c..29acead 100644 --- a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm +++ b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm @@ -132,9 +132,6 @@ using leveldb::WriteOptions; self.metadata = metadata; } -- (void)shutdown { -} - + (FSTBatchID)loadNextBatchIDFromDB:(std::shared_ptr<DB>)db { // TODO(gsoltis): implement Prev() and SeekToLast() on LevelDbTransaction::Iterator, then port // this to a transaction. diff --git a/Firestore/Source/Local/FSTLevelDBQueryCache.mm b/Firestore/Source/Local/FSTLevelDBQueryCache.mm index dabfff2..aa1ab41 100644 --- a/Firestore/Source/Local/FSTLevelDBQueryCache.mm +++ b/Firestore/Source/Local/FSTLevelDBQueryCache.mm @@ -142,9 +142,6 @@ using leveldb::Status; _db.currentTransaction->Put([FSTLevelDBTargetGlobalKey key], self.metadata); } -- (void)shutdown { -} - - (void)saveQueryData:(FSTQueryData *)queryData { FSTTargetID targetID = queryData.targetID; std::string key = [FSTLevelDBTargetKey keyWithTargetID:targetID]; diff --git a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm index 930778d..703fc69 100644 --- a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm +++ b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm @@ -57,9 +57,6 @@ using leveldb::Status; return self; } -- (void)shutdown { -} - - (void)addEntry:(FSTMaybeDocument *)document { std::string key = [self remoteDocumentKey:document.key]; _db.currentTransaction->Put(key, [self.serializer encodedMaybeDocument:document]); diff --git a/Firestore/Source/Local/FSTLocalStore.h b/Firestore/Source/Local/FSTLocalStore.h index e2134dc..82402e4 100644 --- a/Firestore/Source/Local/FSTLocalStore.h +++ b/Firestore/Source/Local/FSTLocalStore.h @@ -90,9 +90,6 @@ NS_ASSUME_NONNULL_BEGIN /** Performs any initial startup actions required by the local store. */ - (void)start; -/** Releases any open resources. */ -- (void)shutdown; - /** * Tells the FSTLocalStore that the currently authenticated user has changed. * diff --git a/Firestore/Source/Local/FSTLocalStore.mm b/Firestore/Source/Local/FSTLocalStore.mm index a0fb5cb..74eab48 100644 --- a/Firestore/Source/Local/FSTLocalStore.mm +++ b/Firestore/Source/Local/FSTLocalStore.mm @@ -164,19 +164,12 @@ NS_ASSUME_NONNULL_BEGIN self.listenSequence = [[FSTListenSequence alloc] initStartingAfter:sequenceNumber]; } -- (void)shutdown { - [self.mutationQueue shutdown]; - [self.remoteDocumentCache shutdown]; - [self.queryCache shutdown]; -} - - (FSTMaybeDocumentDictionary *)userDidChange:(const User &)user { // Swap out the mutation queue, grabbing the pending mutation batches before and after. FSTWriteGroup *group = [self.persistence startGroupWithAction:@"OldBatches"]; NSArray<FSTMutationBatch *> *oldBatches = [self.mutationQueue allMutationBatches]; [self.persistence commitGroup:group]; - [self.mutationQueue shutdown]; [self.garbageCollector removeGarbageSource:self.mutationQueue]; self.mutationQueue = [self.persistence mutationQueueForUser:user]; diff --git a/Firestore/Source/Local/FSTMemoryMutationQueue.mm b/Firestore/Source/Local/FSTMemoryMutationQueue.mm index 5419c8a..8028bb3 100644 --- a/Firestore/Source/Local/FSTMemoryMutationQueue.mm +++ b/Firestore/Source/Local/FSTMemoryMutationQueue.mm @@ -105,9 +105,6 @@ static const NSComparator NumberComparator = ^NSComparisonResult(NSNumber *left, @"highestAcknowledgedBatchID must be less than the nextBatchID"); } -- (void)shutdown { -} - - (BOOL)isEmpty { // If the queue has any entries at all, the first entry must not be a tombstone (otherwise it // would have been removed already). diff --git a/Firestore/Source/Local/FSTMemoryQueryCache.mm b/Firestore/Source/Local/FSTMemoryQueryCache.mm index 5dcf82d..18d14f2 100644 --- a/Firestore/Source/Local/FSTMemoryQueryCache.mm +++ b/Firestore/Source/Local/FSTMemoryQueryCache.mm @@ -61,10 +61,6 @@ NS_ASSUME_NONNULL_BEGIN // Nothing to do. } -- (void)shutdown { - // No resources to release. -} - - (FSTTargetID)highestTargetID { return _highestTargetID; } diff --git a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.mm b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.mm index 9289e60..75bec8f 100644 --- a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.mm +++ b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.mm @@ -42,9 +42,6 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (void)shutdown { -} - - (void)addEntry:(FSTMaybeDocument *)document { self.docs = [self.docs dictionaryBySettingObject:document forKey:document.key]; } diff --git a/Firestore/Source/Local/FSTMutationQueue.h b/Firestore/Source/Local/FSTMutationQueue.h index 7a43957..89b1a52 100644 --- a/Firestore/Source/Local/FSTMutationQueue.h +++ b/Firestore/Source/Local/FSTMutationQueue.h @@ -43,9 +43,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)start; -/** Shuts this mutation queue down, closing open files, etc. */ -- (void)shutdown; - /** Returns YES if this queue contains no mutation batches. */ - (BOOL)isEmpty; diff --git a/Firestore/Source/Local/FSTQueryCache.h b/Firestore/Source/Local/FSTQueryCache.h index 607ef81..d797d49 100644 --- a/Firestore/Source/Local/FSTQueryCache.h +++ b/Firestore/Source/Local/FSTQueryCache.h @@ -40,9 +40,6 @@ NS_ASSUME_NONNULL_BEGIN /** Starts the query cache up. */ - (void)start; -/** Shuts this cache down, closing open files, etc. */ -- (void)shutdown; - /** * Returns the highest target ID of any query in the cache. Typically called during startup to * seed a target ID generator and avoid collisions with existing queries. If there are no queries diff --git a/Firestore/Source/Local/FSTRemoteDocumentCache.h b/Firestore/Source/Local/FSTRemoteDocumentCache.h index 3605111..2c6d872 100644 --- a/Firestore/Source/Local/FSTRemoteDocumentCache.h +++ b/Firestore/Source/Local/FSTRemoteDocumentCache.h @@ -34,9 +34,6 @@ NS_ASSUME_NONNULL_BEGIN */ @protocol FSTRemoteDocumentCache <NSObject> -/** Shuts this cache down, closing open files, etc. */ -- (void)shutdown; - /** * Adds or replaces an entry in the cache. * |