Skip to content
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

Held Write Acks Unit Test Fixes #2008

Merged
merged 5 commits into from
Oct 29, 2018
Merged

Held Write Acks Unit Test Fixes #2008

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13e20ee
View changes for held write acks
schmidt-sebastian Oct 24, 2018
ff43d95
Merge branch 'held_acks_master' into mrschmidt-viewchanges
schmidt-sebastian Oct 25, 2018
7ec18e0
Held Write Acks Unit Test Fixes
schmidt-sebastian Oct 25, 2018
4e8e8bc
Fix LocalStore
schmidt-sebastian Oct 26, 2018
37994c1
Merge
schmidt-sebastian Oct 26, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix LocalStore
  • Loading branch information
@schmidt-sebastian
schmidt-sebastian committed Oct 26, 2018
commit 4e8e8bc809cda25db85ae15d8105abd08a42077c
4 changes: 2 additions & 2 deletions Firestore/Source/Local/FSTLocalStore.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ - (FSTMaybeDocumentDictionary *)applyRemoteEvent:(FSTRemoteEvent *)remoteEvent {
// to the remote cache. We make an exception for SnapshotVersion.MIN which can happen for
// manufactured events (e.g. in the case of a limbo document resolution failing).
if (!existingDoc || doc.version == SnapshotVersion::None() ||
authoritativeUpdates.contains(doc.key) ||
(doc.version >= existingDoc.version && !existingDoc.hasPendingWrites)) {
(authoritativeUpdates.contains(doc.key) && !existingDoc.hasPendingWrites) ||
doc.version >= existingDoc.version) {
[self.remoteDocumentCache addEntry:doc];
} else {
LOG_DEBUG(
Expand Down