This is an automated email from the ASF dual-hosted git repository.
codope pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new ca2140e2003 [MINOR] rename KeyGenUtils#enableAutoGenerateRecordKeys
(#10871)
ca2140e2003 is described below
commit ca2140e20030061691572566c5fea7012e584575
Author: wombatu-kun <[email protected]>
AuthorDate: Fri Mar 15 20:14:37 2024 +0700
[MINOR] rename KeyGenUtils#enableAutoGenerateRecordKeys (#10871)
Co-authored-by: Vova Kolmakov <[email protected]>
---
.../src/main/java/org/apache/hudi/keygen/KeyGenUtils.java | 2 +-
.../org/apache/hudi/keygen/factory/HoodieAvroKeyGeneratorFactory.java | 2 +-
.../org/apache/hudi/keygen/factory/HoodieSparkKeyGeneratorFactory.java | 2 +-
.../src/main/scala/org/apache/hudi/HoodieDatasetBulkInsertHelper.scala | 2 +-
.../main/scala/org/apache/spark/sql/hudi/command/SqlKeyGenerator.scala | 2 +-
.../src/main/java/org/apache/hudi/utilities/streamer/StreamSync.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/KeyGenUtils.java
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/KeyGenUtils.java
index 6266d965fd4..4d7c83a7794 100644
---
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/KeyGenUtils.java
+++
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/KeyGenUtils.java
@@ -267,7 +267,7 @@ public class KeyGenUtils {
* @param props props of interest.
* @return true if record keys need to be auto generated. false otherwise.
*/
- public static boolean enableAutoGenerateRecordKeys(TypedProperties props) {
+ public static boolean isAutoGeneratedRecordKeysEnabled(TypedProperties
props) {
return !props.containsKey(KeyGeneratorOptions.RECORDKEY_FIELD_NAME.key());
}
}
diff --git
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/factory/HoodieAvroKeyGeneratorFactory.java
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/factory/HoodieAvroKeyGeneratorFactory.java
index f375095122d..f68e3232753 100644
---
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/factory/HoodieAvroKeyGeneratorFactory.java
+++
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/factory/HoodieAvroKeyGeneratorFactory.java
@@ -98,7 +98,7 @@ public class HoodieAvroKeyGeneratorFactory {
throw new HoodieKeyGeneratorException("Unsupported keyGenerator Type "
+ keyGeneratorType);
}
- if (KeyGenUtils.enableAutoGenerateRecordKeys(props)) {
+ if (KeyGenUtils.isAutoGeneratedRecordKeysEnabled(props)) {
return new AutoRecordGenWrapperAvroKeyGenerator(props, keyGenerator);
} else {
return keyGenerator;
diff --git
a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/factory/HoodieSparkKeyGeneratorFactory.java
b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/factory/HoodieSparkKeyGeneratorFactory.java
index 34d22000fb2..1ea5adcd6b4 100644
---
a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/factory/HoodieSparkKeyGeneratorFactory.java
+++
b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/factory/HoodieSparkKeyGeneratorFactory.java
@@ -79,7 +79,7 @@ public class HoodieSparkKeyGeneratorFactory {
public static KeyGenerator createKeyGenerator(TypedProperties props) throws
IOException {
String keyGeneratorClass = getKeyGeneratorClassName(props);
- boolean autoRecordKeyGen = KeyGenUtils.enableAutoGenerateRecordKeys(props)
+ boolean autoRecordKeyGen =
KeyGenUtils.isAutoGeneratedRecordKeysEnabled(props)
//Need to prevent overwriting the keygen for spark sql merge into
because we need to extract
//the recordkey from the meta cols if it exists. Sql keygen will use
pkless keygen if needed.
&& !props.getBoolean(SPARK_SQL_MERGE_INTO_PREPPED_KEY, false);
diff --git
a/hudi-client/hudi-spark-client/src/main/scala/org/apache/hudi/HoodieDatasetBulkInsertHelper.scala
b/hudi-client/hudi-spark-client/src/main/scala/org/apache/hudi/HoodieDatasetBulkInsertHelper.scala
index 6df92860582..3c30d825ebf 100644
---
a/hudi-client/hudi-spark-client/src/main/scala/org/apache/hudi/HoodieDatasetBulkInsertHelper.scala
+++
b/hudi-client/hudi-spark-client/src/main/scala/org/apache/hudi/HoodieDatasetBulkInsertHelper.scala
@@ -70,7 +70,7 @@ object HoodieDatasetBulkInsertHelper
instantTime: String): Dataset[Row] = {
val populateMetaFields = config.populateMetaFields()
val schema = df.schema
- val autoGenerateRecordKeys =
KeyGenUtils.enableAutoGenerateRecordKeys(config.getProps)
+ val autoGenerateRecordKeys =
KeyGenUtils.isAutoGeneratedRecordKeysEnabled(config.getProps)
val metaFields = Seq(
StructField(HoodieRecord.COMMIT_TIME_METADATA_FIELD, StringType),
diff --git
a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/spark/sql/hudi/command/SqlKeyGenerator.scala
b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/spark/sql/hudi/command/SqlKeyGenerator.scala
index 04f1fbd5ba0..740ac675868 100644
---
a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/spark/sql/hudi/command/SqlKeyGenerator.scala
+++
b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/spark/sql/hudi/command/SqlKeyGenerator.scala
@@ -49,7 +49,7 @@ class SqlKeyGenerator(props: TypedProperties) extends
BuiltinKeyGenerator(props)
}
}
- private lazy val autoRecordKeyGen =
KeyGenUtils.enableAutoGenerateRecordKeys(props)
+ private lazy val autoRecordKeyGen =
KeyGenUtils.isAutoGeneratedRecordKeysEnabled(props)
private lazy val complexKeyGen = if (autoRecordKeyGen) {
new AutoRecordGenWrapperKeyGenerator(props, new ComplexKeyGenerator(props))
} else {
diff --git
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/streamer/StreamSync.java
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/streamer/StreamSync.java
index 2d8e0f02c31..1453e9fd07c 100644
---
a/hudi-utilities/src/main/java/org/apache/hudi/utilities/streamer/StreamSync.java
+++
b/hudi-utilities/src/main/java/org/apache/hudi/utilities/streamer/StreamSync.java
@@ -273,7 +273,7 @@ public class StreamSync implements Serializable, Closeable {
this.props = props;
this.userProvidedSchemaProvider = streamContext.getSchemaProvider();
this.processedSchema = new SchemaSet();
- this.autoGenerateRecordKeys =
KeyGenUtils.enableAutoGenerateRecordKeys(props);
+ this.autoGenerateRecordKeys =
KeyGenUtils.isAutoGeneratedRecordKeysEnabled(props);
this.keyGenClassName = getKeyGeneratorClassName(new
TypedProperties(props));
this.conf = conf;
