Make internal::EagerParseLazyFieldIgnoreUnparsed() internal to google3.

PiperOrigin-RevId: 611669493

src/google/protobuf/internal_message_util.cc

@@ -17,84 +17,6 @@ namespace google {
 namespace protobuf {
 namespace internal {
 
-class MessageUtil {
- public:
-  static const internal::MapFieldBase* GetMapData(
-      const Reflection* reflection, const Message& message,
-      const FieldDescriptor* field) {
-    return reflection->GetMapData(message, field);
-  }
-
-  // Walks the entire message tree and eager parses all lazy fields.
-  static void EagerParseLazyFieldIgnoreUnparsedByMutation(Message* message);
-};
-
-namespace {
-
-// Returns true if the field is a map that contains non-message value.
-bool IsNonMessageMap(const FieldDescriptor* field) {
-  if (!field->is_map()) {
-    return false;
-  }
-  constexpr int kValueIndex = 1;
-  return field->message_type()->field(kValueIndex)->cpp_type() !=
-         FieldDescriptor::CPPTYPE_MESSAGE;
-}
-
-inline bool UseMapIterator(const Reflection* reflection, const Message& message,
-                           const FieldDescriptor* field) {
-  return field->is_map() &&
-         MessageUtil::GetMapData(reflection, message, field)->IsMapValid();
-}
-
-inline bool IsNonMessageField(const FieldDescriptor* field) {
-  return field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE ||
-         IsNonMessageMap(field);
-}
-
-}  // namespace
-
-// To eagerly parse lazy fields in the entire message tree, mutates all the
-// message fields (optional, repeated, extensions).
-void MessageUtil::EagerParseLazyFieldIgnoreUnparsedByMutation(
-    Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(*message, &fields);
-
-  for (const auto* field : fields) {
-    if (IsNonMessageField(field)) continue;
-
-    if (!field->is_repeated()) {
-      EagerParseLazyFieldIgnoreUnparsedByMutation(
-          reflection->MutableMessage(message, field));
-      continue;
-    }
-
-    // Map values cannot be lazy but their child message may be.
-    if (UseMapIterator(reflection, *message, field)) {
-      auto end = reflection->MapEnd(message, field);
-      for (auto it = reflection->MapBegin(message, field); it != end; ++it) {
-        EagerParseLazyFieldIgnoreUnparsedByMutation(
-            it.MutableValueRef()->MutableMessageValue());
-      }
-      continue;
-    }
-
-    // Repeated messages cannot be lazy but their child messages may be.
-    if (field->is_repeated()) {
-      for (int i = 0, end = reflection->FieldSize(*message, field); i < end;
-           ++i) {
-        EagerParseLazyFieldIgnoreUnparsedByMutation(
-            reflection->MutableRepeatedMessage(message, field, i));
-      }
-    }
-  }
-}
-
-void EagerParseLazyFieldIgnoreUnparsed(Message& message) {
-  MessageUtil::EagerParseLazyFieldIgnoreUnparsedByMutation(&message);
-}
 
 }  // namespace internal
 }  // namespace protobuf

src/google/protobuf/internal_message_util.h

@@ -17,9 +17,6 @@ namespace google {
 namespace protobuf {
 namespace internal {
 
-// Walks the entire message tree, eager parses all lazy fields and configures
-// them to ignore unparsed.
-void EagerParseLazyFieldIgnoreUnparsed(Message& message);
 
 }  // namespace internal
 }  // namespace protobuf

src/google/protobuf/internal_message_util_unittest.cc

@@ -20,9 +20,11 @@
 
 namespace google {
 namespace protobuf {
+namespace internal {
 namespace {
 
 
 }  // namespace
+}  // namespace internal
 }  // namespace protobuf
 }  // namespace google