Skip to content

Commit 5bed4eb

Browse files
committed
HIVE-21737: Use NULL_DEFAULT_VALUE for Avro fields instead of Jackson's
1 parent f6ef22d commit 5bed4eb

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

serde/src/java/org/apache/hadoop/hive/serde2/avro/TypeInfoToSchema.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
*/
1818
package org.apache.hadoop.hive.serde2.avro;
1919

20+
import static org.apache.avro.Schema.Field.NULL_DEFAULT_VALUE;
21+
2022
import org.apache.avro.Schema;
2123
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
2224
import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo;
@@ -28,8 +30,6 @@
2830
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
2931
import org.apache.hadoop.hive.serde2.typeinfo.UnionTypeInfo;
3032
import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo;
31-
import org.codehaus.jackson.JsonNode;
32-
import org.codehaus.jackson.node.JsonNodeFactory;
3333

3434
import java.util.ArrayList;
3535
import java.util.Arrays;
@@ -235,14 +235,13 @@ private Schema createAvroArray(TypeInfo typeInfo) {
235235
private List<Schema.Field> getFields(Schema.Field schemaField) {
236236
List<Schema.Field> fields = new ArrayList<Schema.Field>();
237237

238-
JsonNode nullDefault = JsonNodeFactory.instance.nullNode();
239238
if (schemaField.schema().getType() == Schema.Type.RECORD) {
240239
for (Schema.Field field : schemaField.schema().getFields()) {
241-
fields.add(new Schema.Field(field.name(), field.schema(), field.doc(), nullDefault));
240+
fields.add(new Schema.Field(field.name(), field.schema(), field.doc(), NULL_DEFAULT_VALUE));
242241
}
243242
} else {
244243
fields.add(new Schema.Field(schemaField.name(), schemaField.schema(), schemaField.doc(),
245-
nullDefault));
244+
NULL_DEFAULT_VALUE));
246245
}
247246

248247
return fields;

0 commit comments

Comments
 (0)