imay closed pull request #394: Add 'fileNameOnly' param to broker's listPath
method
URL: https://github.com/apache/incubator-doris/pull/394
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
index fc11a47f..63af36ed 100644
---
a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
+++
b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
@@ -298,7 +298,7 @@ public BrokerFileSystem getFileSystem(String path,
Map<String, String> propertie
}
}
- public List<TBrokerFileStatus> listPath(String path, Map<String, String>
properties) {
+ public List<TBrokerFileStatus> listPath(String path, boolean fileNameOnly,
Map<String, String> properties) {
List<TBrokerFileStatus> resultFileStatus = null;
URI pathUri = getUriFromPath(path);
BrokerFileSystem fileSystem = getFileSystem(path, properties);
@@ -320,7 +320,13 @@ public BrokerFileSystem getFileSystem(String path,
Map<String, String> propertie
brokerFileStatus.setSize(fileStatus.getLen());
brokerFileStatus.setIsSplitable(true);
}
- brokerFileStatus.setPath(fileStatus.getPath().toString());
+ if (fileNameOnly) {
+ // return like this: file.txt
+ brokerFileStatus.setPath(fileStatus.getPath().getName());
+ } else {
+ // return like this: //path/to/your/file.txt
+ brokerFileStatus.setPath(fileStatus.getPath().toString());
+ }
resultFileStatus.add(brokerFileStatus);
}
} catch (Exception e) {
diff --git
a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/HDFSBrokerServiceImpl.java
b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/HDFSBrokerServiceImpl.java
index c7114f58..8ef1c505 100644
---
a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/HDFSBrokerServiceImpl.java
+++
b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/HDFSBrokerServiceImpl.java
@@ -69,7 +69,12 @@ public TBrokerListResponse listPath(TBrokerListPathRequest
request)
logger.debug("received a list path request, request detail: " +
request);
TBrokerListResponse response = new TBrokerListResponse();
try {
- List<TBrokerFileStatus> fileStatuses =
fileSystemManager.listPath(request.path, request.properties);
+ boolean fileNameOnly = false;
+ if (request.isSetFileNameOnly()) {
+ fileNameOnly = request.isFileNameOnly();
+ }
+ List<TBrokerFileStatus> fileStatuses =
fileSystemManager.listPath(request.path, fileNameOnly,
+ request.properties);
response.setOpStatus(generateOKStatus());
response.setFiles(fileStatuses);
return response;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
