Skip to content

Commit 0c11224

Browse files
authored
Delete FSTDocumentKey (#3203)
1 parent 10752cd commit 0c11224

File tree

7 files changed

+6
-187
lines changed

7 files changed

+6
-187
lines changed

Firestore/Example/Firestore.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@
263263
5492E0AD2021552D00B64F25 /* FSTMemoryMutationQueueTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0972021552C00B64F25 /* FSTMemoryMutationQueueTests.mm */; };
264264
5492E0AE2021552D00B64F25 /* FSTLevelDBQueryCacheTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0982021552C00B64F25 /* FSTLevelDBQueryCacheTests.mm */; };
265265
5492E0B12021552D00B64F25 /* FSTRemoteDocumentCacheTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E09C2021552D00B64F25 /* FSTRemoteDocumentCacheTests.mm */; };
266-
5492E0B92021555100B64F25 /* FSTDocumentKeyTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0B22021555000B64F25 /* FSTDocumentKeyTests.mm */; };
267266
5492E0BA2021555100B64F25 /* FSTDocumentSetTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0B32021555100B64F25 /* FSTDocumentSetTests.mm */; };
268267
5492E0BD2021555100B64F25 /* FSTDocumentTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0B62021555100B64F25 /* FSTDocumentTests.mm */; };
269268
5492E0BE2021555100B64F25 /* FSTMutationTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0B72021555100B64F25 /* FSTMutationTests.mm */; };
@@ -457,7 +456,6 @@
457456
938F2AF6EC5CD0B839300DB0 /* query.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D621C2DDC800EFB9CC /* query.pb.cc */; };
458457
939A15D3AD941CF7242DA9FA /* FSTLevelDBLRUGarbageCollectorTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CC9650620A0E9C600A2D6A1 /* FSTLevelDBLRUGarbageCollectorTests.mm */; };
459458
939C898FE9D129F6A2EA259C /* FSTHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E03A2021401F00B64F25 /* FSTHelpers.mm */; };
460-
94E5399FA5EA82CCB0549AB5 /* FSTDocumentKeyTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0B22021555000B64F25 /* FSTDocumentKeyTests.mm */; };
461459
95ED06D2B0078D3CDB821B68 /* FIRArrayTransformTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 73866A9F2082B069009BB4FF /* FIRArrayTransformTests.mm */; };
462460
9664E5831CE35D515CDBC12A /* FSTRemoteDocumentCacheTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E09C2021552D00B64F25 /* FSTRemoteDocumentCacheTests.mm */; };
463461
974FF09E6AFD24D5A39B898B /* local_serializer_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = F8043813A5D16963EC02B182 /* local_serializer_test.cc */; };
@@ -543,7 +541,6 @@
543541
B6FB4690208F9BB300554BA2 /* executor_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6FB4688208F9B9100554BA2 /* executor_test.cc */; };
544542
B6FDE6F91D3F81D045E962A0 /* bits_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB380D01201BC69F00D97691 /* bits_test.cc */; };
545543
B8062EBDB8E5B680E46A6DD1 /* geo_point_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB7BAB332012B519001E0872 /* geo_point_test.cc */; };
546-
B89EF6551734723BDC6AB79C /* FSTDocumentKeyTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0B22021555000B64F25 /* FSTDocumentKeyTests.mm */; };
547544
BA9A65BD6D993B2801A3C768 /* grpc_connection_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6D9649021544D4F00EB9CFB /* grpc_connection_test.cc */; };
548545
BAB43C839445782040657239 /* executor_std_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6FB4687208F9B9100554BA2 /* executor_std_test.cc */; };
549546
BBFCCD960DD2937EE278D7B6 /* FSTQueryCacheTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0892021552A00B64F25 /* FSTQueryCacheTests.mm */; };
@@ -860,7 +857,6 @@
860857
5492E0982021552C00B64F25 /* FSTLevelDBQueryCacheTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTLevelDBQueryCacheTests.mm; sourceTree = "<group>"; };
861858
5492E0992021552C00B64F25 /* FSTPersistenceTestHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSTPersistenceTestHelpers.h; sourceTree = "<group>"; };
862859
5492E09C2021552D00B64F25 /* FSTRemoteDocumentCacheTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTRemoteDocumentCacheTests.mm; sourceTree = "<group>"; };
863-
5492E0B22021555000B64F25 /* FSTDocumentKeyTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTDocumentKeyTests.mm; sourceTree = "<group>"; };
864860
5492E0B32021555100B64F25 /* FSTDocumentSetTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTDocumentSetTests.mm; sourceTree = "<group>"; };
865861
5492E0B62021555100B64F25 /* FSTDocumentTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTDocumentTests.mm; sourceTree = "<group>"; };
866862
5492E0B72021555100B64F25 /* FSTMutationTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTMutationTests.mm; sourceTree = "<group>"; };
@@ -1794,7 +1790,6 @@
17941790
DE51B17B1F0D48AC0013853F /* Model */ = {
17951791
isa = PBXGroup;
17961792
children = (
1797-
5492E0B22021555000B64F25 /* FSTDocumentKeyTests.mm */,
17981793
5492E0B32021555100B64F25 /* FSTDocumentSetTests.mm */,
17991794
5492E0B62021555100B64F25 /* FSTDocumentTests.mm */,
18001795
5492E0B72021555100B64F25 /* FSTMutationTests.mm */,
@@ -3001,7 +2996,6 @@
30012996
CD0AA9E5D83C00CAAE7C2F67 /* FIRTimestampTest.m in Sources */,
30022997
9D71628E38D9F64C965DF29E /* FSTAPIHelpers.mm in Sources */,
30032998
10B7426844685A48234C093B /* FSTArraySortedDictionaryTests.m in Sources */,
3004-
B89EF6551734723BDC6AB79C /* FSTDocumentKeyTests.mm in Sources */,
30052999
F8D3EF0C9044BB3F3E81C6CA /* FSTDocumentSetTests.mm in Sources */,
30063000
E980E1DCF759D5EF9F6B98F2 /* FSTDocumentTests.mm in Sources */,
30073001
F4F00BF4E87D7F0F0F8831DB /* FSTEventAccumulator.mm in Sources */,
@@ -3177,7 +3171,6 @@
31773171
36E174A66C323891AEA16A2A /* FIRTimestampTest.m in Sources */,
31783172
6E4854B19B120C6F0F8192CC /* FSTAPIHelpers.mm in Sources */,
31793173
F1661B1C5F3E30535FB65046 /* FSTArraySortedDictionaryTests.m in Sources */,
3180-
94E5399FA5EA82CCB0549AB5 /* FSTDocumentKeyTests.mm in Sources */,
31813174
C13502E39B0AEF0FADDDA5F2 /* FSTDocumentSetTests.mm in Sources */,
31823175
4E679B9AA80202184D459569 /* FSTDocumentTests.mm in Sources */,
31833176
73E42D984FB36173A2BDA57C /* FSTEventAccumulator.mm in Sources */,
@@ -3430,7 +3423,6 @@
34303423
B65D34A9203C995B0076A5E1 /* FIRTimestampTest.m in Sources */,
34313424
5492E058202154AB00B64F25 /* FSTAPIHelpers.mm in Sources */,
34323425
DE2EF0851F3D0B6E003D0CDC /* FSTArraySortedDictionaryTests.m in Sources */,
3433-
5492E0B92021555100B64F25 /* FSTDocumentKeyTests.mm in Sources */,
34343426
5492E0BA2021555100B64F25 /* FSTDocumentSetTests.mm in Sources */,
34353427
5492E0BD2021555100B64F25 /* FSTDocumentTests.mm in Sources */,
34363428
5492E03E2021401F00B64F25 /* FSTEventAccumulator.mm in Sources */,

Firestore/Example/Tests/Model/FSTDocumentKeyTests.mm

Lines changed: 0 additions & 46 deletions
This file was deleted.

Firestore/Example/Tests/Remote/FSTSerializerBetaTests.mm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#import "Firestore/Source/Core/FSTQuery.h"
4040
#import "Firestore/Source/Local/FSTQueryData.h"
4141
#import "Firestore/Source/Model/FSTDocument.h"
42-
#import "Firestore/Source/Model/FSTDocumentKey.h"
4342
#import "Firestore/Source/Model/FSTMutation.h"
4443
#import "Firestore/Source/Model/FSTMutationBatch.h"
4544

@@ -49,6 +48,7 @@
4948
#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
5049
#include "Firestore/core/src/firebase/firestore/model/database_id.h"
5150
#include "Firestore/core/src/firebase/firestore/model/field_mask.h"
51+
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
5252
#include "Firestore/core/src/firebase/firestore/model/field_transform.h"
5353
#include "Firestore/core/src/firebase/firestore/model/field_value.h"
5454
#include "Firestore/core/src/firebase/firestore/model/precondition.h"
@@ -63,7 +63,9 @@
6363
using firebase::Timestamp;
6464
using firebase::firestore::FirestoreErrorCode;
6565
using firebase::firestore::model::DatabaseId;
66+
using firebase::firestore::model::DocumentKey;
6667
using firebase::firestore::model::FieldMask;
68+
using firebase::firestore::model::FieldPath;
6769
using firebase::firestore::model::FieldTransform;
6870
using firebase::firestore::model::FieldValue;
6971
using firebase::firestore::model::ObjectValue;
@@ -101,6 +103,9 @@ bool IsWatchChangeEqual(const WatchChange &lhs, const WatchChange &rhs) {
101103
UNREACHABLE();
102104
}
103105

106+
NSString *const kDocumentKeyPath =
107+
[[NSString alloc] initWithUTF8String:FieldPath::kDocumentKeyPath];
108+
104109
} // namespace
105110

106111
NS_ASSUME_NONNULL_BEGIN

Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "Firestore/core/src/firebase/firestore/remote/watch_change.h"
3030
#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
3131

32-
@class FSTDocumentKey;
3332
@class FSTMutation;
3433
@class FSTMutationResult;
3534
@class FSTQuery;

Firestore/Source/Model/FSTDocumentKey.h

Lines changed: 0 additions & 45 deletions
This file was deleted.

Firestore/Source/Model/FSTDocumentKey.mm

Lines changed: 0 additions & 85 deletions
This file was deleted.

Firestore/core/test/firebase/firestore/testutil/xcgmock.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ OBJC_PRINT_TO(FSTDeleteFieldValue);
150150
OBJC_PRINT_TO(FSTDeleteMutation);
151151
OBJC_PRINT_TO(FSTDeletedDocument);
152152
OBJC_PRINT_TO(FSTDocument);
153-
OBJC_PRINT_TO(FSTDocumentKey);
154153
OBJC_PRINT_TO(FSTDocumentKeyReference);
155154
OBJC_PRINT_TO(FSTDocumentSet);
156155
OBJC_PRINT_TO(FSTEventManager);

0 commit comments

Comments
 (0)