xushiyan commented on code in PR #7220:
URL: https://github.com/apache/hudi/pull/7220#discussion_r1027513868
##########
hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewManager.java:
##########
@@ -26,6 +26,7 @@
import org.apache.hudi.common.function.SerializableSupplier;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
+import org.apache.hudi.common.util.Functions;
import org.apache.hudi.common.util.Functions.Function2;
Review Comment:
import Function0, follow the existing style
##########
hudi-common/src/test/java/org/apache/hudi/common/table/view/TestPriorityBasedFileSystemView.java:
##########
@@ -75,7 +75,8 @@ public class TestPriorityBasedFileSystemView {
@BeforeEach
public void setUp() {
- fsView = new PriorityBasedFileSystemView(primary, secondary);
+ fsView = new PriorityBasedFileSystemView(primary, () -> secondary);
+ fsView.getSecondaryView();
Review Comment:
why init 2nd view here? then it's not testing lazy init, is it?
##########
hudi-common/src/main/java/org/apache/hudi/common/table/view/PriorityBasedFileSystemView.java:
##########
@@ -131,149 +133,159 @@ private void handleRuntimeException(RuntimeException
re) {
@Override
public Stream<HoodieBaseFile> getLatestBaseFiles(String partitionPath) {
- return execute(partitionPath, preferredView::getLatestBaseFiles,
secondaryView::getLatestBaseFiles);
+ return execute(partitionPath, preferredView::getLatestBaseFiles, (val) ->
getSecondaryView().getLatestBaseFiles(val));
}
@Override
public Stream<HoodieBaseFile> getLatestBaseFiles() {
- return execute(preferredView::getLatestBaseFiles,
secondaryView::getLatestBaseFiles);
+ return execute(preferredView::getLatestBaseFiles, () ->
getSecondaryView().getLatestBaseFiles());
}
@Override
public Stream<HoodieBaseFile> getLatestBaseFilesBeforeOrOn(String
partitionPath, String maxCommitTime) {
- return execute(partitionPath, maxCommitTime,
preferredView::getLatestBaseFilesBeforeOrOn,
- secondaryView::getLatestBaseFilesBeforeOrOn);
+ return execute(partitionPath, maxCommitTime,
preferredView::getLatestBaseFilesBeforeOrOn, (val, val2) ->
getSecondaryView().getLatestBaseFilesBeforeOrOn(val, val2));
}
@Override
public Option<HoodieBaseFile> getLatestBaseFile(String partitionPath, String
fileId) {
- return execute(partitionPath, fileId, preferredView::getLatestBaseFile,
secondaryView::getLatestBaseFile);
+ return execute(partitionPath, fileId, preferredView::getLatestBaseFile,
(val, val2) -> getSecondaryView().getLatestBaseFile(val, val2));
}
@Override
public Option<HoodieBaseFile> getBaseFileOn(String partitionPath, String
instantTime, String fileId) {
- return execute(partitionPath, instantTime, fileId,
preferredView::getBaseFileOn, secondaryView::getBaseFileOn);
+ return execute(partitionPath, instantTime, fileId,
preferredView::getBaseFileOn, (val, val2, val3) ->
getSecondaryView().getBaseFileOn(val, val2, val3));
}
@Override
public Stream<HoodieBaseFile> getLatestBaseFilesInRange(List<String>
commitsToReturn) {
- return execute(commitsToReturn, preferredView::getLatestBaseFilesInRange,
secondaryView::getLatestBaseFilesInRange);
+ return execute(commitsToReturn, preferredView::getLatestBaseFilesInRange,
(val) -> getSecondaryView().getLatestBaseFilesInRange(val));
}
@Override
public Stream<HoodieBaseFile> getAllBaseFiles(String partitionPath) {
- return execute(partitionPath, preferredView::getAllBaseFiles,
secondaryView::getAllBaseFiles);
+ return execute(partitionPath, preferredView::getAllBaseFiles, (val) ->
getSecondaryView().getAllBaseFiles(val));
}
@Override
public Stream<FileSlice> getLatestFileSlices(String partitionPath) {
- return execute(partitionPath, preferredView::getLatestFileSlices,
secondaryView::getLatestFileSlices);
+ return execute(partitionPath, preferredView::getLatestFileSlices, (val) ->
getSecondaryView().getLatestFileSlices(val));
}
@Override
public Stream<FileSlice> getLatestUnCompactedFileSlices(String
partitionPath) {
- return execute(partitionPath,
preferredView::getLatestUnCompactedFileSlices,
- secondaryView::getLatestUnCompactedFileSlices);
+ return execute(partitionPath,
preferredView::getLatestUnCompactedFileSlices, (val) ->
getSecondaryView().getLatestUnCompactedFileSlices(val));
}
@Override
public Stream<FileSlice> getLatestFileSlicesBeforeOrOn(String partitionPath,
String maxCommitTime,
boolean includeFileSlicesInPendingCompaction) {
return execute(partitionPath, maxCommitTime,
includeFileSlicesInPendingCompaction,
- preferredView::getLatestFileSlicesBeforeOrOn,
secondaryView::getLatestFileSlicesBeforeOrOn);
+ preferredView::getLatestFileSlicesBeforeOrOn, (val, val2, val3) ->
getSecondaryView().getLatestFileSlicesBeforeOrOn(val, val2, val3));
}
@Override
public Stream<FileSlice> getLatestMergedFileSlicesBeforeOrOn(String
partitionPath, String maxInstantTime) {
- return execute(partitionPath, maxInstantTime,
preferredView::getLatestMergedFileSlicesBeforeOrOn,
- secondaryView::getLatestMergedFileSlicesBeforeOrOn);
+ return execute(partitionPath, maxInstantTime,
preferredView::getLatestMergedFileSlicesBeforeOrOn, (val, val2) ->
getSecondaryView().getLatestMergedFileSlicesBeforeOrOn(val, val2));
}
@Override
public Stream<FileSlice> getLatestFileSliceInRange(List<String>
commitsToReturn) {
- return execute(commitsToReturn, preferredView::getLatestFileSliceInRange,
secondaryView::getLatestFileSliceInRange);
+ return execute(commitsToReturn, preferredView::getLatestFileSliceInRange,
(val) -> getSecondaryView().getLatestFileSliceInRange(val));
}
@Override
public Stream<FileSlice> getAllFileSlices(String partitionPath) {
- return execute(partitionPath, preferredView::getAllFileSlices,
secondaryView::getAllFileSlices);
+ return execute(partitionPath, preferredView::getAllFileSlices, (val) ->
getSecondaryView().getAllFileSlices(val));
}
@Override
public Stream<HoodieFileGroup> getAllFileGroups(String partitionPath) {
- return execute(partitionPath, preferredView::getAllFileGroups,
secondaryView::getAllFileGroups);
+ return execute(partitionPath, preferredView::getAllFileGroups, (val) ->
getSecondaryView().getAllFileGroups(val));
}
@Override
public Stream<HoodieFileGroup> getReplacedFileGroupsBeforeOrOn(String
maxCommitTime, String partitionPath) {
- return execute(maxCommitTime, partitionPath,
preferredView::getReplacedFileGroupsBeforeOrOn,
secondaryView::getReplacedFileGroupsBeforeOrOn);
+ return execute(maxCommitTime, partitionPath,
preferredView::getReplacedFileGroupsBeforeOrOn, (val, val2) ->
getSecondaryView().getReplacedFileGroupsBeforeOrOn(val, val2));
}
@Override
public Stream<HoodieFileGroup> getReplacedFileGroupsBefore(String
maxCommitTime, String partitionPath) {
- return execute(maxCommitTime, partitionPath,
preferredView::getReplacedFileGroupsBefore,
secondaryView::getReplacedFileGroupsBefore);
+ return execute(maxCommitTime, partitionPath,
preferredView::getReplacedFileGroupsBefore, (val, val2) ->
getSecondaryView().getReplacedFileGroupsBefore(val, val2));
}
@Override
public Stream<HoodieFileGroup> getAllReplacedFileGroups(String
partitionPath) {
- return execute(partitionPath, preferredView::getAllReplacedFileGroups,
secondaryView::getAllReplacedFileGroups);
+ return execute(partitionPath, preferredView::getAllReplacedFileGroups,
(val) -> getSecondaryView().getAllReplacedFileGroups(val));
Review Comment:
`()` is redundant when only 1 input
##########
hudi-common/src/main/java/org/apache/hudi/common/table/view/PriorityBasedFileSystemView.java:
##########
@@ -25,6 +25,7 @@
import org.apache.hudi.common.model.HoodieFileGroupId;
import org.apache.hudi.common.table.timeline.HoodieInstant;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
+import org.apache.hudi.common.util.Functions;
import org.apache.hudi.common.util.Functions.Function0;
Review Comment:
import Function0, follow the existing style
##########
hudi-common/src/main/java/org/apache/hudi/common/table/view/FileSystemViewManager.java:
##########
@@ -266,22 +267,22 @@ public static FileSystemViewManager
createViewManager(final HoodieEngineContext
return new FileSystemViewManager(context, config, (metaClient,
viewConfig) -> {
RemoteHoodieTableFileSystemView remoteFileSystemView =
createRemoteFileSystemView(conf, viewConfig, metaClient);
- SyncableFileSystemView secondaryView;
+ Functions.Function0<SyncableFileSystemView> secondaryViewFunc;
Review Comment:
```suggestion
Function0<SyncableFileSystemView> secondaryViewGetter;
```
--
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]
