lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

Fixing default value for avro 1.7 which assumes NULL value instead of a jsonnode that is null (#792)

Browse Source
This commit is contained in:
n3nash
2019-07-17 03:25:54 -07:00
committed by vinoth chandar
parent 3d408ee96b
commit 6efa16317c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hoodie-common/src/main/java/com/uber/hoodie/common/util/HoodieAvroUtils.java
View File

@@ -102,15 +102,15 @@ public class HoodieAvroUtils {
List<Schema.Field> parentFields = new ArrayList<>(); List<Schema.Field> parentFields = new ArrayList<>();
Schema.Field commitTimeField = new Schema.Field(HoodieRecord.COMMIT_TIME_METADATA_FIELD, Schema.Field commitTimeField = new Schema.Field(HoodieRecord.COMMIT_TIME_METADATA_FIELD,
METADATA_FIELD_SCHEMA, "", null); METADATA_FIELD_SCHEMA, "", NullNode.getInstance());
Schema.Field commitSeqnoField = new Schema.Field(HoodieRecord.COMMIT_SEQNO_METADATA_FIELD, Schema.Field commitSeqnoField = new Schema.Field(HoodieRecord.COMMIT_SEQNO_METADATA_FIELD,
METADATA_FIELD_SCHEMA, "", null); METADATA_FIELD_SCHEMA, "", NullNode.getInstance());
Schema.Field recordKeyField = new Schema.Field(HoodieRecord.RECORD_KEY_METADATA_FIELD, Schema.Field recordKeyField = new Schema.Field(HoodieRecord.RECORD_KEY_METADATA_FIELD,
METADATA_FIELD_SCHEMA, "", null); METADATA_FIELD_SCHEMA, "", NullNode.getInstance());
Schema.Field partitionPathField = new Schema.Field(HoodieRecord.PARTITION_PATH_METADATA_FIELD, Schema.Field partitionPathField = new Schema.Field(HoodieRecord.PARTITION_PATH_METADATA_FIELD,
METADATA_FIELD_SCHEMA, "", null); METADATA_FIELD_SCHEMA, "", NullNode.getInstance());
Schema.Field fileNameField = new Schema.Field(HoodieRecord.FILENAME_METADATA_FIELD, Schema.Field fileNameField = new Schema.Field(HoodieRecord.FILENAME_METADATA_FIELD,
METADATA_FIELD_SCHEMA, "", null); METADATA_FIELD_SCHEMA, "", NullNode.getInstance());
parentFields.add(commitTimeField); parentFields.add(commitTimeField);
parentFields.add(commitSeqnoField); parentFields.add(commitSeqnoField);
@@ -119,7 +119,7 @@ public class HoodieAvroUtils {
parentFields.add(fileNameField); parentFields.add(fileNameField);
for (Schema.Field field : schema.getFields()) { for (Schema.Field field : schema.getFields()) {
if (!isMetadataField(field.name())) { if (!isMetadataField(field.name())) {
Schema.Field newField = new Schema.Field(field.name(), field.schema(), field.doc(), null); Schema.Field newField = new Schema.Field(field.name(), field.schema(), field.doc(), field.defaultValue());
for (Map.Entry<String, JsonNode> prop : field.getJsonProps().entrySet()) { for (Map.Entry<String, JsonNode> prop : field.getJsonProps().entrySet()) {
newField.addProp(prop.getKey(), prop.getValue()); newField.addProp(prop.getKey(), prop.getValue());
} }
@@ -135,7 +135,7 @@ public class HoodieAvroUtils {
private static Schema initRecordKeySchema() { private static Schema initRecordKeySchema() {
Schema.Field recordKeyField = new Schema.Field(HoodieRecord.RECORD_KEY_METADATA_FIELD, Schema.Field recordKeyField = new Schema.Field(HoodieRecord.RECORD_KEY_METADATA_FIELD,
METADATA_FIELD_SCHEMA, "", null); METADATA_FIELD_SCHEMA, "", NullNode.getInstance());
Schema recordKeySchema = Schema.createRecord("HoodieRecordKey", "", "", false); Schema recordKeySchema = Schema.createRecord("HoodieRecordKey", "", "", false);
recordKeySchema.setFields(Arrays.asList(recordKeyField)); recordKeySchema.setFields(Arrays.asList(recordKeyField));
return recordKeySchema; return recordKeySchema;