mkhludnev commented on code in PR #27406:
URL: https://github.com/apache/beam/pull/27406#discussion_r1259699225
##########
sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/schemas/utils/AvroUtils.java:
##########
@@ -1055,45 +1049,7 @@ private static org.apache.avro.Schema getFieldSchema(
break;
case LOGICAL_TYPE:
- String identifier = fieldType.getLogicalType().getIdentifier();
- if (FixedBytes.IDENTIFIER.equals(identifier)) {
- FixedBytesField fixedBytesField =
- checkNotNull(FixedBytesField.fromBeamFieldType(fieldType));
- baseType = fixedBytesField.toAvroType("fixed", namespace + "." +
fieldName);
- } else if (VariableBytes.IDENTIFIER.equals(identifier)) {
- // treat VARBINARY as bytes as that is what avro supports
- baseType = org.apache.avro.Schema.create(Type.BYTES);
- } else if (FixedString.IDENTIFIER.equals(identifier)
- || "CHAR".equals(identifier)
- || "NCHAR".equals(identifier)) {
- baseType =
- buildHiveLogicalTypeSchema("char", (int)
fieldType.getLogicalType().getArgument());
- } else if (VariableString.IDENTIFIER.equals(identifier)
- || "NVARCHAR".equals(identifier)
- || "VARCHAR".equals(identifier)
- || "LONGNVARCHAR".equals(identifier)
- || "LONGVARCHAR".equals(identifier)) {
- baseType =
- buildHiveLogicalTypeSchema("varchar", (int)
fieldType.getLogicalType().getArgument());
- } else if (EnumerationType.IDENTIFIER.equals(identifier)) {
- EnumerationType enumerationType =
fieldType.getLogicalType(EnumerationType.class);
- baseType =
- org.apache.avro.Schema.createEnum(fieldName, "", "",
enumerationType.getValues());
- } else if (OneOfType.IDENTIFIER.equals(identifier)) {
- OneOfType oneOfType = fieldType.getLogicalType(OneOfType.class);
- baseType =
- org.apache.avro.Schema.createUnion(
- oneOfType.getOneOfSchema().getFields().stream()
- .map(x -> getFieldSchema(x.getType(), x.getName(),
namespace))
- .collect(Collectors.toList()));
- } else if ("DATE".equals(identifier) ||
SqlTypes.DATE.getIdentifier().equals(identifier)) {
- baseType =
LogicalTypes.date().addToSchema(org.apache.avro.Schema.create(Type.INT));
- } else if ("TIME".equals(identifier)) {
- baseType =
LogicalTypes.timeMillis().addToSchema(org.apache.avro.Schema.create(Type.INT));
- } else {
- throw new RuntimeException(
- "Unhandled logical type " +
fieldType.getLogicalType().getIdentifier());
- }
+ baseType = getLogicalTypeFieldSchema(fieldType, fieldName, namespace);
Review Comment:
Extracted logical type handling before adding FixedPrecisionNumeric case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
