lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-2123] Exception When Merge With Null-Value Field (#3214)

Browse Source
This commit is contained in:
pengzhiwei
2021-07-02 22:46:52 +08:00
committed by GitHub
parent d424fe6072
commit 70d9c2e747
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/payload/SqlTypedRecord.scala
View File

@@ -51,7 +51,11 @@ class SqlTypedRecord(val record: IndexedRecord) extends IndexedRecord {
val value = record.get(i)
val avroFieldType = getSchema.getFields.get(i).schema()
val sqlFieldType = sqlType.fields(i).dataType
convert(avroFieldType, sqlFieldType, value)
if (value == null) {
null
} else {
convert(avroFieldType, sqlFieldType, value)
}
}
private def convert(avroFieldType: Schema, sqlFieldType: DataType, value: AnyRef): AnyRef = {
@@ -89,6 +93,7 @@ class SqlTypedRecord(val record: IndexedRecord) extends IndexedRecord {
case (STRING, StringType) => value match {
case s: String => UTF8String.fromString(s)
case s: Utf8 => UTF8String.fromString(s.toString)
case o => throw new IllegalArgumentException(s"Cannot convert $o to StringType")
}
case (ENUM, StringType) => value.toString