Skip to content

Commit 7258140

Browse files
danny0405yuzhaojing
authored andcommitted
[minor] following 3304, some code refactoring (apache#6713)
1 parent 29b214f commit 7258140

5 files changed

Lines changed: 16 additions & 5 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 & 1 deletion
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;
@@ -60,7 +61,7 @@ public HoodieData<HoodieRecord<T>> deduplicateRecords(
6061
return Pair.of(key, record);
6162
}).reduceByKey((rec1, rec2) -> {
6263
@SuppressWarnings("unchecked")
63-
T reducedData = (T) rec2.getData().preCombine(rec1.getData());
64+
T reducedData = (T) rec2.getData().preCombine(rec1.getData(), CollectionUtils.emptyProps());
6465
HoodieKey reducedKey = rec1.getData().equals(reducedData) ? rec1.getKey() : rec2.getKey();
6566

6667
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 & 1 deletion
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;
@@ -97,7 +98,7 @@ public List<HoodieRecord<T>> deduplicateRecords(
9798
final T data1 = rec1.getData();
9899
final T data2 = rec2.getData();
99100

100-
@SuppressWarnings("unchecked") final T reducedData = (T) data2.preCombine(data1);
101+
@SuppressWarnings("unchecked") final T reducedData = (T) data2.preCombine(data1, CollectionUtils.emptyProps());
101102
// we cannot allow the user to change the key or partitionPath, since that will affect
102103
// everything
103104
// 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 & 1 deletion
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;
@@ -66,7 +67,7 @@ public List<HoodieRecord<T>> deduplicateRecords(
6667

6768
return keyedRecords.values().stream().map(x -> x.stream().map(Pair::getRight).reduce((rec1, rec2) -> {
6869
@SuppressWarnings("unchecked")
69-
T reducedData = (T) rec1.getData().preCombine(rec2.getData());
70+
T reducedData = (T) rec1.getData().preCombine(rec2.getData(), CollectionUtils.emptyProps());
7071
// we cannot allow the user to change the key or partitionPath, since that will affect
7172
// everything
7273
// 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)