lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[MINOR] Code cleanup in test utils (#5312)

Browse Source
This commit is contained in:
Y Ethan Guo
2022-04-13 14:37:07 -07:00
committed by GitHub
parent bab691692e
commit 571cbe4c11
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hudi-common/src/test/java/org/apache/hudi/common/testutils/FileCreateUtils.java
View File

@@ -403,9 +403,19 @@ public class FileCreateUtils {
if (Files.notExists(basePath)) { if (Files.notExists(basePath)) {
return Collections.emptyList(); return Collections.emptyList();
} }
return Files.list(basePath).filter(entry -> (!entry.getFileName().toString().equals(HoodieTableMetaClient.METAFOLDER_NAME) return Files.list(basePath).filter(entry -> !entry.getFileName().toString().equals(HoodieTableMetaClient.METAFOLDER_NAME)
&& !entry.getFileName().toString().contains("parquet") && !entry.getFileName().toString().contains("log")) && !isBaseOrLogFilename(entry.getFileName().toString())
&& !entry.getFileName().toString().startsWith(HoodiePartitionMetadata.HOODIE_PARTITION_METAFILE_PREFIX)).collect(Collectors.toList()); && !entry.getFileName().toString().startsWith(HoodiePartitionMetadata.HOODIE_PARTITION_METAFILE_PREFIX))
.collect(Collectors.toList());
}
public static boolean isBaseOrLogFilename(String filename) {
for (HoodieFileFormat format : HoodieFileFormat.values()) {
if (filename.contains(format.getFileExtension())) {
return true;
}
}
return false;
} }
/** /**

3
hudi-common/src/test/java/org/apache/hudi/common/testutils/HoodieTestTable.java
View File

@@ -681,7 +681,8 @@ public class HoodieTestTable {
boolean toReturn = true; boolean toReturn = true;
String filePath = entry.getPath().toString(); String filePath = entry.getPath().toString();
String fileName = entry.getPath().getName(); String fileName = entry.getPath().getName();
if (fileName.startsWith(HoodiePartitionMetadata.HOODIE_PARTITION_METAFILE_PREFIX) || (!fileName.contains("log") && !fileName.contains("parquet")) if (fileName.startsWith(HoodiePartitionMetadata.HOODIE_PARTITION_METAFILE_PREFIX)
|| !FileCreateUtils.isBaseOrLogFilename(fileName)
|| filePath.contains("metadata")) { || filePath.contains("metadata")) {
toReturn = false; toReturn = false;
} else { } else {