Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA support 0 in human readable byte calculation

This commit is contained in:
Justin Bertram 2020-01-08 12:36:52 -06:00
parent 1304dbd539
commit 0293d80574
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
View File

@ -451,6 +451,10 @@ public class ByteUtil {
} }
public static String getHumanReadableByteCount(long bytes) { public static String getHumanReadableByteCount(long bytes) {
if (bytes == 0) {
return "0B";
}
int i = 0; int i = 0;
while (i < BYTE_MAGNITUDES.length && BYTE_MAGNITUDES[i] > bytes) { while (i < BYTE_MAGNITUDES.length && BYTE_MAGNITUDES[i] > bytes) {
i++; i++;

1
artemis-commons/src/test/java/org/apache/activemq/artemis/utils/HumanReadableByteCountTest.java
View File

@ -27,6 +27,7 @@ public class HumanReadableByteCountTest {
public void test() { public void test() {
String[] suffixes = new String[] {"K", "M", "G", "T", "P", "E"}; String[] suffixes = new String[] {"K", "M", "G", "T", "P", "E"};
assertEquals("0B", ByteUtil.getHumanReadableByteCount(0));
assertEquals("999.0B", ByteUtil.getHumanReadableByteCount(999)); assertEquals("999.0B", ByteUtil.getHumanReadableByteCount(999));
assertEquals("500.0B", ByteUtil.getHumanReadableByteCount(500)); assertEquals("500.0B", ByteUtil.getHumanReadableByteCount(500));

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
View File

@ -201,7 +201,7 @@ public final class PagingManagerImpl implements PagingManager {
public void tick(long usableSpace, long totalSpace) { public void tick(long usableSpace, long totalSpace) {
diskUsableSpace = usableSpace; diskUsableSpace = usableSpace;
diskTotalSpace = totalSpace; diskTotalSpace = totalSpace;
logger.tracef("Tick:: usable space at %f, total space at %f", ByteUtil.getHumanReadableByteCount(usableSpace), ByteUtil.getHumanReadableByteCount(totalSpace)); logger.tracef("Tick:: usable space at %s, total space at %s", ByteUtil.getHumanReadableByteCount(usableSpace), ByteUtil.getHumanReadableByteCount(totalSpace));
} }
@Override @Override