Avoid unnecessary copies of PhoneMetadata (#3300)

sopwithcamel · web-flow · commit 3feb6c3a8a44 · 2026-06-09T14:56:33.000+05:30
The PhoneMetadata can be moved into the hashmap avoiding a copy.
diff --git a/cpp/src/phonenumbers/shortnumberinfo.cc b/cpp/src/phonenumbers/shortnumberinfo.cc
@@ -52,9 +52,9 @@ ShortNumberInfo::ShortNumberInfo()
     LOG(DFATAL) << "Could not parse compiled-in metadata.";
     return;
   }
-  for (const auto& metadata : metadata_collection.metadata()) {
-    const string& region_code = metadata.id();
-    region_to_short_metadata_map_->insert(std::make_pair(region_code, metadata));
+  for (auto& metadata : *(metadata_collection.mutable_metadata())) {
+    const string region_code = metadata.id();
+    region_to_short_metadata_map_->emplace(region_code, std::move(metadata));
   }
   regions_where_emergency_numbers_must_be_exact_->insert("BR");
   regions_where_emergency_numbers_must_be_exact_->insert("CL");

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ ShortNumberInfo::ShortNumberInfo()`
`52`	`52`	`LOG(DFATAL) << "Could not parse compiled-in metadata.";`
`53`	`53`	`return;`
`54`	`54`	`}`
`55`		`- for (const auto& metadata : metadata_collection.metadata()) {`
`56`		`- const string& region_code = metadata.id();`
`57`		`- region_to_short_metadata_map_->insert(std::make_pair(region_code, metadata));`
	`55`	`+ for (auto& metadata : *(metadata_collection.mutable_metadata())) {`
	`56`	`+ const string region_code = metadata.id();`
	`57`	`+ region_to_short_metadata_map_->emplace(region_code, std::move(metadata));`
`58`	`58`	`}`
`59`	`59`	`regions_where_emergency_numbers_must_be_exact_->insert("BR");`
`60`	`60`	`regions_where_emergency_numbers_must_be_exact_->insert("CL");`