From 662bfc8286504c6d2b8866bdebfdeb0b212626ef Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Wed, 2 Apr 2025 20:05:53 +0800 Subject: [PATCH 1/2] HDDS-12755. Redundant declaration in TestHadoopNestedDirGenerator#spanCheck() --- .../hadoop/ozone/freon/TestHadoopNestedDirGenerator.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java index 32ede9d5e1c6..19ae8996e104 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java @@ -145,10 +145,7 @@ private Path depthBFS(FileSystem fs, FileStatus[] fileStatuses, private int spanCheck(FileSystem fs, int span, Path p) throws IOException { int sp = 0; - int depth = 0; - if (span >= 0) { - depth = 0; - } else { + if (span <= 0) { LOG.info("Span value can never be negative"); } FileStatus[] fileStatuses = fs.listStatus(p); From ee4f0426f2422409a29632d55a6f4ae370e0ba1e Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Thu, 10 Apr 2025 18:34:41 +0800 Subject: [PATCH 2/2] Applied comments --- .../ozone/freon/TestHadoopNestedDirGenerator.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java index 19ae8996e104..86545fc88b2c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopNestedDirGenerator.java @@ -90,12 +90,10 @@ private void verifyDirTree(String volumeName, String bucketName, // verify root path details FileStatus[] fileStatuses = fileSystem.listStatus(rootDir); Path p = null; - for (FileStatus fileStatus : fileStatuses) { - // verify the num of peer directories and span directories - p = depthBFS(fileSystem, fileStatuses, span, actualDepth); - int actualSpan = spanCheck(fileSystem, span, p); - assertEquals(span, actualSpan, "Mismatch span in a path"); - } + // verify the num of peer directories and span directories + p = depthBFS(fileSystem, fileStatuses, span, actualDepth); + int actualSpan = spanCheck(fileSystem, p); + assertEquals(span, actualSpan, "Mismatch span in a path"); } } @@ -143,11 +141,8 @@ private Path depthBFS(FileSystem fs, FileStatus[] fileStatuses, * and count the span directories. */ - private int spanCheck(FileSystem fs, int span, Path p) throws IOException { + private int spanCheck(FileSystem fs, Path p) throws IOException { int sp = 0; - if (span <= 0) { - LOG.info("Span value can never be negative"); - } FileStatus[] fileStatuses = fs.listStatus(p); for (FileStatus fileStatus : fileStatuses) { if (fileStatus.isDirectory()) {