Skip to content

Commit 6cc1a44

Browse files
wilhuffwilhuff
authored
Clean up Objective-C interop and other dead code (#4601)
* Remove unused -[FIRFirestore isLoggingEnabled] Use util::LogIsLoggable(util::kLogLevelDebug) directly. * Remove objc_compatibility.h * Remove/cleanup unused #if __OBJC__ blocks * Remove dead code * Remove MakeNSStringNoCopy * Remove worthless include * Tidy up FIRFirestore * Remove dead code and use forward declarations in FSTHelpers * Minor fixes for LevelDbTransaction: * Make methods const where possible * Make key() and value() return const std::string&, allowing callers to create their own const references * Remove Comparator<NSString*>
1 parent 0131392 commit 6cc1a44

26 files changed

+53
-470
lines changed

‎Firestore/Example/Firestore.xcodeproj/project.pbxproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@
616616
7394B5C29C6E524C2AF964E6 /* counting_query_engine.cc in Sources */ = {isa = PBXBuildFile; fileRef = 99434327614FEFF7F7DC88EC /* counting_query_engine.cc */; };
617617
73E42D984FB36173A2BDA57C /* FSTEventAccumulator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E0392021401F00B64F25 /* FSTEventAccumulator.mm */; };
618618
73FE5066020EF9B2892C86BF /* hard_assert_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 444B7AB3F5A2929070CB1363 /* hard_assert_test.cc */; };
619-
7400AC9377419A28B782B5EC /* objc_compatibility_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B696858F221770F000271095 /* objc_compatibility_apple_test.mm */; };
620619
7495E3BAE536CD839EE20F31 /* FSTLevelDBSpecTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E02C20213FFB00B64F25 /* FSTLevelDBSpecTests.mm */; };
621620
74985DE2C7EF4150D7A455FD /* statusor_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54A0352D20A3B3D7003E0143 /* statusor_test.cc */; };
622621
74C258673E348DA91ACAB95B /* query_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = A1C8236D0FBB4374D486D11D /* query_cache_test.cc */; };
@@ -767,7 +766,6 @@
767766
A2346D231C8021698F0BDD13 /* fake_credentials_provider.cc in Sources */ = {isa = PBXBuildFile; fileRef = B60894F62170207100EBC644 /* fake_credentials_provider.cc */; };
768767
A25FF76DEF542E01A2DF3B0E /* time_testing.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5497CB76229DECDE000FB92F /* time_testing.cc */; };
769768
A27096F764227BC73526FED3 /* leveldb_remote_document_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0840319686A223CC4AD3FAB1 /* leveldb_remote_document_cache_test.cc */; };
770-
A4237B1E55F30FE40DCB28C8 /* objc_compatibility_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B696858F221770F000271095 /* objc_compatibility_apple_test.mm */; };
771769
A478FDD7C3F48FBFDDA7D8F5 /* leveldb_mutation_queue_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C7942B6244F4C416B11B86C /* leveldb_mutation_queue_test.cc */; };
772770
A4AD189BDEF7A609953457A6 /* leveldb_key_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54995F6E205B6E12004EFFA0 /* leveldb_key_test.cc */; };
773771
A4ECA8335000CBDF94586C94 /* FSTDatastoreTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E07E202154EC00B64F25 /* FSTDatastoreTests.mm */; };
@@ -864,7 +862,6 @@
864862
B686F2B22025000D0028D6BE /* resource_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2B02024FFD70028D6BE /* resource_path_test.cc */; };
865863
B68B1E012213A765008977EF /* to_string_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B68B1E002213A764008977EF /* to_string_apple_test.mm */; };
866864
B696858E2214B53900271095 /* to_string_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B696858D2214B53900271095 /* to_string_test.cc */; };
867-
B6968590221770F100271095 /* objc_compatibility_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B696858F221770F000271095 /* objc_compatibility_apple_test.mm */; };
868865
B69CF3F12227386500B281C8 /* hashing_test_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = B69CF3F02227386500B281C8 /* hashing_test_apple.mm */; };
869866
B6BBE43121262CF400C6A53E /* grpc_stream_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6BBE42F21262CF400C6A53E /* grpc_stream_test.cc */; };
870867
B6BF6EFEF887B072068BA658 /* executor_libdispatch_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6FB4689208F9B9100554BA2 /* executor_libdispatch_test.mm */; };
@@ -878,7 +875,6 @@
878875
B6FB468E208F9BAB00554BA2 /* executor_libdispatch_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6FB4689208F9B9100554BA2 /* executor_libdispatch_test.mm */; };
879876
B6FB468F208F9BAE00554BA2 /* executor_std_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6FB4687208F9B9100554BA2 /* executor_std_test.cc */; };
880877
B6FB4690208F9BB300554BA2 /* executor_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6FB4688208F9B9100554BA2 /* executor_test.cc */; };
881-
B6FD2025121D5738643C24C8 /* objc_compatibility_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B696858F221770F000271095 /* objc_compatibility_apple_test.mm */; };
882878
B6FDE6F91D3F81D045E962A0 /* bits_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB380D01201BC69F00D97691 /* bits_test.cc */; };
883879
B743F4E121E879EF34536A51 /* leveldb_index_manager_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 166CE73C03AB4366AAC5201C /* leveldb_index_manager_test.cc */; };
884880
B7DD5FC63A78FF00E80332C0 /* grpc_stream_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6BBE42F21262CF400C6A53E /* grpc_stream_test.cc */; };
@@ -981,7 +977,6 @@
981977
D4D8BA32ACC5C2B1B29711C0 /* memory_lru_garbage_collector_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9765D47FA12FA283F4EFAD02 /* memory_lru_garbage_collector_test.cc */; };
982978
D541EA6C61FBB8913BA5C3C3 /* field_value_benchmark.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D0EE49C1D5AF75664D0EBE4 /* field_value_benchmark.cc */; };
983979
D550446303227FB1B381133C /* FSTAPIHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E04E202154AA00B64F25 /* FSTAPIHelpers.mm */; };
984-
D572B4D4DBDD6B9235781646 /* objc_compatibility_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B696858F221770F000271095 /* objc_compatibility_apple_test.mm */; };
985980
D57F4CB3C92CE3D4DF329B78 /* serializer_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 61F72C5520BC48FD001A68CB /* serializer_test.cc */; };
986981
D59FAEE934987D4C4B2A67B2 /* FIRFirestoreTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5467FAFF203E56F8009C9584 /* FIRFirestoreTests.mm */; };
987982
D5B252EE3F4037405DB1ECE3 /* FIRNumericTransformTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = D5B25E7E7D6873CBA4571841 /* FIRNumericTransformTests.mm */; };
@@ -1049,7 +1044,6 @@
10491044
E32342AE5CEE70C343493528 /* grpc_stream_tester.cc in Sources */ = {isa = PBXBuildFile; fileRef = B1A7E1959AF8141FA7E6B888 /* grpc_stream_tester.cc */; };
10501045
E3319DC1804B69F0ED1FFE02 /* memory_mutation_queue_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 74FBEFA4FE4B12C435011763 /* memory_mutation_queue_test.cc */; };
10511046
E375FBA0632EFB4D14C4E5A9 /* FSTGoogleTestTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 54764FAE1FAA21B90085E60A /* FSTGoogleTestTests.mm */; };
1052-
E387401C33D1E3F21E5550EA /* objc_compatibility_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = B696858F221770F000271095 /* objc_compatibility_apple_test.mm */; };
10531047
E435450184AEB51EE8435F66 /* write.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D921C2DDC800EFB9CC /* write.pb.cc */; };
10541048
E4A573B7C9227C3C24661B5B /* ordered_code_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB380D03201BC6E400D97691 /* ordered_code_test.cc */; };
10551049
E4EEF6AAFCD33303CE9E5408 /* field_value_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB356EF6200EA5EB0089B766 /* field_value_test.cc */; };
@@ -1472,7 +1466,6 @@
14721466
B686F2B02024FFD70028D6BE /* resource_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_path_test.cc; sourceTree = "<group>"; };
14731467
B68B1E002213A764008977EF /* to_string_apple_test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = to_string_apple_test.mm; sourceTree = "<group>"; };
14741468
B696858D2214B53900271095 /* to_string_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = to_string_test.cc; sourceTree = "<group>"; };
1475-
B696858F221770F000271095 /* objc_compatibility_apple_test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = objc_compatibility_apple_test.mm; sourceTree = "<group>"; };
14761469
B69CF05A219B9105004C434D /* FIRFirestore+Testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FIRFirestore+Testing.h"; sourceTree = "<group>"; };
14771470
B69CF3F02227386500B281C8 /* hashing_test_apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = hashing_test_apple.mm; sourceTree = "<group>"; };
14781471
B6BBE42F21262CF400C6A53E /* grpc_stream_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grpc_stream_test.cc; sourceTree = "<group>"; };
@@ -1763,7 +1756,6 @@
17631756
B69CF3F02227386500B281C8 /* hashing_test_apple.mm */,
17641757
54A0353420A3D8CB003E0143 /* iterator_adaptors_test.cc */,
17651758
54C2294E1FECABAE007D065B /* log_test.cc */,
1766-
B696858F221770F000271095 /* objc_compatibility_apple_test.mm */,
17671759
0473AFFF5567E667A125347B /* ordered_code_benchmark.cc */,
17681760
AB380D03201BC6E400D97691 /* ordered_code_test.cc */,
17691761
403DBF6EFB541DFD01582AA3 /* path_test.cc */,
@@ -3454,7 +3446,6 @@
34543446
0DBD29A16030CDCD55E38CAB /* mutation_queue_test.cc in Sources */,
34553447
1CC9BABDD52B2A1E37E2698D /* mutation_test.cc in Sources */,
34563448
051D3E20184AF195266EF678 /* no_document_test.cc in Sources */,
3457-
D572B4D4DBDD6B9235781646 /* objc_compatibility_apple_test.mm in Sources */,
34583449
16FE432587C1B40AF08613D2 /* objc_type_traits_apple_test.mm in Sources */,
34593450
E08297B35E12106105F448EB /* ordered_code_benchmark.cc in Sources */,
34603451
72AD91671629697074F2545B /* ordered_code_test.cc in Sources */,
@@ -3627,7 +3618,6 @@
36273618
94BBB23B93E449D03FA34F87 /* mutation_queue_test.cc in Sources */,
36283619
5E6F9184B271F6D5312412FF /* mutation_test.cc in Sources */,
36293620
FEF55ECFB0CA317B351179AB /* no_document_test.cc in Sources */,
3630-
7400AC9377419A28B782B5EC /* objc_compatibility_apple_test.mm in Sources */,
36313621
9AC28D928902C6767A11F5FC /* objc_type_traits_apple_test.mm in Sources */,
36323622
B3C87C635527A2E57944B789 /* ordered_code_benchmark.cc in Sources */,
36333623
FD8EA96A604E837092ACA51D /* ordered_code_test.cc in Sources */,
@@ -3811,7 +3801,6 @@
38113801
C8A573895D819A92BF16B5E5 /* mutation_queue_test.cc in Sources */,
38123802
F5A654E92FF6F3FF16B93E6B /* mutation_test.cc in Sources */,
38133803
1E1683C9F65658270745EDCD /* no_document_test.cc in Sources */,
3814-
A4237B1E55F30FE40DCB28C8 /* objc_compatibility_apple_test.mm in Sources */,
38153804
C524026444E83EEBC1773650 /* objc_type_traits_apple_test.mm in Sources */,
38163805
28691225046DF9DF181B3350 /* ordered_code_benchmark.cc in Sources */,
38173806
E4A573B7C9227C3C24661B5B /* ordered_code_test.cc in Sources */,
@@ -3995,7 +3984,6 @@
39953984
C06E54352661FCFB91968640 /* mutation_queue_test.cc in Sources */,
39963985
795A0E11B3951ACEA2859C8A /* mutation_test.cc in Sources */,
39973986
E9430D3EBDAE12E9016B708F /* no_document_test.cc in Sources */,
3998-
B6FD2025121D5738643C24C8 /* objc_compatibility_apple_test.mm in Sources */,
39993987
2B4021C3E663DDDDD512E961 /* objc_type_traits_apple_test.mm in Sources */,
40003988
71702588BFBF5D3A670508E7 /* ordered_code_benchmark.cc in Sources */,
40013989
B4C675BE9030D5C7D19C4D19 /* ordered_code_test.cc in Sources */,
@@ -4190,7 +4178,6 @@
41904178
1C4F88DDEFA6FA23E9E4DB4B /* mutation_queue_test.cc in Sources */,
41914179
32F022CB75AEE48CDDAF2982 /* mutation_test.cc in Sources */,
41924180
AB6B908820322E8800CC290A /* no_document_test.cc in Sources */,
4193-
B6968590221770F100271095 /* objc_compatibility_apple_test.mm in Sources */,
41944181
C80B10E79CDD7EF7843C321E /* objc_type_traits_apple_test.mm in Sources */,
41954182
3040FD156E1B7C92B0F2A70C /* ordered_code_benchmark.cc in Sources */,
41964183
AB380D04201BC6E400D97691 /* ordered_code_test.cc in Sources */,
@@ -4393,7 +4380,6 @@
43934380
A7399FB3BEC50BBFF08EC9BA /* mutation_queue_test.cc in Sources */,
43944381
D18DBCE3FE34BF5F14CF8ABD /* mutation_test.cc in Sources */,
43954382
9073AFB51EA26A818C29131E /* no_document_test.cc in Sources */,
4396-
E387401C33D1E3F21E5550EA /* objc_compatibility_apple_test.mm in Sources */,
43974383
0BC541D6457CBEDEA7BCF180 /* objc_type_traits_apple_test.mm in Sources */,
43984384
4FAB27F13EA5D3D79E770EA2 /* ordered_code_benchmark.cc in Sources */,
43994385
21836C4D9D48F962E7A3A244 /* ordered_code_test.cc in Sources */,

‎Firestore/Example/Tests/SpecTests/FSTSpecTests.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "Firestore/core/src/firebase/firestore/model/snapshot_version.h"
4545
#include "Firestore/core/src/firebase/firestore/model/types.h"
4646
#include "Firestore/core/src/firebase/firestore/nanopb/nanopb_util.h"
47-
#include "Firestore/core/src/firebase/firestore/objc/objc_compatibility.h"
4847
#include "Firestore/core/src/firebase/firestore/remote/existence_filter.h"
4948
#include "Firestore/core/src/firebase/firestore/remote/serializer.h"
5049
#include "Firestore/core/src/firebase/firestore/remote/watch_change.h"
@@ -56,6 +55,7 @@
5655
#include "Firestore/core/src/firebase/firestore/util/path.h"
5756
#include "Firestore/core/src/firebase/firestore/util/status.h"
5857
#include "Firestore/core/src/firebase/firestore/util/string_apple.h"
58+
#include "Firestore/core/src/firebase/firestore/util/to_string.h"
5959
#include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
6060
#include "absl/types/optional.h"
6161

@@ -760,8 +760,8 @@ - (void)validateActiveTargets {
760760
actualTargets.erase(targetID);
761761
}
762762

763-
XCTAssertTrue(actualTargets.empty(), "Unexpected active targets: %@",
764-
objc::Description(actualTargets));
763+
XCTAssertTrue(actualTargets.empty(), "Unexpected active targets: %s",
764+
util::ToString(actualTargets).c_str());
765765
}
766766

767767
- (void)runSpecTestSteps:(NSArray *)steps config:(NSDictionary *)config {

‎Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "Firestore/core/src/firebase/firestore/local/simple_query_engine.h"
3939
#include "Firestore/core/src/firebase/firestore/model/database_id.h"
4040
#include "Firestore/core/src/firebase/firestore/model/document_key.h"
41-
#include "Firestore/core/src/firebase/firestore/objc/objc_compatibility.h"
4241
#include "Firestore/core/src/firebase/firestore/remote/remote_store.h"
4342
#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
4443
#include "Firestore/core/src/firebase/firestore/util/delayed_constructor.h"

‎Firestore/Example/Tests/Util/FSTHelpers.h

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,50 +17,31 @@
1717
#import <Foundation/Foundation.h>
1818

1919
#include <string>
20-
#include <unordered_map>
2120
#include <vector>
2221

23-
#include "Firestore/core/src/firebase/firestore/core/filter.h"
24-
#include "Firestore/core/src/firebase/firestore/core/view.h"
25-
#include "Firestore/core/src/firebase/firestore/core/view_snapshot.h"
26-
#include "Firestore/core/src/firebase/firestore/local/local_view_changes.h"
27-
#include "Firestore/core/src/firebase/firestore/local/query_data.h"
28-
#include "Firestore/core/src/firebase/firestore/model/delete_mutation.h"
29-
#include "Firestore/core/src/firebase/firestore/model/document.h"
30-
#include "Firestore/core/src/firebase/firestore/model/document_map.h"
31-
#include "Firestore/core/src/firebase/firestore/model/document_set.h"
3222
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
33-
#include "Firestore/core/src/firebase/firestore/model/field_value.h"
34-
#include "Firestore/core/src/firebase/firestore/model/maybe_document.h"
35-
#include "Firestore/core/src/firebase/firestore/model/mutation.h"
36-
#include "Firestore/core/src/firebase/firestore/model/no_document.h"
37-
#include "Firestore/core/src/firebase/firestore/model/patch_mutation.h"
38-
#include "Firestore/core/src/firebase/firestore/model/resource_path.h"
39-
#include "Firestore/core/src/firebase/firestore/model/set_mutation.h"
40-
#include "Firestore/core/src/firebase/firestore/model/transform_mutation.h"
41-
#include "Firestore/core/src/firebase/firestore/model/types.h"
42-
#include "Firestore/core/src/firebase/firestore/model/unknown_document.h"
43-
#include "Firestore/core/src/firebase/firestore/remote/remote_event.h"
4423
#include "absl/strings/string_view.h"
45-
#include "absl/types/optional.h"
4624

4725
@class FIRGeoPoint;
48-
@class FIRTimestamp;
4926
@class FSTDocumentKeyReference;
5027
@class FSTUserDataConverter;
5128

5229
namespace firebase {
5330
namespace firestore {
54-
namespace remote {
5531

56-
class RemoteEvent;
32+
namespace model {
33+
class DeleteMutation;
34+
class DocumentKey;
35+
class FieldValue;
36+
class ObjectValue;
37+
class PatchMutation;
38+
class SetMutation;
39+
class TransformMutation;
40+
} // namespace model
5741

58-
} // namespace remote
5942
} // namespace firestore
6043
} // namespace firebase
6144

62-
namespace core = firebase::firestore::core;
63-
namespace local = firebase::firestore::local;
6445
namespace model = firebase::firestore::model;
6546

6647
NS_ASSUME_NONNULL_BEGIN
@@ -144,7 +125,7 @@ model::FieldValue FSTTestFieldValue(id _Nullable value);
144125
model::ObjectValue FSTTestObjectValue(NSDictionary<NSString *, id> *data);
145126

146127
/** A convenience method for creating document keys for tests. */
147-
firebase::firestore::model::DocumentKey FSTTestDocKey(NSString *path);
128+
model::DocumentKey FSTTestDocKey(NSString *path);
148129

149130
/** Allow tests to just use an int literal for versions. */
150131
typedef int64_t FSTTestSnapshotVersion;

0 commit comments

Comments
 (0)