- Notifications
You must be signed in to change notification settings - Fork13.8k
[FLINK-38689] [flink-protobuf] Add support for protobuf 4.x field name conflict resolution#27245
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
khaledh wants to merge1 commit intoapache:masterChoose a base branch fromkhaledh:protobuf-name-conflict-resolution
base:master
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or 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
Collaborator
flinkbot commentedNov 17, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
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