Simplify RandomAccessRepeatedFieldAccessor hierarchy via more code …

…reuse In particular, reworked `MapFieldAccessor` to be a minimalistic subclass of `RepeatedPtrFieldMessageAccessor`, with only 2 overrides of transitive virtual APIs inherited from `RepeatedPtrFieldWrapper<>`. PiperOrigin-RevId: 693813512
google · Nov 6, 2024 · 2304cdd · 2304cdd
1 parent 0834a15
commit 2304cdd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/common/values/parsed_map_field_value.cc b/common/values/parsed_map_field_value.cc
@@ -165,7 +165,6 @@ ParsedMapFieldValue ParsedMapFieldValue::Clone(Allocator<> allocator) const {
   auto cloned_field =
       cloned->GetReflection()->GetMutableRepeatedFieldRef<google::protobuf::Message>(
           cel::to_address(cloned), field_);
-  cloned_field.Reserve(field.size());
   cloned_field.CopyFrom(field);
   return ParsedMapFieldValue(std::move(cloned), field_);
 }

diff --git a/common/values/parsed_repeated_field_value.cc b/common/values/parsed_repeated_field_value.cc
@@ -160,7 +160,6 @@ ParsedRepeatedFieldValue ParsedRepeatedFieldValue::Clone(
   auto cloned_field =
       cloned->GetReflection()->GetMutableRepeatedFieldRef<google::protobuf::Message>(
           cel::to_address(cloned), field_);
-  cloned_field.Reserve(field.size());
   cloned_field.CopyFrom(field);
   return ParsedRepeatedFieldValue(std::move(cloned), field_);
 }

diff --git a/internal/well_known_types.cc b/internal/well_known_types.cc
@@ -1538,9 +1538,6 @@ void ListValueReflection::ReserveValues(absl::Nonnull<google::protobuf::Message*
                                         int capacity) const {
   ABSL_DCHECK(IsInitialized());
   ABSL_DCHECK_EQ(message->GetDescriptor(), descriptor_);
-  if (capacity > 0) {
-    MutableValues(message).Reserve(capacity);
-  }
 }
 
 absl::StatusOr<ListValueReflection> GetListValueReflection(