diff options
| author |  zxu <zxu@google.com> | 2018-03-16 15:42:05 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-16 15:42:05 -0400 |
| commit | 4e7296b080b9c8cea13e5e5eeee65f4312fb5e8a (patch) | |
| tree | 87f175b1e1ac74632fee2ff7c52ccb9b5bc78014 /Firestore/Source/Core/FSTTransaction.mm | |
| parent | 1395c8202b236188b9e4e1bfc2a3e00244179593 (diff) | |
port `DocumentKey` to non-container types of `Model/*` (#930)
* naively remove FSTPath import and source/test files.
* port FieldPath, part I
* port FieldPath, part II
* port ResourcePath, part I
* port ResourcePath, part II
* the grand commit to fix build errors
* use testutil:: helper instead of those from FSTHelpers
* fix test and lint
* use c_str in errmsg directly
* fix
* fix
* make code clean
* fix integration test I missed
* fix to avoid naming collision in preprocessor
* address changes
* address changes
* address changes
* fix: fieldMask are actually shared with different context.
* address changes
* add converter function between two DocumentKey implementations
* add unit test
* address changes
* fix lint
* using DocumentKey in model except for the container types `FSTDocumentDictionary`, `FSTDocumentKeySet`, and `FSTDocumentVersionDictionary`
* change other place w.r.t. the use of `DocumentKey` in model
* update parameter of test helpers from NSString to string_view
* revert a temporary change used in debug
* address changes
Diffstat (limited to 'Firestore/Source/Core/FSTTransaction.mm')
| -rw-r--r-- | Firestore/Source/Core/FSTTransaction.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Firestore/Source/Core/FSTTransaction.mm b/Firestore/Source/Core/FSTTransaction.mm index f97888a..b980a4e 100644 --- a/Firestore/Source/Core/FSTTransaction.mm +++ b/Firestore/Source/Core/FSTTransaction.mm @@ -30,6 +30,8 @@ #import "Firestore/Source/Util/FSTAssert.h" #import "Firestore/Source/Util/FSTUsageValidation.h" +#include "Firestore/core/src/firebase/firestore/model/document_key.h" + NS_ASSUME_NONNULL_BEGIN #pragma mark - FSTTransaction @@ -79,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN // when writing. docVersion = [FSTSnapshotVersion noVersion]; } - FSTSnapshotVersion *existingVersion = self.readVersions[doc.key]; + FSTSnapshotVersion *existingVersion = self.readVersions[(FSTDocumentKey *)doc.key]; if (existingVersion) { if (error) { *error = @@ -92,7 +94,7 @@ NS_ASSUME_NONNULL_BEGIN } return NO; } else { - self.readVersions[doc.key] = docVersion; + self.readVersions[(FSTDocumentKey *)doc.key] = docVersion; return YES; } } |