nsivabalan commented on a change in pull request #2993:
URL: https://github.com/apache/hudi/pull/2993#discussion_r643863514
##########
File path:
hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/keygen/TestCustomKeyGenerator.java
##########
@@ -98,53 +103,145 @@ private TypedProperties
getPropertiesForNonPartitionedKeyGen() {
}
@Test
- public void testSimpleKeyGenerator() {
- BuiltinKeyGenerator keyGenerator = new
CustomKeyGenerator(getPropertiesForSimpleKeyGen());
+ public void testSimpleKeyGenerator() throws IOException {
+ TypedProperties propertiesForSimpleKeyGen = getPropertiesForSimpleKeyGen();
+
+ // Test config with HoodieWriteConfig.KEYGENERATOR_CLASS_PROP
+ propertiesForSimpleKeyGen.put(HoodieWriteConfig.KEYGENERATOR_CLASS_PROP,
CustomKeyGenerator.class.getName());
+
+ BuiltinKeyGenerator keyGenerator =
HoodieSparkKeyGeneratorFactory.createKeyGenerator(propertiesForSimpleKeyGen);
GenericRecord record = getRecord();
HoodieKey key = keyGenerator.getKey(record);
Assertions.assertEquals(key.getRecordKey(), "key1");
Assertions.assertEquals(key.getPartitionPath(), "timestamp=4357686");
Row row = KeyGeneratorTestUtilities.getRow(record);
Assertions.assertEquals(keyGenerator.getRecordKey(row), "key1");
Assertions.assertEquals(keyGenerator.getPartitionPath(row),
"timestamp=4357686");
+
+ // Test config with HoodieWriteConfig.KEYGENERATOR_TYPE_PROP
+ propertiesForSimpleKeyGen = getPropertiesForSimpleKeyGen();
+ propertiesForSimpleKeyGen.put(HoodieWriteConfig.KEYGENERATOR_TYPE_PROP,
KeyGeneratorType.CUSTOM.name());
+
+ keyGenerator =
HoodieSparkKeyGeneratorFactory.createKeyGenerator(propertiesForSimpleKeyGen);
Review comment:
we could trying moving this repetitive code to a common private method
and re-use them. I mean lines 125 to 132. Similarly for all key types.
##########
File path:
hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/keygen/TestCustomKeyGenerator.java
##########
@@ -98,53 +103,145 @@ private TypedProperties
getPropertiesForNonPartitionedKeyGen() {
}
@Test
- public void testSimpleKeyGenerator() {
- BuiltinKeyGenerator keyGenerator = new
CustomKeyGenerator(getPropertiesForSimpleKeyGen());
+ public void testSimpleKeyGenerator() throws IOException {
+ TypedProperties propertiesForSimpleKeyGen = getPropertiesForSimpleKeyGen();
+
+ // Test config with HoodieWriteConfig.KEYGENERATOR_CLASS_PROP
+ propertiesForSimpleKeyGen.put(HoodieWriteConfig.KEYGENERATOR_CLASS_PROP,
CustomKeyGenerator.class.getName());
+
+ BuiltinKeyGenerator keyGenerator =
HoodieSparkKeyGeneratorFactory.createKeyGenerator(propertiesForSimpleKeyGen);
GenericRecord record = getRecord();
HoodieKey key = keyGenerator.getKey(record);
Assertions.assertEquals(key.getRecordKey(), "key1");
Assertions.assertEquals(key.getPartitionPath(), "timestamp=4357686");
Row row = KeyGeneratorTestUtilities.getRow(record);
Assertions.assertEquals(keyGenerator.getRecordKey(row), "key1");
Assertions.assertEquals(keyGenerator.getPartitionPath(row),
"timestamp=4357686");
+
+ // Test config with HoodieWriteConfig.KEYGENERATOR_TYPE_PROP
+ propertiesForSimpleKeyGen = getPropertiesForSimpleKeyGen();
+ propertiesForSimpleKeyGen.put(HoodieWriteConfig.KEYGENERATOR_TYPE_PROP,
KeyGeneratorType.CUSTOM.name());
+
+ keyGenerator =
HoodieSparkKeyGeneratorFactory.createKeyGenerator(propertiesForSimpleKeyGen);
Review comment:
or better option would be to go with Parameterized tests.
##########
File path:
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/constant/KeyGeneratorType.java
##########
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hudi.keygen.constant;
+
+/**
+ * Types of {@link org.apache.hudi.keygen.KeyGenerator}.
+ */
+public enum KeyGeneratorType {
+ /**
+ * Simple key generator, which takes names of fields to be used for
recordKey and partitionPath as configs.
+ */
+ SIMPLE,
+
+ /**
+ * Complex key generator, which takes names of fields to be used for
recordKey and partitionPath as configs.
+ */
+ COMPLEX,
+
+ /**
+ * Key generator, that relies on timestamps for partitioning field. Still
picks record key by name.
+ */
+ TIMESTAMP,
+
+ /**
+ * A generic implementation of KeyGenerator where users can configure record
key as a single field or a combination
Review comment:
Can we please add an example for custom alone. users might confuse
between complex and custom.
##########
File path:
hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/keygen/TestCustomKeyGenerator.java
##########
@@ -220,5 +425,21 @@ public void
testComplexRecordKeysWithComplexPartitionPath() {
Row row = KeyGeneratorTestUtilities.getRow(record);
Assertions.assertEquals(keyGenerator.getRecordKey(row),
"_row_key:key1,pii_col:pi");
Assertions.assertEquals(keyGenerator.getPartitionPath(row),
"timestamp=4357686/ts_ms=20200321");
+
+ // Test config with HoodieWriteConfig.KEYGENERATOR_TYPE_PROP
+ complexRecordKeyAndPartitionPathProps =
getComplexRecordKeyAndPartitionPathProps();
+ complexRecordKeyAndPartitionPathProps
+ .put(HoodieWriteConfig.KEYGENERATOR_TYPE_PROP,
KeyGeneratorType.CUSTOM.name());
+
+ keyGenerator =
HoodieSparkKeyGeneratorFactory.createKeyGenerator(complexRecordKeyAndPartitionPathProps);
+
+ record = getRecord();
Review comment:
would be nice to avoid copy pasting code. Let's try to parametrize
tests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
