Skip to content

Add expected count to Target #10872

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 14 commits into from
Mar 8, 2023
Merged

Add expected count to Target #10872

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f4e89c8
initial code
milaGGL Feb 27, 2023
784723d
add spec tests for expectedCount in target
milaGGL Feb 27, 2023
7595a55
update TargetData
milaGGL Feb 27, 2023
e7dae4d
format
milaGGL Feb 28, 2023
51198ea
remove snapshotVersion.None() check
milaGGL Feb 28, 2023
0352570
resolve comments
milaGGL Mar 1, 2023
8194ec4
Update serializer_test.cc
milaGGL Mar 2, 2023
cf4b78a
make expected_count optional in proto
milaGGL Mar 2, 2023
806dd6b
assert proto.has_expected_count() in proto
milaGGL Mar 2, 2023
fba627e
Merge branch 'mila/BloomFilter' into mila/BloomFilter-add-expected-co…
milaGGL Mar 3, 2023
792eb79
resolve comments
milaGGL Mar 3, 2023
da6bdb8
resolve comments
milaGGL Mar 6, 2023
a70c210
format
milaGGL Mar 6, 2023
f337877
resolve comments
milaGGL Mar 7, 2023
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
5 changes: 5 additions & 0 deletions Firestore/Example/Tests/SpecTests/FSTMockDatastore.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ void WatchQuery(const TargetData& query) override {
// Snapshot version is ignored on the wire
TargetData sentTargetData =
query.WithResumeToken(query.resume_token(), SnapshotVersion::None());

if (query.expected_count().has_value()) {
sentTargetData = sentTargetData.WithExpectedCount(query.expected_count().value());
}

datastore_->IncrementWatchStreamRequests();
active_targets_[query.target_id()] = sentTargetData;
}
Expand Down
10 changes: 9 additions & 1 deletion Firestore/Example/Tests/SpecTests/FSTSpecTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,10 @@ - (void)validateExpectedState:(nullable NSDictionary *)expectedState {
target_data = target_data.WithResumeToken(
ByteString(), [self parseVersion:queryData[@"readTime"]]);
}

if ([queryData objectForKey:@"expectedCount"] != nil) {
target_data = target_data.WithExpectedCount([queryData[@"expectedCount"] intValue]);
}
queries.push_back(std::move(target_data));
}
expectedActiveTargets[targetID] = std::move(queries);
Expand Down Expand Up @@ -896,7 +900,11 @@ - (void)validateActiveTargets {
XCTAssertEqual(actual.target_id(), targetData.target_id());
XCTAssertEqual(actual.snapshot_version(), targetData.snapshot_version());
XCTAssertEqual(actual.resume_token(), targetData.resume_token());

if (targetData.expected_count().has_value()) {
HARD_ASSERT(actual.expected_count().has_value(),
"Actual Target data doesn't have expected count.");
XCTAssertEqual(actual.expected_count().value(), targetData.expected_count().value());
}
actualTargets.erase(targetID);
}

Expand Down
Loading