You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by he...@apache.org on 2021/06/25 14:39:38 UTC
[hadoop] branch trunk updated: Revert "HDFS-16044. Fix getListing
call getLocatedBlocks even source is a directory. Contributed by ludun."
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 748570b Revert "HDFS-16044. Fix getListing call getLocatedBlocks even source is a directory. Contributed by ludun."
748570b is described below
commit 748570b73c86ff02f1c056b988717ff0e1f2aee5
Author: He Xiaoqiao <he...@apache.org>
AuthorDate: Fri Jun 25 22:38:34 2021 +0800
Revert "HDFS-16044. Fix getListing call getLocatedBlocks even source is a directory. Contributed by ludun."
This reverts commit 0d078377120da9ea886bd95b19c8a618dc4d7ab5.
---
.../hadoop/hdfs/protocol/HdfsFileStatus.java | 2 +-
.../hadoop/hdfs/protocol/TestHdfsFileStatus.java | 49 ----------------------
2 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
index 3b12622..264e3f4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
@@ -274,7 +274,7 @@ public interface HdfsFileStatus
* @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);
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/protocol/TestHdfsFileStatus.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/protocol/TestHdfsFileStatus.java
deleted file mode 100644
index 67f26f0..0000000
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/protocol/TestHdfsFileStatus.java
+++ /dev/null
@@ -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));
- }
-}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org