[FLINK-38689] [flink-protobuf] Add support for protobuf 4.x field name conflict resolution #27245
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.
What is the purpose of the change
Flink's protobuf format fails when processing messages compiled with protobuf-java's field naming conflict resolution. When proto schemas contain certain field patterns, protoc appends field number suffixes to accessor methods (e.g.,
getStatus1(),getTags4List()), but Flink's codegen assumes canonical names (getStatus(),getTagsList()). Conflict scenarios:*_list/*_countfields -> numbered suffixes*_valuefield -> both get numbered suffixes (protobuf-java 4.30.0+)This affects users with conflict-prone schemas on protobuf-java 3.x+ (repeated field conflicts) and 4.30.0+ (enum field conflicts).
Brief change log
PbFieldConflictResolverwith caching for conflict-aware accessor resolutionVerifying this change
This change added tests and can be verified as follows:
test_field_conflict.protowith field conflict scenariosFieldConflictProtoToRowTest(14 tests) andFieldConflictRowToProtoTest(4 tests)Does this pull request potentially affect one of the following parts:
@Public(Evolving): noDocumentation