diff options
| author |  zxu <zxu@google.com> | 2018-04-25 14:13:57 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-25 14:13:57 -0400 |
| commit | ff32b59036f35512c64fcd75ae5cee8aca228929 (patch) | |
| tree | 9b09fff01e1ce3546c25f162f703b782c9fbca61 /Firestore/Source/Local | |
| parent | f9bd6d3c9491dddbfc9cbe0fcc633030a66fe9da (diff) | |
Port `SnapshotVersion` for `Remote` (#1174)
* no-brainer replace FSTSnapshotVersion by SnapshotVersion in `Remote`
* delete `FSTSnapshotVersion` in `Remote`
* fix test
* partially revert RemoteEvent
* Revert "partially revert RemoteEvent"
This reverts commit 67e35bb6c11eaf79608df8d02a60788a40331d0f.
* fix a bug
* fix integration
* address changes
Diffstat (limited to 'Firestore/Source/Local')
| -rw-r--r-- | Firestore/Source/Local/FSTLocalSerializer.mm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Firestore/Source/Local/FSTLocalSerializer.mm b/Firestore/Source/Local/FSTLocalSerializer.mm index d20f50b..652fa5f 100644 --- a/Firestore/Source/Local/FSTLocalSerializer.mm +++ b/Firestore/Source/Local/FSTLocalSerializer.mm @@ -30,9 +30,11 @@ #import "Firestore/Source/Remote/FSTSerializerBeta.h" #import "Firestore/Source/Util/FSTAssert.h" +#include "Firestore/core/include/firebase/firestore/timestamp.h" #include "Firestore/core/src/firebase/firestore/model/document_key.h" #include "Firestore/core/src/firebase/firestore/model/snapshot_version.h" +using firebase::Timestamp; using firebase::firestore::model::DocumentKey; using firebase::firestore::model::SnapshotVersion; @@ -130,7 +132,8 @@ using firebase::firestore::model::SnapshotVersion; FSTPBWriteBatch *proto = [FSTPBWriteBatch message]; proto.batchId = batch.batchID; - proto.localWriteTime = [remoteSerializer encodedTimestamp:batch.localWriteTime]; + proto.localWriteTime = [remoteSerializer + encodedTimestamp:Timestamp{batch.localWriteTime.seconds, batch.localWriteTime.nanoseconds}]; NSMutableArray<GCFSWrite *> *writes = proto.writesArray; for (FSTMutation *mutation in batch.mutations) { @@ -148,11 +151,13 @@ using firebase::firestore::model::SnapshotVersion; [mutations addObject:[remoteSerializer decodedMutation:write]]; } - FIRTimestamp *localWriteTime = [remoteSerializer decodedTimestamp:batch.localWriteTime]; + Timestamp localWriteTime = [remoteSerializer decodedTimestamp:batch.localWriteTime]; - return [[FSTMutationBatch alloc] initWithBatchID:batchID - localWriteTime:localWriteTime - mutations:mutations]; + return [[FSTMutationBatch alloc] + initWithBatchID:batchID + localWriteTime:[FIRTimestamp timestampWithSeconds:localWriteTime.seconds() + nanoseconds:localWriteTime.nanoseconds()] + mutations:mutations]; } - (FSTPBTarget *)encodedQueryData:(FSTQueryData *)queryData { |