lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-3401] fix NPE caused by incorrect beforeKeyGenClassName validation (#4774)

Browse Source
This commit is contained in:
todd5167
2022-02-25 12:31:29 +08:00
committed by GitHub
parent 3694485609
commit 45d1216e91
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/spark/sql/hudi/command/SqlKeyGenerator.scala
View File

@@ -47,7 +47,7 @@ class SqlKeyGenerator(props: TypedProperties) extends ComplexKeyGenerator(props)
// The origin key generator class for this table. // The origin key generator class for this table.
private lazy val originKeyGen = { private lazy val originKeyGen = {
val beforeKeyGenClassName = props.getString(SqlKeyGenerator.ORIGIN_KEYGEN_CLASS_NAME, null) val beforeKeyGenClassName = props.getString(SqlKeyGenerator.ORIGIN_KEYGEN_CLASS_NAME, null)
if (beforeKeyGenClassName != null) { if (beforeKeyGenClassName != null && beforeKeyGenClassName.nonEmpty) {
val keyGenProps = new TypedProperties() val keyGenProps = new TypedProperties()
keyGenProps.putAll(props) keyGenProps.putAll(props)
keyGenProps.remove(SqlKeyGenerator.ORIGIN_KEYGEN_CLASS_NAME) keyGenProps.remove(SqlKeyGenerator.ORIGIN_KEYGEN_CLASS_NAME)
@@ -132,7 +132,7 @@ object SqlKeyGenerator {
def getRealKeyGenClassName(props: TypedProperties): String = { def getRealKeyGenClassName(props: TypedProperties): String = {
val beforeKeyGenClassName = props.getString(SqlKeyGenerator.ORIGIN_KEYGEN_CLASS_NAME, null) val beforeKeyGenClassName = props.getString(SqlKeyGenerator.ORIGIN_KEYGEN_CLASS_NAME, null)
if (beforeKeyGenClassName != null) { if (beforeKeyGenClassName != null && beforeKeyGenClassName.nonEmpty) {
HoodieSparkKeyGeneratorFactory.convertToSparkKeyGenerator(beforeKeyGenClassName) HoodieSparkKeyGeneratorFactory.convertToSparkKeyGenerator(beforeKeyGenClassName)
} else { } else {
classOf[ComplexKeyGenerator].getCanonicalName classOf[ComplexKeyGenerator].getCanonicalName