Skip to content

HIVE-24436: Fix Avro NULL_DEFAULT_VALUE compatibility issue #1715

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

Closed
wangyum wants to merge 2 commits into from
Closed

HIVE-24436: Fix Avro NULL_DEFAULT_VALUE compatibility issue #1715

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f96ca7
Fix Avro NULL_DEFAULT_VALUE compatibility issue
wangyum Nov 27, 2020
5f08d0c
Fix indentation
wangyum Nov 27, 2020
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
5 changes: 3 additions & 2 deletions serde/src/java/org/apache/hadoop/hive/serde2/avro/TypeInfoToSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hive.serde2.avro;

import org.apache.avro.JsonProperties;
import org.apache.avro.Schema;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo;
Expand Down Expand Up @@ -73,7 +74,7 @@ public Schema convert(List<String> columnNames, List<TypeInfo> columnTypes,
}

private Schema.Field createAvroField(String name, TypeInfo typeInfo, String comment) {
return new Schema.Field(name, createAvroSchema(typeInfo), comment, null);
return new Schema.Field(name, createAvroSchema(typeInfo), comment, JsonProperties.NULL_VALUE);
}
Comment on lines +77 to 78
Copy link
Member

@viirya viirya Nov 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

old: https://github.com/apache/avro/blob/release-1.8.2/lang/java/avro/src/main/java/org/apache/avro/Schema.java#L393-L397

new: https://github.com/apache/avro/blob/release-1.10.0/lang/java/avro/src/main/java/org/apache/avro/Schema.java#L579-L583


private Schema createAvroSchema(TypeInfo typeInfo) {
Expand Down Expand Up @@ -235,7 +236,7 @@ private Schema createAvroArray(TypeInfo typeInfo) {
private List<Schema.Field> getFields(Schema.Field schemaField) {
List<Schema.Field> fields = new ArrayList<Schema.Field>();

JsonNode nullDefault = JsonNodeFactory.instance.nullNode();
JsonProperties.Null nullDefault = JsonProperties.NULL_VALUE;
if (schemaField.schema().getType() == Schema.Type.RECORD) {
for (Schema.Field field : schemaField.schema().getFields()) {
fields.add(new Schema.Field(field.name(), field.schema(), field.doc(), nullDefault));
Expand Down