voonhous commented on code in PR #17581:
URL: https://github.com/apache/hudi/pull/17581#discussion_r2639900011
##########
hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/utils/HiveAvroSerializer.java:
##########
@@ -268,28 +267,34 @@ public GenericRecord serialize(Object o, Schema schema) {
return record;
}
- private void setUpRecordFieldFromWritable(TypeInfo typeInfo, Object
structFieldData, ObjectInspector fieldOI, GenericData.Record record,
Schema.Field field) {
+ private void setUpRecordFieldFromWritable(TypeInfo typeInfo, Object
structFieldData, ObjectInspector fieldOI, GenericData.Record record,
HoodieSchemaField field) {
Object val = serialize(typeInfo, fieldOI, structFieldData, field.schema());
if (val == null) {
- if (field.defaultVal() instanceof JsonProperties.Null) {
+ Option<Object> defaultValOpt = field.defaultVal();
+ // In Avro/HoodieSchema, field.defaultVal() returns:
+ // - JsonProperties.Null / HoodieSchema.NULL_VALUE = if default is
explicitly null
+ // - null / isEmpty() = if field has NO default value
+ // - some value = if field has an actual default
+ if (defaultValOpt.isPresent() && defaultValOpt.get() ==
HoodieSchema.NULL_VALUE) {
Review Comment:
Done, changed to:
```java
Object val = serialize(typeInfo, fieldOI, structFieldData, field.schema());
Object recordValue = val != null ? val : field.defaultVal()
.map(defaultVal -> defaultVal == HoodieSchema.NULL_VALUE ? null :
defaultVal)
.orElse(null);
record.put(field.name(), recordValue);
```
--
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]
