Skip to content

[Feature](hdfs) Support ignoring hidden directories when listing HDFS… #59398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Baymine wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −0
Open

[Feature](hdfs) Support ignoring hidden directories when listing HDFS… #59398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions fe/fe-common/src/main/java/org/apache/doris/common/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3797,4 +3797,8 @@ public static int metaServiceRpcRetryTimes() {
+ "by default"
})
public static boolean calc_delete_bitmap_get_versions_waiting_for_pending_txns = true;

@ConfField(mutable = true, description = {"是否允许获取hdfs的文件元数据信息时忽略隐藏目录",
"whether to enable list hdfs files ignore hidden directory"})
public static boolean enable_list_hdfs_files_ignore_hidden_directory = true;
}
35 changes: 35 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/fs/remote/dfs/DFSFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.analysis.StorageBackend;
import org.apache.doris.backup.Status;
import org.apache.doris.common.Config;
import org.apache.doris.common.UserException;
import org.apache.doris.common.security.authentication.HadoopAuthenticator;
import org.apache.doris.common.util.S3Util;
Expand Down Expand Up @@ -60,6 +61,7 @@
import java.nio.file.FileVisitOption;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
Expand Down Expand Up @@ -89,6 +91,9 @@ public Status listFiles(String remotePath, boolean recursive, List<RemoteFile> r
try {
Path locatedPath = new Path(remotePath);
org.apache.hadoop.fs.FileSystem fileSystem = nativeFileSystem(locatedPath);
if (recursive && Config.enable_list_hdfs_files_ignore_hidden_directory) {
return listFilesIgnoreHiddenDirectory(fileSystem, locatedPath, result);
}
RemoteIterator<LocatedFileStatus> locatedFiles = getLocatedFiles(recursive, fileSystem, locatedPath);
while (locatedFiles.hasNext()) {
LocatedFileStatus fileStatus = locatedFiles.next();
Expand All @@ -105,6 +110,36 @@ public Status listFiles(String remotePath, boolean recursive, List<RemoteFile> r
return Status.OK;
}

/**
* List files recursively while ignoring hidden directories (directories starting with '.' or '_').
* This provides an optimization by not descending into hidden directories.
*/
private Status listFilesIgnoreHiddenDirectory(FileSystem fileSystem, Path locatedPath,
List<RemoteFile> result) throws IOException {
ArrayDeque<Path> pathQueue = new ArrayDeque<>();
pathQueue.add(locatedPath);
while (!pathQueue.isEmpty()) {
Path currentPath = pathQueue.poll();
FileStatus[] fileStatusList = hdfsProperties.getHadoopAuthenticator()
.doAs(() -> fileSystem.listStatus(currentPath));
for (FileStatus fileStatus : fileStatusList) {
if (fileStatus.isDirectory()) {
String fileName = fileStatus.getPath().getName();
if (fileName.startsWith(".") || fileName.startsWith("_")) {
continue;
}
pathQueue.add(fileStatus.getPath());
} else {
RemoteFile location = new RemoteFile(
fileStatus.getPath(), fileStatus.isDirectory(), fileStatus.getLen(),
fileStatus.getBlockSize(), fileStatus.getModificationTime(), null);
result.add(location);
}
}
}
return Status.OK;
}


@Override
public Status listDirectories(String remotePath, Set<String> result) {
Expand Down