-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
protobuf: refactor proto visitor pattern. #10354
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| #include "common/protobuf/visitor.h" | ||
|
|
||
| namespace Envoy { | ||
| namespace ProtobufMessage { | ||
|
|
||
| void traverseMutableMessage(ProtoVisitor& visitor, Protobuf::Message& message, const void* ctxt) { | ||
| visitor.onMessage(message, ctxt); | ||
| const Protobuf::Descriptor* descriptor = message.GetDescriptor(); | ||
| const Protobuf::Reflection* reflection = message.GetReflection(); | ||
| for (int i = 0; i < descriptor->field_count(); ++i) { | ||
| const Protobuf::FieldDescriptor* field = descriptor->field(i); | ||
| const void* field_ctxt = visitor.onField(message, *field, ctxt); | ||
| // If this is a message, recurse to visit fields in the sub-message. | ||
| if (field->cpp_type() == Protobuf::FieldDescriptor::CPPTYPE_MESSAGE) { | ||
| if (field->is_repeated()) { | ||
| const int size = reflection->FieldSize(message, field); | ||
| for (int j = 0; j < size; ++j) { | ||
| traverseMutableMessage(visitor, *reflection->MutableRepeatedMessage(&message, field, j), | ||
| field_ctxt); | ||
| } | ||
| } else if (reflection->HasField(message, field)) { | ||
| traverseMutableMessage(visitor, *reflection->MutableMessage(&message, field), field_ctxt); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| void traverseMessage(ConstProtoVisitor& visitor, const Protobuf::Message& message, | ||
| const void* ctxt) { | ||
| visitor.onMessage(message, ctxt); | ||
| const Protobuf::Descriptor* descriptor = message.GetDescriptor(); | ||
| const Protobuf::Reflection* reflection = message.GetReflection(); | ||
| for (int i = 0; i < descriptor->field_count(); ++i) { | ||
| const Protobuf::FieldDescriptor* field = descriptor->field(i); | ||
| const void* field_ctxt = visitor.onField(message, *field, ctxt); | ||
| // If this is a message, recurse to scrub deprecated fields in the sub-message. | ||
| if (field->cpp_type() == Protobuf::FieldDescriptor::CPPTYPE_MESSAGE) { | ||
| if (field->is_repeated()) { | ||
| const int size = reflection->FieldSize(message, field); | ||
| for (int j = 0; j < size; ++j) { | ||
| traverseMessage(visitor, reflection->GetRepeatedMessage(message, field, j), field_ctxt); | ||
| } | ||
| } else if (reflection->HasField(message, field)) { | ||
| traverseMessage(visitor, reflection->GetMessage(message, field), field_ctxt); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } // namespace ProtobufMessage | ||
| } // namespace Envoy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #pragma once | ||
|
|
||
| #include "common/protobuf/protobuf.h" | ||
|
|
||
| namespace Envoy { | ||
| namespace ProtobufMessage { | ||
|
|
||
| class ProtoVisitor { | ||
| public: | ||
| virtual ~ProtoVisitor() = default; | ||
|
|
||
| // Invoked when a field is visited, with the message, field descriptor and context. Returns a new | ||
| // context for use when traversing the sub-message in a field. | ||
| virtual const void* onField(Protobuf::Message&, const Protobuf::FieldDescriptor&, | ||
| const void* ctxt) { | ||
| return ctxt; | ||
| } | ||
|
|
||
| // Invoked when a message is visited, with the message and a context. | ||
| virtual void onMessage(Protobuf::Message&, const void*){}; | ||
| }; | ||
|
|
||
| class ConstProtoVisitor { | ||
| public: | ||
| virtual ~ConstProtoVisitor() = default; | ||
|
|
||
| // Invoked when a field is visited, with the message, field descriptor and context. Returns a new | ||
| // context for use when traversing the sub-message in a field. | ||
| virtual const void* onField(const Protobuf::Message&, const Protobuf::FieldDescriptor&, | ||
| const void* ctxt) { | ||
| return ctxt; | ||
| } | ||
|
|
||
| // Invoked when a message is visited, with the message and a context. | ||
| virtual void onMessage(const Protobuf::Message&, const void*){}; | ||
| }; | ||
|
|
||
| void traverseMutableMessage(ProtoVisitor& visitor, Protobuf::Message& message, const void* ctxt); | ||
| void traverseMessage(ConstProtoVisitor& visitor, const Protobuf::Message& message, | ||
| const void* ctxt); | ||
|
|
||
| } // namespace ProtobufMessage | ||
| } // namespace Envoy |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Checking: you still have further cleanup plans?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. This PR just refactors some proto traversal stuff. #8092 tracks the more general "move the deprecated field error reporting and exception generation to the validation visitor callbacks", i.e. having an
onDeprecatedField()callback alongsideonUnknownField()inValidationVisitor. This is mostly a mechanical code movement that shouldn't really change any existing behavior. @nezdolik FYI.