Skip to content

Commit 49e4ba6

Browse files
thomasvlthomasvl
committed
Fix ExtensionRegistry copying and add tests.
- Fix up -copyWithZone: to not leave the two registries sharing some of the storage by using -addExtensions:. - Improve -addExtensions: to clone the sub dict when there is nothing to merge into. - A ExtensionRegistry unittests. - Update project schemes to not have extra things in perf scheme.
1 parent b28617b commit 49e4ba6

File tree

7 files changed

+187
-23
lines changed

7 files changed

+187
-23
lines changed

‎Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ objectivec_EXTRA_DIST= \
535535
objectivec/Tests/GPBDictionaryTests+UInt64.m \
536536
objectivec/Tests/GPBDictionaryTests.m \
537537
objectivec/Tests/GPBDictionaryTests.pddm \
538+
objectivec/Tests/GPBExtensionRegistryTest.m \
538539
objectivec/Tests/GPBMessageTests+Merge.m \
539540
objectivec/Tests/GPBMessageTests+Runtime.m \
540541
objectivec/Tests/GPBMessageTests+Serialization.m \

‎objectivec/GPBExtensionRegistry.m

+18-19
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,16 @@ - (void)dealloc {
5757

5858
- (instancetype)copyWithZone:(NSZone *)zone {
5959
GPBExtensionRegistry *result = [[[self class] allocWithZone:zone] init];
60-
if (result && mutableClassMap_.count) {
61-
[result->mutableClassMap_ addEntriesFromDictionary:mutableClassMap_];
62-
}
60+
[result addExtensions:self];
6361
return result;
6462
}
6563

66-
- (CFMutableDictionaryRef)extensionMapForContainingMessageClass:
67-
(Class)containingMessageClass {
64+
- (void)addExtension:(GPBExtensionDescriptor *)extension {
65+
if (extension == nil) {
66+
return;
67+
}
68+
69+
Class containingMessageClass = extension.containingMessageClass;
6870
CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)
6971
[mutableClassMap_ objectForKey:containingMessageClass];
7072
if (extensionMap == nil) {
@@ -74,18 +76,9 @@ - (CFMutableDictionaryRef)extensionMapForContainingMessageClass:
7476
&kCFTypeDictionaryValueCallBacks);
7577
[mutableClassMap_ setObject:(id)extensionMap
7678
forKey:(id<NSCopying>)containingMessageClass];
79+
CFRelease(extensionMap);
7780
}
78-
return extensionMap;
79-
}
8081

81-
- (void)addExtension:(GPBExtensionDescriptor *)extension {
82-
if (extension == nil) {
83-
return;
84-
}
85-
86-
Class containingMessageClass = extension.containingMessageClass;
87-
CFMutableDictionaryRef extensionMap =
88-
[self extensionMapForContainingMessageClass:containingMessageClass];
8982
ssize_t key = extension.fieldNumber;
9083
CFDictionarySetValue(extensionMap, (const void *)key, extension);
9184
}
@@ -119,10 +112,16 @@ - (void)addExtensions:(GPBExtensionRegistry *)registry {
119112
Class containingMessageClass = key;
120113
CFMutableDictionaryRef otherExtensionMap = (CFMutableDictionaryRef)value;
121114

122-
CFMutableDictionaryRef extensionMap =
123-
[self extensionMapForContainingMessageClass:containingMessageClass];
124-
125-
CFDictionaryApplyFunction(otherExtensionMap, CopyKeyValue, extensionMap);
115+
CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)
116+
[mutableClassMap_ objectForKey:containingMessageClass];
117+
if (extensionMap == nil) {
118+
extensionMap = CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, otherExtensionMap);
119+
[mutableClassMap_ setObject:(id)extensionMap
120+
forKey:(id<NSCopying>)containingMessageClass];
121+
CFRelease(extensionMap);
122+
} else {
123+
CFDictionaryApplyFunction(otherExtensionMap, CopyKeyValue, extensionMap);
124+
}
126125
}];
127126
}
128127

‎objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
F4487C751AADF7F500531423 /* GPBMessageTests+Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C741AADF7F500531423 /* GPBMessageTests+Runtime.m */; };
5353
F4487C7F1AAF62CD00531423 /* GPBMessageTests+Serialization.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C7E1AAF62CD00531423 /* GPBMessageTests+Serialization.m */; };
5454
F4487C831AAF6AB300531423 /* GPBMessageTests+Merge.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C821AAF6AB300531423 /* GPBMessageTests+Merge.m */; };
55+
F4584D821ECCB52A00803AB6 /* GPBExtensionRegistryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F4584D7E1ECCB38900803AB6 /* GPBExtensionRegistryTest.m */; };
5556
F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */ = {isa = PBXBuildFile; fileRef = F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */; };
5657
F45E57C71AE6DC6A000B7D99 /* text_format_map_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F45E57C61AE6DC6A000B7D99 /* text_format_map_unittest_data.txt */; };
5758
F47476E51D21A524007C7B1A /* Duration.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248D41A92826400BC1EC6 /* Duration.pbobjc.m */; };
@@ -180,6 +181,7 @@
180181
F4487C821AAF6AB300531423 /* GPBMessageTests+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Merge.m"; sourceTree = "<group>"; };
181182
F44929001C866B1900C2548A /* GPBCodedOutputStream_PackagePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream_PackagePrivate.h; sourceTree = "<group>"; };
182183
F451D3F51A8AAE8700B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers_RuntimeSupport.h; sourceTree = "<group>"; };
184+
F4584D7E1ECCB38900803AB6 /* GPBExtensionRegistryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionRegistryTest.m; sourceTree = "<group>"; };
183185
F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionInternals.m; sourceTree = "<group>"; };
184186
F45E57C61AE6DC6A000B7D99 /* text_format_map_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_map_unittest_data.txt; sourceTree = "<group>"; };
185187
F4AC9E1D1A8BEB3500BD6E83 /* unittest_cycle.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_cycle.proto; sourceTree = "<group>"; };
@@ -403,6 +405,7 @@
403405
F4353D301AC06F10005A6198 /* GPBDictionaryTests+String.m */,
404406
F4353D311AC06F10005A6198 /* GPBDictionaryTests+UInt32.m */,
405407
F4353D321AC06F10005A6198 /* GPBDictionaryTests+UInt64.m */,
408+
F4584D7E1ECCB38900803AB6 /* GPBExtensionRegistryTest.m */,
406409
7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */,
407410
F4487C821AAF6AB300531423 /* GPBMessageTests+Merge.m */,
408411
F4487C741AADF7F500531423 /* GPBMessageTests+Runtime.m */,
@@ -418,8 +421,8 @@
418421
7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */,
419422
8B4248DB1A92933A00BC1EC6 /* GPBWellKnownTypesTest.m */,
420423
7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */,
421-
F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */,
422424
F45E57C61AE6DC6A000B7D99 /* text_format_map_unittest_data.txt */,
425+
F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */,
423426
8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */,
424427
F4AC9E1D1A8BEB3500BD6E83 /* unittest_cycle.proto */,
425428
8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */,
@@ -429,8 +432,8 @@
429432
8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */,
430433
8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */,
431434
8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */,
432-
8B09AAF614B663A7007B4184 /* unittest_objc.proto */,
433435
F4CF31701B162ED800BD9B06 /* unittest_objc_startup.proto */,
436+
8B09AAF614B663A7007B4184 /* unittest_objc.proto */,
434437
8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */,
435438
F4487C781AADFB3100531423 /* unittest_runtime_proto2.proto */,
436439
F4487C791AADFB3200531423 /* unittest_runtime_proto3.proto */,
@@ -669,6 +672,7 @@
669672
F4F8D8831D789FD9002CE128 /* GPBUnittestProtos2.m in Sources */,
670673
F4353D1D1AB8822D005A6198 /* GPBDescriptorTests.m in Sources */,
671674
8B4248BB1A8C256A00BC1EC6 /* GPBSwiftTests.swift in Sources */,
675+
F4584D821ECCB52A00803AB6 /* GPBExtensionRegistryTest.m in Sources */,
672676
5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */,
673677
F4487C751AADF7F500531423 /* GPBMessageTests+Runtime.m in Sources */,
674678
F4353D351AC06F10005A6198 /* GPBDictionaryTests+Int32.m in Sources */,

‎objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
<Test
5151
Identifier = "DescriptorTests">
5252
</Test>
53+
<Test
54+
Identifier = "GPBAutocreatedArrayTests">
55+
</Test>
56+
<Test
57+
Identifier = "GPBAutocreatedDictionaryTests">
58+
</Test>
5359
<Test
5460
Identifier = "GPBBoolArrayTests">
5561
</Test>
@@ -89,6 +95,9 @@
8995
<Test
9096
Identifier = "GPBEnumArrayTests">
9197
</Test>
98+
<Test
99+
Identifier = "GPBExtensionRegistryTest">
100+
</Test>
92101
<Test
93102
Identifier = "GPBFloatArrayTests">
94103
</Test>

‎objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
F4487C771AADF84900531423 /* GPBMessageTests+Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */; };
6161
F4487C811AAF62FC00531423 /* GPBMessageTests+Serialization.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C801AAF62FC00531423 /* GPBMessageTests+Serialization.m */; };
6262
F4487C851AAF6AC500531423 /* GPBMessageTests+Merge.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */; };
63+
F4584D831ECCB53600803AB6 /* GPBExtensionRegistryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */; };
6364
F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */ = {isa = PBXBuildFile; fileRef = F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */; };
6465
F45E57C91AE6DC98000B7D99 /* text_format_map_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */; };
6566
F47476E91D21A537007C7B1A /* Duration.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248DE1A929C7D00BC1EC6 /* Duration.pbobjc.m */; };
@@ -202,6 +203,7 @@
202203
F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Merge.m"; sourceTree = "<group>"; };
203204
F44929021C866B3B00C2548A /* GPBCodedOutputStream_PackagePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream_PackagePrivate.h; sourceTree = "<group>"; };
204205
F451D3F61A8AAEA600B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers_RuntimeSupport.h; sourceTree = "<group>"; };
206+
F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPBExtensionRegistryTest.m; path = Tests/GPBExtensionRegistryTest.m; sourceTree = SOURCE_ROOT; };
205207
F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionInternals.m; sourceTree = "<group>"; };
206208
F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_map_unittest_data.txt; sourceTree = "<group>"; };
207209
F4AC9E1C1A8BEB1000BD6E83 /* unittest_cycle.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_cycle.proto; sourceTree = "<group>"; };
@@ -441,6 +443,7 @@
441443
F4353D3E1AC06F31005A6198 /* GPBDictionaryTests+String.m */,
442444
F4353D3F1AC06F31005A6198 /* GPBDictionaryTests+UInt32.m */,
443445
F4353D401AC06F31005A6198 /* GPBDictionaryTests+UInt64.m */,
446+
F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */,
444447
7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */,
445448
F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */,
446449
F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */,
@@ -456,8 +459,8 @@
456459
7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */,
457460
8B4248E51A929C9900BC1EC6 /* GPBWellKnownTypesTest.m */,
458461
7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */,
459-
F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */,
460462
F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */,
463+
F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */,
461464
8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */,
462465
F4AC9E1C1A8BEB1000BD6E83 /* unittest_cycle.proto */,
463466
8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */,
@@ -467,8 +470,8 @@
467470
8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */,
468471
8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */,
469472
8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */,
470-
8B09AAF614B663A7007B4184 /* unittest_objc.proto */,
471473
F4CF31711B162EF500BD9B06 /* unittest_objc_startup.proto */,
474+
8B09AAF614B663A7007B4184 /* unittest_objc.proto */,
472475
8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */,
473476
F4487C7A1AADFB5500531423 /* unittest_runtime_proto2.proto */,
474477
F4487C7B1AADFB5500531423 /* unittest_runtime_proto3.proto */,
@@ -765,6 +768,7 @@
765768
F4F8D8861D78A193002CE128 /* GPBUnittestProtos2.m in Sources */,
766769
F4B51B1C1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm in Sources */,
767770
8B4248B41A8BD96E00BC1EC6 /* GPBSwiftTests.swift in Sources */,
771+
F4584D831ECCB53600803AB6 /* GPBExtensionRegistryTest.m in Sources */,
768772
5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */,
769773
F4487C771AADF84900531423 /* GPBMessageTests+Runtime.m in Sources */,
770774
F4353D431AC06F31005A6198 /* GPBDictionaryTests+Int32.m in Sources */,

‎objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
<Test
5151
Identifier = "DescriptorTests">
5252
</Test>
53+
<Test
54+
Identifier = "GPBAutocreatedArrayTests">
55+
</Test>
56+
<Test
57+
Identifier = "GPBAutocreatedDictionaryTests">
58+
</Test>
5359
<Test
5460
Identifier = "GPBBoolArrayTests">
5561
</Test>
@@ -89,6 +95,9 @@
8995
<Test
9096
Identifier = "GPBEnumArrayTests">
9197
</Test>
98+
<Test
99+
Identifier = "GPBExtensionRegistryTest">
100+
</Test>
92101
<Test
93102
Identifier = "GPBFloatArrayTests">
94103
</Test>

0 commit comments

Comments
 (0)