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 yq...@apache.org on 2018/08/16 10:45:24 UTC
hadoop git commit: HDFS-13829. Remove redundant condition judgement
in DirectoryScanner#scan. Contributed by liaoyuxiangqin.
Repository: hadoop
Updated Branches:
refs/heads/trunk 7dc79a8b5 -> 6df606f1b
HDFS-13829. Remove redundant condition judgement in DirectoryScanner#scan. Contributed by liaoyuxiangqin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6df606f1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6df606f1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6df606f1
Branch: refs/heads/trunk
Commit: 6df606f1b4edabd15ae2896c5df0fe675bcf0138
Parents: 7dc79a8
Author: Yiqun Lin <yq...@apache.org>
Authored: Thu Aug 16 18:44:18 2018 +0800
Committer: Yiqun Lin <yq...@apache.org>
Committed: Thu Aug 16 18:44:18 2018 +0800
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6df606f1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
index 39665e3..10951e9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
@@ -450,7 +450,7 @@ public class DirectoryScanner implements Runnable {
if (d < blockpoolReport.length) {
// There may be multiple on-disk records for the same block, don't increment
// the memory record pointer if so.
- ScanInfo nextInfo = blockpoolReport[Math.min(d, blockpoolReport.length - 1)];
+ ScanInfo nextInfo = blockpoolReport[d];
if (nextInfo.getBlockId() != info.getBlockId()) {
++m;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org