Skip to content

Commit 1b2792c

Browse files
authored
[minor] following 3304, some code refactoring (apache#6713)
1 parent c0eae6d commit 1b2792c

5 files changed

Lines changed: 16 additions & 9 deletions

File tree

hudi-client/hudi-client-common/src/main/java/org/apache/hudi/execution/HoodieLazyInsertIterable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static <T extends HoodieRecordPayload> Function<HoodieRecord<T>, HoodieInsertVal
105105

106106
static <T extends HoodieRecordPayload> Function<HoodieRecord<T>, HoodieInsertValueGenResult<HoodieRecord>> getTransformFunction(
107107
Schema schema) {
108-
return hoodieRecord -> new HoodieInsertValueGenResult(hoodieRecord, schema, CollectionUtils.EMPTY_PROPERTIES);
108+
return hoodieRecord -> new HoodieInsertValueGenResult(hoodieRecord, schema, CollectionUtils.emptyProps());
109109
}
110110

111111
@Override

hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/HoodieWriteHelper.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
import org.apache.hudi.common.model.HoodieKey;
2727
import org.apache.hudi.common.model.HoodieRecord;
2828
import org.apache.hudi.common.model.HoodieRecordPayload;
29+
import org.apache.hudi.common.util.CollectionUtils;
2930
import org.apache.hudi.common.util.collection.Pair;
3031
import org.apache.hudi.index.HoodieIndex;
3132
import org.apache.hudi.table.HoodieTable;
3233

33-
import java.util.Properties;
34-
3534
public class HoodieWriteHelper<T extends HoodieRecordPayload, R> extends BaseWriteHelper<T, HoodieData<HoodieRecord<T>>,
3635
HoodieData<HoodieKey>, HoodieData<WriteStatus>, R> {
3736

@@ -64,7 +63,7 @@ public HoodieData<HoodieRecord<T>> deduplicateRecords(
6463
return Pair.of(key, record);
6564
}).reduceByKey((rec1, rec2) -> {
6665
@SuppressWarnings("unchecked")
67-
T reducedData = (T) rec2.getData().preCombine(rec1.getData(), schema.get(), new Properties());
66+
T reducedData = (T) rec2.getData().preCombine(rec1.getData(), schema.get(), CollectionUtils.emptyProps());
6867
HoodieKey reducedKey = rec1.getData().equals(reducedData) ? rec1.getKey() : rec2.getKey();
6968

7069
return new HoodieAvroRecord<>(reducedKey, reducedData);

hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/action/commit/FlinkWriteHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.hudi.common.model.HoodieRecord;
2828
import org.apache.hudi.common.model.HoodieRecordPayload;
2929
import org.apache.hudi.common.model.WriteOperationType;
30+
import org.apache.hudi.common.util.CollectionUtils;
3031
import org.apache.hudi.exception.HoodieUpsertException;
3132
import org.apache.hudi.index.HoodieIndex;
3233
import org.apache.hudi.table.HoodieTable;
@@ -39,7 +40,6 @@
3940
import java.util.List;
4041
import java.util.Map;
4142
import java.util.Objects;
42-
import java.util.Properties;
4343
import java.util.stream.Collectors;
4444

4545
/**
@@ -102,7 +102,7 @@ public List<HoodieRecord<T>> deduplicateRecords(
102102
final T data1 = rec1.getData();
103103
final T data2 = rec2.getData();
104104

105-
@SuppressWarnings("unchecked") final T reducedData = (T) data2.preCombine(data1, schema, new Properties());
105+
@SuppressWarnings("unchecked") final T reducedData = (T) data2.preCombine(data1, schema, CollectionUtils.emptyProps());
106106
// we cannot allow the user to change the key or partitionPath, since that will affect
107107
// everything
108108
// so pick it from one of the records.

hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/commit/JavaWriteHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.hudi.common.model.HoodieKey;
2626
import org.apache.hudi.common.model.HoodieRecord;
2727
import org.apache.hudi.common.model.HoodieRecordPayload;
28+
import org.apache.hudi.common.util.CollectionUtils;
2829
import org.apache.hudi.common.util.collection.Pair;
2930
import org.apache.hudi.index.HoodieIndex;
3031
import org.apache.hudi.table.HoodieTable;
@@ -34,7 +35,6 @@
3435
import java.util.List;
3536
import java.util.Map;
3637
import java.util.Objects;
37-
import java.util.Properties;
3838
import java.util.stream.Collectors;
3939

4040
public class JavaWriteHelper<T extends HoodieRecordPayload,R> extends BaseWriteHelper<T, List<HoodieRecord<T>>,
@@ -70,7 +70,7 @@ public List<HoodieRecord<T>> deduplicateRecords(
7070
final Schema schema = new Schema.Parser().parse(schemaStr);
7171
return keyedRecords.values().stream().map(x -> x.stream().map(Pair::getRight).reduce((rec1, rec2) -> {
7272
@SuppressWarnings("unchecked")
73-
T reducedData = (T) rec1.getData().preCombine(rec2.getData(), schema, new Properties());
73+
T reducedData = (T) rec1.getData().preCombine(rec2.getData(), schema, CollectionUtils.emptyProps());
7474
// we cannot allow the user to change the key or partitionPath, since that will affect
7575
// everything
7676
// so pick it from one of the records.

hudi-common/src/main/java/org/apache/hudi/common/util/CollectionUtils.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,15 @@
4444

4545
public class CollectionUtils {
4646

47-
public static final Properties EMPTY_PROPERTIES = new Properties();
47+
private static final Properties EMPTY_PROPERTIES = new Properties();
48+
49+
/**
50+
* Returns an empty {@code Properties} instance. The props instance is a singleton,
51+
* it should not be modified in any case.
52+
*/
53+
public static Properties emptyProps() {
54+
return EMPTY_PROPERTIES;
55+
}
4856

4957
public static boolean isNullOrEmpty(Collection<?> c) {
5058
return Objects.isNull(c) || c.isEmpty();

0 commit comments

Comments
 (0)