[
https://issues.apache.org/jira/browse/HADOOP-19543?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17944720#comment-17944720
]
ASF GitHub Bot commented on HADOOP-19543:
-----------------------------------------
bhattmanish98 commented on code in PR #7614:
URL: https://github.com/apache/hadoop/pull/7614#discussion_r2044568686
##########
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/ListResponseData.java:
##########
@@ -40,15 +40,15 @@ public class ListResponseData {
* Returns the list of FileStatus objects.
* @return the list of FileStatus objects
*/
- public List<FileStatus> getFileStatusList() {
+ public List<VersionedFileStatus> getFileStatusList() {
Review Comment:
Javadoc update is needed.
`Returns list of VersionedFileStatus objects`
##########
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java:
##########
@@ -1299,6 +1310,38 @@ public String listStatus(final Path path, final String
startFrom,
return continuation;
}
+ /**
+ * This is to handle duplicate listing entries returned by Blob Endpoint for
+ * implicit paths that also has a marker file created for them.
+ * This will retain the entry corresponding to the marker file
+ * and remove the BlobPrefix entry corresponding to implicit directory.
+ * @param nameToEntryMap to keep track of paths already added to the list.
+ * @param fileStatusListInCurrItr the list of file statuses returned in the
current iteration.
+ * @param fileStatuses the final list of file statuses to be returned.
+ */
+ private void filterDuplicateEntriesForBlobClient(
+ TreeMap<String, VersionedFileStatus> nameToEntryMap,
+ List<VersionedFileStatus> fileStatusListInCurrItr,
+ List<FileStatus> fileStatuses) {
+ for (VersionedFileStatus fileStatus : fileStatusListInCurrItr) {
+ String entryName = fileStatus.getPath().getName();
+ if (StringUtils.isNotEmpty(fileStatus.getEtag())) {
+ // This is a blob entry. It is either a file or a marker blob.
+ // In both cases, we will add this.
+ nameToEntryMap.put(entryName, fileStatus);
+ fileStatuses.add(fileStatus);
+ } else {
Review Comment:
It can be replaced with else if instead of nested if.
##########
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/ListResponseData.java:
##########
@@ -40,15 +40,15 @@ public class ListResponseData {
* Returns the list of FileStatus objects.
* @return the list of FileStatus objects
*/
- public List<FileStatus> getFileStatusList() {
+ public List<VersionedFileStatus> getFileStatusList() {
return fileStatusList;
}
/**
* Sets the list of FileStatus objects.
* @param fileStatusList the list of FileStatus objects
*/
- public void setFileStatusList(final List<FileStatus> fileStatusList) {
+ public void setFileStatusList(final List<VersionedFileStatus>
fileStatusList) {
Review Comment:
Same as above, javadoc update is needed
> ABFS: [FnsOverBlob] Remove Duplicates from Blob Endpoint Listing Across
> Iterations
> ----------------------------------------------------------------------------------
>
> Key: HADOOP-19543
> URL: https://issues.apache.org/jira/browse/HADOOP-19543
> Project: Hadoop Common
> Issue Type: Sub-task
> Components: fs/azure
> Affects Versions: 3.5.0, 3.4.1
> Reporter: Anuj Modi
> Assignee: Anuj Modi
> Priority: Critical
> Labels: pull-request-available
>
> On FNS-Blob, List Blobs API is known to return duplicate entries for the
> non-empty explicit directories. One entry corresponds to the directory itself
> and another entry corresponding to the marker blob that driver internally
> creates and maintains to mark that path as a directory. We already know about
> this behaviour and it was handled to remove such duplicate entries from the
> set of entries that were returned as part current list iterations.
> Due to possible partition split if such duplicate entries happen to be
> returned in separate iteration, there is no handling on this and caller might
> get back the result with duplicate entries as happening in this case. The
> logic to remove duplicate was designed before the realization of partition
> split came.
> This PR fixes this bug
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
