lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-2957] Shade kryo jar for flink bundle jar (#4251)

Browse Source
This commit is contained in:
Danny Chan
2021-12-09 10:16:42 +08:00
committed by GitHub
parent 7c3f0777aa
commit bd08470421
5 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hudi-flink/src/main/java/org/apache/hudi/util/AvroSchemaConverter.java
View File

@@ -46,7 +46,7 @@ import java.util.List;
* SQL API.
*
* <p>Note: Changes in this class need to be kept in sync with the corresponding runtime classes
* {@link org.apache.flink.formats.avro.AvroRowDeserializationSchema} and {@link org.apache.flink.formats.avro.AvroRowSerializationSchema}.
* {@code org.apache.flink.formats.avro.AvroRowDeserializationSchema} and {@code org.apache.flink.formats.avro.AvroRowSerializationSchema}.
*
* <p>NOTE: reference from Flink release 1.12.0, should remove when Flink version upgrade to that.
*/
@@ -294,7 +294,7 @@ public class AvroSchemaConverter {
}
}
private static LogicalType extractValueTypeToAvroMap(LogicalType type) {
public static LogicalType extractValueTypeToAvroMap(LogicalType type) {
LogicalType keyType;
LogicalType valueType;
if (type instanceof MapType) {

4
hudi-flink/src/main/java/org/apache/hudi/util/AvroToRowDataConverters.java
View File

@@ -49,8 +49,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.apache.flink.formats.avro.typeutils.AvroSchemaConverter.extractValueTypeToAvroMap;
/**
* Tool class used to convert from Avro {@link GenericRecord} to {@link RowData}.
*
@@ -188,7 +186,7 @@ public class AvroToRowDataConverters {
final AvroToRowDataConverter keyConverter =
createConverter(DataTypes.STRING().getLogicalType());
final AvroToRowDataConverter valueConverter =
createNullableConverter(extractValueTypeToAvroMap(type));
createNullableConverter(AvroSchemaConverter.extractValueTypeToAvroMap(type));
return avroObject -> {
final Map<?, ?> map = (Map<?, ?>) avroObject;

4
hudi-flink/src/main/java/org/apache/hudi/util/RowDataToAvroConverters.java
View File

@@ -39,8 +39,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.apache.flink.formats.avro.typeutils.AvroSchemaConverter.extractValueTypeToAvroMap;
/**
* Tool class used to convert from {@link RowData} to Avro {@link GenericRecord}.
*
@@ -279,7 +277,7 @@ public class RowDataToAvroConverters {
}
private static RowDataToAvroConverter createMapConverter(LogicalType type) {
LogicalType valueType = extractValueTypeToAvroMap(type);
LogicalType valueType = AvroSchemaConverter.extractValueTypeToAvroMap(type);
final ArrayData.ElementGetter valueGetter = ArrayData.createElementGetter(valueType);
final RowDataToAvroConverter valueConverter = createConverter(valueType);