From c2afb6a00b80fae71f04ecfef6a51f436ccfbd8e Mon Sep 17 00:00:00 2001 From: litao Date: Sun, 5 Dec 2021 01:24:44 +0800 Subject: [PATCH] HDFS-16370. Fix assert message for BlockInfo (#3747). Contributed by tomscut. Signed-off-by: Ayush Saxena --- .../server/blockmanagement/BlockInfo.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java index 81a559e0f0..659f218437 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java @@ -86,7 +86,7 @@ public BlockInfo(short size) { public BlockInfo(Block blk, short size) { super(blk); - this.triplets = new Object[3*size]; + this.triplets = new Object[3 * size]; this.bcId = INVALID_INODE_ID; this.replication = isStriped() ? 0 : size; } @@ -126,34 +126,34 @@ public DatanodeDescriptor getDatanode(int index) { DatanodeStorageInfo getStorageInfo(int index) { assert this.triplets != null : "BlockInfo is not initialized"; - assert index >= 0 && index*3 < triplets.length : "Index is out of bound"; - return (DatanodeStorageInfo)triplets[index*3]; + assert index >= 0 && index * 3 < triplets.length : "Index is out of bound"; + return (DatanodeStorageInfo)triplets[index * 3]; } BlockInfo getPrevious(int index) { assert this.triplets != null : "BlockInfo is not initialized"; - assert index >= 0 && index*3+1 < triplets.length : "Index is out of bound"; - BlockInfo info = (BlockInfo)triplets[index*3+1]; + assert index >= 0 && index * 3 + 1 < triplets.length : "Index is out of bound"; + BlockInfo info = (BlockInfo)triplets[index * 3 + 1]; assert info == null || info.getClass().getName().startsWith(BlockInfo.class.getName()) : - "BlockInfo is expected at " + index*3; + "BlockInfo is expected at " + (index * 3 + 1); return info; } BlockInfo getNext(int index) { assert this.triplets != null : "BlockInfo is not initialized"; - assert index >= 0 && index*3+2 < triplets.length : "Index is out of bound"; - BlockInfo info = (BlockInfo)triplets[index*3+2]; + assert index >= 0 && index * 3 + 2 < triplets.length : "Index is out of bound"; + BlockInfo info = (BlockInfo)triplets[index * 3 + 2]; assert info == null || info.getClass().getName().startsWith( BlockInfo.class.getName()) : - "BlockInfo is expected at " + index*3; + "BlockInfo is expected at " + (index * 3 + 2); return info; } void setStorageInfo(int index, DatanodeStorageInfo storage) { assert this.triplets != null : "BlockInfo is not initialized"; - assert index >= 0 && index*3 < triplets.length : "Index is out of bound"; - triplets[index*3] = storage; + assert index >= 0 && index * 3 < triplets.length : "Index is out of bound"; + triplets[index * 3] = storage; } /** @@ -166,9 +166,9 @@ void setStorageInfo(int index, DatanodeStorageInfo storage) { */ BlockInfo setPrevious(int index, BlockInfo to) { assert this.triplets != null : "BlockInfo is not initialized"; - assert index >= 0 && index*3+1 < triplets.length : "Index is out of bound"; - BlockInfo info = (BlockInfo) triplets[index*3+1]; - triplets[index*3+1] = to; + assert index >= 0 && index * 3 + 1 < triplets.length : "Index is out of bound"; + BlockInfo info = (BlockInfo) triplets[index * 3 + 1]; + triplets[index * 3 + 1] = to; return info; } @@ -182,9 +182,9 @@ BlockInfo setPrevious(int index, BlockInfo to) { */ BlockInfo setNext(int index, BlockInfo to) { assert this.triplets != null : "BlockInfo is not initialized"; - assert index >= 0 && index*3+2 < triplets.length : "Index is out of bound"; - BlockInfo info = (BlockInfo) triplets[index*3+2]; - triplets[index*3+2] = to; + assert index >= 0 && index * 3 + 2 < triplets.length : "Index is out of bound"; + BlockInfo info = (BlockInfo) triplets[index * 3 + 2]; + triplets[index * 3 + 2] = to; return info; }