Skip to content

[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.

Sign up for GitHub

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

Open
khaledh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FLINK-38689] [flink-protobuf] Add support for protobuf 4.x field name conflict resolution #27245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions ...src/main/java/org/apache/flink/formats/protobuf/deserialize/PbCodegenRowDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.flink.formats.protobuf.util.PbCodegenAppender;
import org.apache.flink.formats.protobuf.util.PbCodegenUtils;
import org.apache.flink.formats.protobuf.util.PbCodegenVarId;
import org.apache.flink.formats.protobuf.util.PbFieldConflictResolver;
import org.apache.flink.formats.protobuf.util.PbFormatUtils;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
Expand Down Expand Up @@ -61,6 +62,9 @@ public String codegen(String resultVar, String pbObjectCode, int indent)
"GenericRowData " + flinkRowDataVar + " = new GenericRowData(" + fieldSize + ")");
int index = 0;
PbCodegenAppender splitAppender = new PbCodegenAppender(indent);
// Get cached accessor mappings for performance optimization
PbFieldConflictResolver.AccessorMappings accessorMappings =
PbFieldConflictResolver.getAccessorMappings(descriptor);
for (String fieldName : rowType.getFieldNames()) {
int subUid = varUid.getAndIncrement();
String flinkRowEleVar = "elementDataVar" + subUid;
Expand All @@ -84,15 +88,17 @@ public String codegen(String resultVar, String pbObjectCode, int indent)
isMessageElementNonEmptyCode(
pbMessageVar,
strongCamelFieldName,
PbFormatUtils.isRepeatedType(subType));
elementFd,
PbFormatUtils.isRepeatedType(subType),
accessorMappings);
splitAppender.begin("if(" + isMessageElementNonEmptyCode + "){");
}
String pbGetMessageElementCode =
pbGetMessageElementCode(
pbMessageVar,
strongCamelFieldName,
elementFd,
PbFormatUtils.isArrayType(subType));
PbFormatUtils.isArrayType(subType),
accessorMappings);
String code =
codegen.codegen(
flinkRowEleVar, pbGetMessageElementCode, splitAppender.currentIndent());
Expand Down Expand Up @@ -122,25 +128,20 @@ public String codegen(String resultVar, String pbObjectCode, int indent)
}

private String pbGetMessageElementCode(
String message, String fieldName, FieldDescriptor fd, boolean isList) {
if (fd.isMapField()) {
// map
return message + ".get" + fieldName + "Map()";
} else if (isList) {
// list
return message + ".get" + fieldName + "List()";
} else {
return message + ".get" + fieldName + "()";
}
String message,
FieldDescriptor fd,
boolean isList,
PbFieldConflictResolver.AccessorMappings mappings) {
return message + "." + PbFieldConflictResolver.resolveGetter(fd, isList, mappings) + "()";
}

private String isMessageElementNonEmptyCode(
String message, String fieldName, boolean isListOrMap) {
if (isListOrMap) {
return message + ".get" + fieldName + "Count() > 0";
} else {
// proto syntax class do not have hasName() interface
return message + ".has" + fieldName + "()";
}
String message,
String fieldName,
FieldDescriptor fd,
boolean isList,
PbFieldConflictResolver.AccessorMappings mappings) {
return PbFieldConflictResolver.generatePresenceCheck(
message, fd, fieldName, isList, mappings);
}
}
8 changes: 7 additions & 1 deletion ...buf/src/main/java/org/apache/flink/formats/protobuf/serialize/PbCodegenRowSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.flink.formats.protobuf.util.PbCodegenAppender;
import org.apache.flink.formats.protobuf.util.PbCodegenUtils;
import org.apache.flink.formats.protobuf.util.PbCodegenVarId;
import org.apache.flink.formats.protobuf.util.PbFieldConflictResolver;
import org.apache.flink.formats.protobuf.util.PbFormatUtils;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
Expand Down Expand Up @@ -64,6 +65,9 @@ public String codegen(String resultVar, String flinkObjectCode, int indent)
+ ".newBuilder()");
int index = 0;
PbCodegenAppender splitAppender = new PbCodegenAppender(indent);
// Get cached accessor mappings for performance optimization
PbFieldConflictResolver.AccessorMappings accessorMappings =
PbFieldConflictResolver.getAccessorMappings(descriptor);
for (String fieldName : rowType.getFieldNames()) {
Descriptors.FieldDescriptor elementFd = descriptor.findFieldByName(fieldName);
LogicalType subType = rowType.getTypeAt(rowType.getFieldIndex(fieldName));
Expand All @@ -77,7 +81,9 @@ public String codegen(String resultVar, String flinkObjectCode, int indent)
PbCodegenUtils.getTypeStrFromProto(
elementFd, PbFormatUtils.isArrayType(subType));
}
String strongCamelFieldName = PbFormatUtils.getStrongCamelCaseJsonName(fieldName);
String strongCamelFieldName =
PbFieldConflictResolver.resolveSetterSegment(
elementFd, fieldName, accessorMappings);

// Only set non-null element of flink row to proto object. The real value in proto
// result depends on protobuf implementation.
Expand Down
Loading