yihua commented on code in PR #12826:
URL: https://github.com/apache/hudi/pull/12826#discussion_r1974224674
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/table/action/TestCleanPlanner.java:
##########
@@ -587,49 +584,35 @@ private static HoodieFileGroup
buildFileGroup(List<String> baseFileCommitTimes,
return group;
}
- private static Option<byte[]> getSavepointBytes(String partition,
List<String> paths) {
- try {
- Map<String, HoodieSavepointPartitionMetadata> partitionMetadata = new
HashMap<>();
- List<String> fileNames = paths.stream().map(path ->
path.substring(path.lastIndexOf("/") + 1)).collect(Collectors.toList());
- partitionMetadata.put(partition, new
HoodieSavepointPartitionMetadata(partition, fileNames));
- HoodieSavepointMetadata savepointMetadata =
- new HoodieSavepointMetadata("user", 1L, "comments",
partitionMetadata, 1);
- return
TimelineMetadataUtils.serializeSavepointMetadata(savepointMetadata);
- } catch (IOException ex) {
- throw new UncheckedIOException(ex);
- }
+ private static HoodieSavepointMetadata getSavepointBytes(String partition,
List<String> paths) {
+ Map<String, HoodieSavepointPartitionMetadata> partitionMetadata = new
HashMap<>();
+ List<String> fileNames = paths.stream().map(path ->
path.substring(path.lastIndexOf("/") + 1)).collect(Collectors.toList());
+ partitionMetadata.put(partition, new
HoodieSavepointPartitionMetadata(partition, fileNames));
+ return new HoodieSavepointMetadata("user", 1L, "comments",
partitionMetadata, 1);
}
- private static Pair<HoodieCleanMetadata, Option<byte[]>>
getCleanCommitMetadata(List<String> partitions, String instantTime, String
earliestCommitToRetain,
+ private static Pair<HoodieCleanMetadata, HoodieCleanMetadata>
getCleanCommitMetadata(List<String> partitions, String instantTime, String
earliestCommitToRetain,
String lastCompletedTime, Set<String> savepointsToTrack, Option<String>
earliestCommitToNotArchive) {
- try {
- Map<String, HoodieCleanPartitionMetadata> partitionMetadata = new
HashMap<>();
- partitions.forEach(partition -> partitionMetadata.put(partition, new
HoodieCleanPartitionMetadata(partition,
HoodieCleaningPolicy.KEEP_LATEST_COMMITS.name(),
- Collections.emptyList(), Collections.emptyList(),
Collections.emptyList(), false)));
- Map<String, String> extraMetadata = new HashMap<>();
- extraMetadata.put(SAVEPOINTED_TIMESTAMPS,
savepointsToTrack.stream().collect(Collectors.joining(",")));
- HoodieCleanMetadata cleanMetadata = new HoodieCleanMetadata(instantTime,
100L, 10, earliestCommitToRetain, lastCompletedTime, partitionMetadata,
- CLEAN_METADATA_VERSION_2, Collections.EMPTY_MAP,
extraMetadata.isEmpty() ? null : extraMetadata);
- return Pair.of(cleanMetadata,
TimelineMetadataUtils.serializeCleanMetadata(cleanMetadata));
- } catch (IOException ex) {
- throw new UncheckedIOException(ex);
- }
+ Map<String, HoodieCleanPartitionMetadata> partitionMetadata = new
HashMap<>();
+ partitions.forEach(partition -> partitionMetadata.put(partition, new
HoodieCleanPartitionMetadata(partition,
HoodieCleaningPolicy.KEEP_LATEST_COMMITS.name(),
+ Collections.emptyList(), Collections.emptyList(),
Collections.emptyList(), false)));
+ Map<String, String> extraMetadata = new HashMap<>();
+ extraMetadata.put(SAVEPOINTED_TIMESTAMPS,
savepointsToTrack.stream().collect(Collectors.joining(",")));
+ HoodieCleanMetadata cleanMetadata = new HoodieCleanMetadata(instantTime,
100L, 10, earliestCommitToRetain, lastCompletedTime, partitionMetadata,
+ CLEAN_METADATA_VERSION_2, Collections.EMPTY_MAP,
extraMetadata.isEmpty() ? null : extraMetadata);
+ return Pair.of(cleanMetadata, cleanMetadata);
Review Comment:
Duplicates are returned. We can get rid of the `Pair` here.
##########
hudi-client/hudi-client-common/src/test/java/org/apache/hudi/table/action/TestCleanPlanner.java:
##########
@@ -587,49 +584,35 @@ private static HoodieFileGroup
buildFileGroup(List<String> baseFileCommitTimes,
return group;
}
- private static Option<byte[]> getSavepointBytes(String partition,
List<String> paths) {
- try {
- Map<String, HoodieSavepointPartitionMetadata> partitionMetadata = new
HashMap<>();
- List<String> fileNames = paths.stream().map(path ->
path.substring(path.lastIndexOf("/") + 1)).collect(Collectors.toList());
- partitionMetadata.put(partition, new
HoodieSavepointPartitionMetadata(partition, fileNames));
- HoodieSavepointMetadata savepointMetadata =
- new HoodieSavepointMetadata("user", 1L, "comments",
partitionMetadata, 1);
- return
TimelineMetadataUtils.serializeSavepointMetadata(savepointMetadata);
- } catch (IOException ex) {
- throw new UncheckedIOException(ex);
- }
+ private static HoodieSavepointMetadata getSavepointBytes(String partition,
List<String> paths) {
+ Map<String, HoodieSavepointPartitionMetadata> partitionMetadata = new
HashMap<>();
+ List<String> fileNames = paths.stream().map(path ->
path.substring(path.lastIndexOf("/") + 1)).collect(Collectors.toList());
+ partitionMetadata.put(partition, new
HoodieSavepointPartitionMetadata(partition, fileNames));
+ return new HoodieSavepointMetadata("user", 1L, "comments",
partitionMetadata, 1);
}
- private static Pair<HoodieCleanMetadata, Option<byte[]>>
getCleanCommitMetadata(List<String> partitions, String instantTime, String
earliestCommitToRetain,
+ private static Pair<HoodieCleanMetadata, HoodieCleanMetadata>
getCleanCommitMetadata(List<String> partitions, String instantTime, String
earliestCommitToRetain,
String lastCompletedTime, Set<String> savepointsToTrack, Option<String>
earliestCommitToNotArchive) {
- try {
- Map<String, HoodieCleanPartitionMetadata> partitionMetadata = new
HashMap<>();
- partitions.forEach(partition -> partitionMetadata.put(partition, new
HoodieCleanPartitionMetadata(partition,
HoodieCleaningPolicy.KEEP_LATEST_COMMITS.name(),
- Collections.emptyList(), Collections.emptyList(),
Collections.emptyList(), false)));
- Map<String, String> extraMetadata = new HashMap<>();
- extraMetadata.put(SAVEPOINTED_TIMESTAMPS,
savepointsToTrack.stream().collect(Collectors.joining(",")));
- HoodieCleanMetadata cleanMetadata = new HoodieCleanMetadata(instantTime,
100L, 10, earliestCommitToRetain, lastCompletedTime, partitionMetadata,
- CLEAN_METADATA_VERSION_2, Collections.EMPTY_MAP,
extraMetadata.isEmpty() ? null : extraMetadata);
- return Pair.of(cleanMetadata,
TimelineMetadataUtils.serializeCleanMetadata(cleanMetadata));
- } catch (IOException ex) {
- throw new UncheckedIOException(ex);
- }
+ Map<String, HoodieCleanPartitionMetadata> partitionMetadata = new
HashMap<>();
+ partitions.forEach(partition -> partitionMetadata.put(partition, new
HoodieCleanPartitionMetadata(partition,
HoodieCleaningPolicy.KEEP_LATEST_COMMITS.name(),
+ Collections.emptyList(), Collections.emptyList(),
Collections.emptyList(), false)));
+ Map<String, String> extraMetadata = new HashMap<>();
+ extraMetadata.put(SAVEPOINTED_TIMESTAMPS,
savepointsToTrack.stream().collect(Collectors.joining(",")));
+ HoodieCleanMetadata cleanMetadata = new HoodieCleanMetadata(instantTime,
100L, 10, earliestCommitToRetain, lastCompletedTime, partitionMetadata,
+ CLEAN_METADATA_VERSION_2, Collections.EMPTY_MAP,
extraMetadata.isEmpty() ? null : extraMetadata);
+ return Pair.of(cleanMetadata, cleanMetadata);
}
- private static Pair<HoodieSavepointMetadata, Option<byte[]>>
getSavepointMetadata(List<String> partitions) {
- try {
- Map<String, HoodieSavepointPartitionMetadata> partitionMetadata = new
HashMap<>();
- partitions.forEach(partition -> partitionMetadata.put(partition, new
HoodieSavepointPartitionMetadata(partition, Collections.emptyList())));
- HoodieSavepointMetadata savepointMetadata =
- new HoodieSavepointMetadata("user", 1L, "comments",
partitionMetadata, 1);
- return Pair.of(savepointMetadata,
TimelineMetadataUtils.serializeSavepointMetadata(savepointMetadata));
- } catch (IOException ex) {
- throw new UncheckedIOException(ex);
- }
+ private static Pair<HoodieSavepointMetadata, HoodieSavepointMetadata>
getSavepointMetadata(List<String> partitions) {
+ Map<String, HoodieSavepointPartitionMetadata> partitionMetadata = new
HashMap<>();
+ partitions.forEach(partition -> partitionMetadata.put(partition, new
HoodieSavepointPartitionMetadata(partition, Collections.emptyList())));
+ HoodieSavepointMetadata savepointMetadata =
+ new HoodieSavepointMetadata("user", 1L, "comments", partitionMetadata,
1);
+ return Pair.of(savepointMetadata, savepointMetadata);
Review Comment:
Same here
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
