You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by su...@apache.org on 2020/11/17 20:18:01 UTC
[hive] branch branch-2.3 updated: HIVE-24324: Remove deprecated API
usage from Avro (#1621) (#1672)
This is an automated email from the ASF dual-hosted git repository.
sunchao pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 01c72d2 HIVE-24324: Remove deprecated API usage from Avro (#1621) (#1672)
01c72d2 is described below
commit 01c72d2da6861b8a96578fd0289a33e5ae0e2eac
Author: Chao Sun <su...@apache.org>
AuthorDate: Tue Nov 17 12:17:00 2020 -0800
HIVE-24324: Remove deprecated API usage from Avro (#1621) (#1672)
---
.../apache/hadoop/hive/serde2/avro/AvroDeserializer.java | 6 +++---
.../org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java | 12 ++++++++++++
.../apache/hadoop/hive/serde2/avro/SchemaToTypeInfo.java | 14 ++++++++++----
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
index ecfe15f..7d53569 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
@@ -244,7 +244,7 @@ class AvroDeserializer {
int scale = 0;
try {
- scale = fileSchema.getJsonProp(AvroSerDe.AVRO_PROP_SCALE).asInt();
+ scale = AvroSerdeUtils.getIntFromSchema(fileSchema, AvroSerDe.AVRO_PROP_SCALE);
} catch(Exception ex) {
throw new AvroSerdeException("Failed to obtain scale value from file schema: " + fileSchema, ex);
}
@@ -260,7 +260,7 @@ class AvroDeserializer {
int maxLength = 0;
try {
- maxLength = fileSchema.getJsonProp(AvroSerDe.AVRO_PROP_MAX_LENGTH).getValueAsInt();
+ maxLength = AvroSerdeUtils.getIntFromSchema(fileSchema, AvroSerDe.AVRO_PROP_MAX_LENGTH);
} catch (Exception ex) {
throw new AvroSerdeException("Failed to obtain maxLength value for char field from file schema: " + fileSchema, ex);
}
@@ -275,7 +275,7 @@ class AvroDeserializer {
maxLength = 0;
try {
- maxLength = fileSchema.getJsonProp(AvroSerDe.AVRO_PROP_MAX_LENGTH).getValueAsInt();
+ maxLength = AvroSerdeUtils.getIntFromSchema(fileSchema, AvroSerDe.AVRO_PROP_MAX_LENGTH);
} catch (Exception ex) {
throw new AvroSerdeException("Failed to obtain maxLength value for varchar field from file schema: " + fileSchema, ex);
}
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java
index 391a300..79d31c7 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java
@@ -309,6 +309,18 @@ public class AvroSerdeUtils {
}
}
+ public static int getIntFromSchema(Schema schema, String name) {
+ Object obj = schema.getObjectProp(name);
+ if (obj instanceof String) {
+ return Integer.parseInt((String) obj);
+ } else if (obj instanceof Integer) {
+ return (int) obj;
+ } else {
+ throw new IllegalArgumentException("Expect integer or string value from property " + name
+ + " but found type " + obj.getClass().getName());
+ }
+ }
+
/**
* Called on specific alter table events, removes schema url and schema literal from given tblproperties
* After the change, HMS solely will be responsible for handling the schema
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/SchemaToTypeInfo.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/SchemaToTypeInfo.java
index 35d83bd..5557a6a 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/SchemaToTypeInfo.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/SchemaToTypeInfo.java
@@ -136,8 +136,14 @@ class SchemaToTypeInfo {
int precision = 0;
int scale = 0;
try {
- precision = schema.getJsonProp(AvroSerDe.AVRO_PROP_PRECISION).getIntValue();
- scale = schema.getJsonProp(AvroSerDe.AVRO_PROP_SCALE).getIntValue();
+ Object o = schema.getObjectProp(AvroSerDe.AVRO_PROP_PRECISION);
+ if (o instanceof Integer) {
+ precision = (int) o;
+ }
+ o = schema.getObjectProp(AvroSerDe.AVRO_PROP_SCALE);
+ if (o instanceof Integer) {
+ scale = (int) o;
+ }
} catch (Exception ex) {
throw new AvroSerdeException("Failed to obtain scale value from file schema: " + schema, ex);
}
@@ -155,7 +161,7 @@ class SchemaToTypeInfo {
AvroSerDe.CHAR_TYPE_NAME.equalsIgnoreCase(schema.getProp(AvroSerDe.AVRO_PROP_LOGICAL_TYPE))) {
int maxLength = 0;
try {
- maxLength = schema.getJsonProp(AvroSerDe.AVRO_PROP_MAX_LENGTH).getValueAsInt();
+ maxLength = AvroSerdeUtils.getIntFromSchema(schema, AvroSerDe.AVRO_PROP_MAX_LENGTH);
} catch (Exception ex) {
throw new AvroSerdeException("Failed to obtain maxLength value from file schema: " + schema, ex);
}
@@ -166,7 +172,7 @@ class SchemaToTypeInfo {
.equalsIgnoreCase(schema.getProp(AvroSerDe.AVRO_PROP_LOGICAL_TYPE))) {
int maxLength = 0;
try {
- maxLength = schema.getJsonProp(AvroSerDe.AVRO_PROP_MAX_LENGTH).getValueAsInt();
+ maxLength = AvroSerdeUtils.getIntFromSchema(schema, AvroSerDe.AVRO_PROP_MAX_LENGTH);
} catch (Exception ex) {
throw new AvroSerdeException("Failed to obtain maxLength value from file schema: " + schema, ex);
}