Skip to content

C++: eliminate FSTDispatchQueue and replace it with AsyncQueue #2062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 18, 2018
Merged

C++: eliminate FSTDispatchQueue and replace it with AsyncQueue #2062

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c497e4
# This is a combination of 2 commits.
var-const Nov 3, 2018
21fcf54
C++: eliminate `FSTDispatchQueue` and replace it with `AsyncQueue`.
var-const Nov 8, 2018
4267fcb
Wip
var-const Nov 13, 2018
c989a7b
Take 2
var-const Nov 13, 2018
8458189
style.sh
var-const Nov 13, 2018
1ed164b
Explicit lambda capture
var-const Nov 14, 2018
ef91e14
Forgotten file
var-const Nov 14, 2018
89cb9fc
Extend life of FSTFirestoreClient in integration tests
var-const Nov 16, 2018
b93027c
Merge branch 'master' into varconst/replace-fst-dispatch-queue
var-const Nov 16, 2018
2092157
remove extra strongself
var-const Nov 16, 2018
8f98a72
style.sh
var-const Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Firestore/Example/Firestore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@
6EDD3B6020BF25AE00C33877 /* FSTFuzzTestsPrincipal.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6EDD3B5E20BF24D000C33877 /* FSTFuzzTestsPrincipal.mm */; };
6F3CAC76D918D6B0917EDF92 /* query_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B9C261C26C5D311E1E3C0CB9 /* query_test.cc */; };
71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
7346E61D20325C6900FD6CEF /* FSTDispatchQueueTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7346E61C20325C6900FD6CEF /* FSTDispatchQueueTests.mm */; };
73866AA12082B0A5009BB4FF /* FIRArrayTransformTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 73866A9F2082B069009BB4FF /* FIRArrayTransformTests.mm */; };
73FE5066020EF9B2892C86BF /* hard_assert_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 444B7AB3F5A2929070CB1363 /* hard_assert_test.cc */; };
84DBE646DCB49305879D3500 /* nanopb_string_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 353EEE078EF3F39A9B7279F6 /* nanopb_string_test.cc */; };
Expand Down Expand Up @@ -308,7 +307,7 @@
2A0CF41BA5AED6049B0BEB2C /* type_traits_apple_test.mm */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.objcpp; path = type_traits_apple_test.mm; sourceTree = "<group>"; };
2B50B3A0DF77100EEE887891 /* Pods_Firestore_Tests_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Firestore_Tests_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
332485C4DCC6BA0DBB5E31B7 /* leveldb_util_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = leveldb_util_test.cc; sourceTree = "<group>"; };
353EEE078EF3F39A9B7279F6 /* nanopb_string_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; name = nanopb_string_test.cc; path = nanopb/nanopb_string_test.cc; sourceTree = "<group>"; };
353EEE078EF3F39A9B7279F6 /* nanopb_string_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = nanopb_string_test.cc; path = nanopb/nanopb_string_test.cc; sourceTree = "<group>"; };
358C3B5FE573B1D60A4F7592 /* strerror_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = strerror_test.cc; sourceTree = "<group>"; };
3B843E4A1F3930A400548890 /* remote_store_spec_test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = remote_store_spec_test.json; sourceTree = "<group>"; };
3C81DE3772628FE297055662 /* Pods-Firestore_Example_iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestore_Example_iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Firestore_Example_iOS/Pods-Firestore_Example_iOS.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -488,7 +487,6 @@
6EDD3B5C20BF247500C33877 /* Firestore_FuzzTests_iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Firestore_FuzzTests_iOS-Info.plist"; sourceTree = "<group>"; };
6EDD3B5E20BF24D000C33877 /* FSTFuzzTestsPrincipal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTFuzzTestsPrincipal.mm; sourceTree = "<group>"; };
71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7346E61C20325C6900FD6CEF /* FSTDispatchQueueTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTDispatchQueueTests.mm; sourceTree = "<group>"; };
73866A9F2082B069009BB4FF /* FIRArrayTransformTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRArrayTransformTests.mm; sourceTree = "<group>"; };
79507DF8378D3C42F5B36268 /* string_win_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = string_win_test.cc; sourceTree = "<group>"; };
84434E57CA72951015FC71BC /* Pods-Firestore_FuzzTests_iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestore_FuzzTests_iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Firestore_FuzzTests_iOS/Pods-Firestore_FuzzTests_iOS.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -526,6 +524,7 @@
B67BF448216EB43000CA9097 /* create_noop_connectivity_monitor.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = create_noop_connectivity_monitor.cc; sourceTree = "<group>"; };
B686F2AD2023DDB20028D6BE /* field_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = field_path_test.cc; sourceTree = "<group>"; };
B686F2B02024FFD70028D6BE /* resource_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_path_test.cc; sourceTree = "<group>"; };
B69CF05A219B9105004C434D /* FIRFirestore+Testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FIRFirestore+Testing.h"; sourceTree = "<group>"; };
B6BBE42F21262CF400C6A53E /* grpc_stream_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grpc_stream_test.cc; sourceTree = "<group>"; };
B6D1B68420E2AB1A00B35856 /* exponential_backoff_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exponential_backoff_test.cc; sourceTree = "<group>"; };
B6D9649021544D4F00EB9CFB /* grpc_connection_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grpc_connection_test.cc; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1161,7 +1160,7 @@
DE51B1851F0D48AC0013853F /* Util */ = {
isa = PBXGroup;
children = (
7346E61C20325C6900FD6CEF /* FSTDispatchQueueTests.mm */,
B69CF05A219B9105004C434D /* FIRFirestore+Testing.h */,
54E9281C1F33950B00C1953E /* FSTEventAccumulator.h */,
5492E0392021401F00B64F25 /* FSTEventAccumulator.mm */,
DE51B1881F0D48AC0013853F /* FSTHelpers.h */,
Expand Down Expand Up @@ -1878,7 +1877,6 @@
5492E058202154AB00B64F25 /* FSTAPIHelpers.mm in Sources */,
DE2EF0851F3D0B6E003D0CDC /* FSTArraySortedDictionaryTests.m in Sources */,
5492E0C82021557E00B64F25 /* FSTDatastoreTests.mm in Sources */,
7346E61D20325C6900FD6CEF /* FSTDispatchQueueTests.mm in Sources */,
5492E0B92021555100B64F25 /* FSTDocumentKeyTests.mm in Sources */,
5492E0BA2021555100B64F25 /* FSTDocumentSetTests.mm in Sources */,
5492E0BD2021555100B64F25 /* FSTDocumentTests.mm in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/Tests/API/FSTAPIHelpers.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
database:"abc"
persistenceKey:@"db123"
credentialsProvider:nil
workerDispatchQueue:nil
workerQueue:nil
firebaseApp:nil];
});
#pragma clang diagnostic pop
Expand Down
9 changes: 1 addition & 8 deletions Firestore/Example/Tests/Core/FSTEventManagerTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#import "Firestore/Source/Core/FSTQuery.h"
#import "Firestore/Source/Core/FSTSyncEngine.h"
#import "Firestore/Source/Model/FSTDocumentSet.h"
#import "Firestore/Source/Util/FSTDispatchQueue.h"

#import "Firestore/Example/Tests/Util/FSTHelpers.h"

Expand All @@ -49,13 +48,7 @@ @interface FSTEventManager () <FSTSyncEngineDelegate>
@interface FSTEventManagerTests : XCTestCase
@end

@implementation FSTEventManagerTests {
FSTDispatchQueue *_testUserQueue;
}

- (void)setUp {
_testUserQueue = [FSTDispatchQueue queueWith:dispatch_get_main_queue()];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_testUserQueue wasn't actually used.

}
@implementation FSTEventManagerTests

- (FSTQueryListener *)noopListenerForQuery:(FSTQuery *)query {
return [[FSTQueryListener alloc]
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/Tests/Core/FSTQueryListenerTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

using firebase::firestore::model::DocumentKeySet;
using firebase::firestore::model::OnlineState;
using firebase::firestore::util::internal::ExecutorLibdispatch;
using firebase::firestore::util::ExecutorLibdispatch;

NS_ASSUME_NONNULL_BEGIN

Expand Down
7 changes: 4 additions & 3 deletions Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
#import "Firestore/Source/API/FIRFirestore+Internal.h"
#import "Firestore/Source/Core/FSTFirestoreClient.h"
#import "Firestore/Source/Util/FSTDispatchQueue.h"

using firebase::firestore::util::TimerId;

@interface FIRDatabaseTests : FSTIntegrationTestCase
@end
Expand Down Expand Up @@ -1204,7 +1205,7 @@ - (void)testWriteStreamReconnectsAfterIdle {
FIRFirestore *firestore = doc.firestore;

[self writeDocumentRef:doc data:@{@"foo" : @"bar"}];
[[self queueForFirestore:firestore] runDelayedCallbacksUntil:FSTTimerIDWriteStreamIdle];
[self queueForFirestore:firestore] -> RunScheduledOperationsUntil(TimerId::WriteStreamIdle);
[self writeDocumentRef:doc data:@{@"foo" : @"bar"}];
}

Expand All @@ -1213,7 +1214,7 @@ - (void)testWatchStreamReconnectsAfterIdle {
FIRFirestore *firestore = doc.firestore;

[self readSnapshotForRef:[self documentRef] requireOnline:YES];
[[self queueForFirestore:firestore] runDelayedCallbacksUntil:FSTTimerIDListenStreamIdle];
[self queueForFirestore:firestore] -> RunScheduledOperationsUntil(TimerId::ListenStreamIdle);
[self readSnapshotForRef:[self documentRef] requireOnline:YES];
}

Expand Down
33 changes: 18 additions & 15 deletions Firestore/Example/Tests/Integration/FSTDatastoreTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#import <FirebaseFirestore/FIRTimestamp.h>
#import <XCTest/XCTest.h>

#include <memory>

#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
#import "Firestore/Source/API/FSTUserDataConverter.h"
#import "Firestore/Source/Core/FSTFirestoreClient.h"
Expand All @@ -31,16 +33,18 @@
#import "Firestore/Source/Remote/FSTDatastore.h"
#import "Firestore/Source/Remote/FSTRemoteEvent.h"
#import "Firestore/Source/Remote/FSTRemoteStore.h"
#import "Firestore/Source/Util/FSTDispatchQueue.h"

#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"

#include "Firestore/core/src/firebase/firestore/auth/empty_credentials_provider.h"
#include "Firestore/core/src/firebase/firestore/core/database_info.h"
#include "Firestore/core/src/firebase/firestore/model/database_id.h"
#include "Firestore/core/src/firebase/firestore/model/precondition.h"
#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h"
#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
#include "Firestore/core/src/firebase/firestore/util/string_apple.h"
#include "absl/memory/memory.h"

namespace util = firebase::firestore::util;
using firebase::firestore::auth::EmptyCredentialsProvider;
Expand All @@ -51,6 +55,8 @@
using firebase::firestore::model::Precondition;
using firebase::firestore::model::TargetId;
using firebase::firestore::remote::GrpcConnection;
using firebase::firestore::util::AsyncQueue;
using firebase::firestore::util::ExecutorLibdispatch;

NS_ASSUME_NONNULL_BEGIN

Expand Down Expand Up @@ -146,7 +152,7 @@ @interface FSTDatastoreTests : XCTestCase
@end

@implementation FSTDatastoreTests {
FSTDispatchQueue *_testWorkerQueue;
std::unique_ptr<AsyncQueue> _testWorkerQueue;
FSTLocalStore *_localStore;
EmptyCredentialsProvider _credentials;

Expand All @@ -169,29 +175,26 @@ - (void)setUp {
_databaseInfo =
DatabaseInfo(database_id, "test-key", util::MakeString(settings.host), settings.sslEnabled);

_testWorkerQueue = [FSTDispatchQueue
queueWith:dispatch_queue_create("com.google.firestore.FSTDatastoreTestsWorkerQueue",
DISPATCH_QUEUE_SERIAL)];

dispatch_queue_t queue = dispatch_queue_create(
"com.google.firestore.FSTDatastoreTestsWorkerQueue", DISPATCH_QUEUE_SERIAL);
_testWorkerQueue = absl::make_unique<AsyncQueue>(absl::make_unique<ExecutorLibdispatch>(queue));
_datastore = [FSTDatastore datastoreWithDatabase:&_databaseInfo
workerDispatchQueue:_testWorkerQueue
workerQueue:_testWorkerQueue.get()
credentials:&_credentials];

_remoteStore = [[FSTRemoteStore alloc] initWithLocalStore:_localStore
datastore:_datastore
workerDispatchQueue:_testWorkerQueue];
workerQueue:_testWorkerQueue.get()];

[_testWorkerQueue dispatchAsync:^() {
[_remoteStore start];
}];
_testWorkerQueue->Enqueue([=] { [_remoteStore start]; });
}

- (void)tearDown {
XCTestExpectation *completion = [self expectationWithDescription:@"shutdown"];
[_testWorkerQueue dispatchAsync:^{
_testWorkerQueue->Enqueue([=] {
[_remoteStore shutdown];
[completion fulfill];
}];
});
[self awaitExpectations];

[super tearDown];
Expand Down Expand Up @@ -219,12 +222,12 @@ - (void)testStreamingWrite {
FSTMutationBatch *batch = [[FSTMutationBatch alloc] initWithBatchID:23
localWriteTime:[FIRTimestamp timestamp]
mutations:@[ mutation ]];
[_testWorkerQueue dispatchAsync:^{
_testWorkerQueue->Enqueue([=] {
[_remoteStore addBatchToWritePipeline:batch];
// The added batch won't be written immediately because write stream wasn't yet open --
// trigger its opening.
[_remoteStore fillWritePipeline];
}];
});

[self awaitExpectations];
}
Expand Down
20 changes: 10 additions & 10 deletions Firestore/Example/Tests/SpecTests/FSTMockDatastore.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#import "Firestore/Source/Model/FSTMutation.h"
#import "Firestore/Source/Remote/FSTSerializerBeta.h"
#import "Firestore/Source/Remote/FSTStream.h"
#import "Firestore/Source/Util/FSTDispatchQueue.h"

#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"

Expand All @@ -37,6 +36,7 @@
#include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h"
#include "Firestore/core/src/firebase/firestore/remote/grpc_connection.h"
#include "Firestore/core/src/firebase/firestore/remote/stream.h"
#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
#include "Firestore/core/src/firebase/firestore/util/log.h"
#include "Firestore/core/src/firebase/firestore/util/string_apple.h"
#include "Firestore/core/test/firebase/firestore/util/create_noop_connectivity_monitor.h"
Expand Down Expand Up @@ -249,12 +249,13 @@ int sent_mutations_count() const {
@interface FSTMockDatastore ()

/** Properties implemented in FSTDatastore that are nonpublic. */
@property(nonatomic, strong, readonly) FSTDispatchQueue *workerDispatchQueue;
@property(nonatomic, assign, readonly) CredentialsProvider *credentials;

@end

@implementation FSTMockDatastore {
AsyncQueue *_workerQueue;

std::shared_ptr<MockWatchStream> _watchStream;
std::shared_ptr<MockWriteStream> _writeStream;

Expand All @@ -266,24 +267,23 @@ @implementation FSTMockDatastore {
#pragma mark - Overridden FSTDatastore methods.

- (instancetype)initWithDatabaseInfo:(const DatabaseInfo *)databaseInfo
workerDispatchQueue:(FSTDispatchQueue *)workerDispatchQueue
workerQueue:(AsyncQueue *)workerQueue
credentials:(CredentialsProvider *)credentials {
if (self = [super initWithDatabaseInfo:databaseInfo
workerDispatchQueue:workerDispatchQueue
workerQueue:workerQueue
credentials:credentials]) {
_workerDispatchQueue = workerDispatchQueue;
_workerQueue = workerQueue;
_credentials = credentials;
_connectivityMonitor = CreateNoOpConnectivityMonitor();
_grpcConnection =
absl::make_unique<GrpcConnection>(*databaseInfo, [workerDispatchQueue implementation],
&_grpcQueue, _connectivityMonitor.get());
_grpcConnection = absl::make_unique<GrpcConnection>(*databaseInfo, workerQueue, &_grpcQueue,
_connectivityMonitor.get());
}
return self;
}

- (std::shared_ptr<WatchStream>)createWatchStreamWithDelegate:(id<FSTWatchStreamDelegate>)delegate {
_watchStream = std::make_shared<MockWatchStream>(
[self.workerDispatchQueue implementation], self.credentials,
_workerQueue, self.credentials,
[[FSTSerializerBeta alloc] initWithDatabaseID:&self.databaseInfo->database_id()],
_grpcConnection.get(), delegate, self);

Expand All @@ -292,7 +292,7 @@ - (instancetype)initWithDatabaseInfo:(const DatabaseInfo *)databaseInfo

- (std::shared_ptr<WriteStream>)createWriteStreamWithDelegate:(id<FSTWriteStreamDelegate>)delegate {
_writeStream = std::make_shared<MockWriteStream>(
[self.workerDispatchQueue implementation], self.credentials,
_workerQueue, self.credentials,
[[FSTSerializerBeta alloc] initWithDatabaseID:&self.databaseInfo->database_id()],
_grpcConnection.get(), delegate, self);

Expand Down
17 changes: 9 additions & 8 deletions Firestore/Example/Tests/SpecTests/FSTSpecTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#import "Firestore/Source/Remote/FSTExistenceFilter.h"
#import "Firestore/Source/Remote/FSTWatchChange.h"
#import "Firestore/Source/Util/FSTClasses.h"
#import "Firestore/Source/Util/FSTDispatchQueue.h"

#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h"
Expand All @@ -41,6 +40,7 @@
#include "Firestore/core/src/firebase/firestore/auth/user.h"
#include "Firestore/core/src/firebase/firestore/model/document_key.h"
#include "Firestore/core/src/firebase/firestore/model/snapshot_version.h"
#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
#include "Firestore/core/src/firebase/firestore/util/log.h"
#include "Firestore/core/src/firebase/firestore/util/string_apple.h"
Expand All @@ -52,6 +52,7 @@
using firebase::firestore::model::DocumentKey;
using firebase::firestore::model::SnapshotVersion;
using firebase::firestore::model::TargetId;
using firebase::firestore::util::TimerId;

NS_ASSUME_NONNULL_BEGIN

Expand Down Expand Up @@ -373,19 +374,19 @@ - (void)doDrainQueue {
}

- (void)doRunTimer:(NSString *)timer {
FSTTimerID timerID;
TimerId timerID;
if ([timer isEqualToString:@"all"]) {
timerID = FSTTimerIDAll;
timerID = TimerId::All;
} else if ([timer isEqualToString:@"listen_stream_idle"]) {
timerID = FSTTimerIDListenStreamIdle;
timerID = TimerId::ListenStreamIdle;
} else if ([timer isEqualToString:@"listen_stream_connection_backoff"]) {
timerID = FSTTimerIDListenStreamConnectionBackoff;
timerID = TimerId::ListenStreamConnectionBackoff;
} else if ([timer isEqualToString:@"write_stream_idle"]) {
timerID = FSTTimerIDWriteStreamIdle;
timerID = TimerId::WriteStreamIdle;
} else if ([timer isEqualToString:@"write_stream_connection_backoff"]) {
timerID = FSTTimerIDWriteStreamConnectionBackoff;
timerID = TimerId::WriteStreamConnectionBackoff;
} else if ([timer isEqualToString:@"online_state_timeout"]) {
timerID = FSTTimerIDOnlineStateTimeout;
timerID = TimerId::OnlineStateTimeout;
} else {
HARD_FAIL("runTimer spec step specified unknown timer: %s", timer);
}
Expand Down
6 changes: 3 additions & 3 deletions Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
#include <unordered_map>

#import "Firestore/Source/Remote/FSTRemoteStore.h"
#import "Firestore/Source/Util/FSTDispatchQueue.h"

#include "Firestore/core/src/firebase/firestore/auth/user.h"
#include "Firestore/core/src/firebase/firestore/model/document_key.h"
#include "Firestore/core/src/firebase/firestore/model/snapshot_version.h"
#include "Firestore/core/src/firebase/firestore/model/types.h"
#include "Firestore/core/src/firebase/firestore/util/async_queue.h"

@class FSTDocumentKey;
@class FSTMutation;
Expand Down Expand Up @@ -227,9 +227,9 @@ typedef std::unordered_map<firebase::firestore::auth::User,
- (void)enableNetwork;

/**
* Runs a pending timer callback on the FSTDispatchQueue.
* Runs a pending timer callback on the worker queue.
*/
- (void)runTimer:(FSTTimerID)timerID;
- (void)runTimer:(firebase::firestore::util::TimerId)timerID;

/**
* Switches the FSTSyncEngine to a new user. The test driver tracks the outstanding mutations for
Expand Down
Loading