big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "HDFS-16044. Fix getListing call getLocatedBlocks even source is a directory. Contributed by ludun."

Browse Source 
This reverts commit 0d07837712.
This commit is contained in:
He Xiaoqiao 2021-06-25 22:38:34 +08:00
parent 0934e783cf
commit 748570b73c
No known key found for this signature in database
GPG Key ID: A80CC124E9A0FA63
2 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
View File

@ -274,7 +274,7 @@ public Builder locations(LocatedBlocks locations) {
* @return An {@link HdfsFileStatus} instance from these parameters.
*/
public HdfsFileStatus build() {
if (null == locations && isdir && null == symlink) {
if (null == locations && !isdir && null == symlink) {
return new HdfsNamedFileStatus(length, isdir, replication, blocksize,
mtime, atime, permission, flags, owner, group, symlink, path,
fileId, childrenNum, feInfo, storagePolicy, ecPolicy);

49
hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/protocol/TestHdfsFileStatus.java
View File

@ -1,49 +0,0 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hdfs.protocol;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* Test {@link HdfsFileStatus}.
*/
public class TestHdfsFileStatus {
private boolean createFileStatus(boolean isdir) {
HdfsFileStatus status = new HdfsFileStatus.Builder()
.isdir(isdir)
.build();
return status instanceof HdfsLocatedFileStatus;
}
@Test
public void testHdfsFileStatusBuild() {
// listing directory
assertFalse("Status of directory should not be " +
"HdfsLocatedFileStatus",
createFileStatus(true));
// listing file when locations is null
assertTrue("Status of file should be HdfsLocatedFileStatus",
createFileStatus(false));
}
}