From fd7ecc7159ea5b68fb3209a0722263c1a5e0e83e Mon Sep 17 00:00:00 2001 From: gavingaozhangmin Date: Mon, 17 Oct 2022 13:36:04 +0800 Subject: [PATCH 1/4] Show content of map --- .../java/org/apache/bookkeeper/bookie/EntryLogMetadata.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java index 46928a96457..d5b6f05bc27 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.util.function.LongPredicate; import org.apache.bookkeeper.util.collections.ConcurrentLongLongHashMap; +import org.apache.commons.lang3.StringUtils; /** * Records the total size, remaining size and the set of ledgers that comprise a @@ -105,7 +106,7 @@ public void removeLedgerIf(LongPredicate predicate) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{ totalSize = ").append(totalSize).append(", remainingSize = ").append(remainingSize) - .append(", ledgersMap = ").append(ledgersMap).append(" }"); + .append(", ledgersMap = ").append(StringUtils.join(ledgersMap)).append(" }"); return sb.toString(); } From bafceac8dba3d3883f52b2b8c0aaa89a68854e47 Mon Sep 17 00:00:00 2001 From: gavingaozhangmin Date: Mon, 17 Oct 2022 14:03:06 +0800 Subject: [PATCH 2/4] apply comments --- .../java/org/apache/bookkeeper/bookie/EntryLogMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java index d5b6f05bc27..99b304fc431 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java @@ -106,7 +106,7 @@ public void removeLedgerIf(LongPredicate predicate) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{ totalSize = ").append(totalSize).append(", remainingSize = ").append(remainingSize) - .append(", ledgersMap = ").append(StringUtils.join(ledgersMap)).append(" }"); + .append(", ledgersMap = ").append(ledgersMap.toString()).append(" }"); return sb.toString(); } From 9f476b3742c4661df57a45f96c3ff64cebf3b391 Mon Sep 17 00:00:00 2001 From: gavingaozhangmin Date: Mon, 17 Oct 2022 14:12:35 +0800 Subject: [PATCH 3/4] fix checkstyle --- .../main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java | 1 - 1 file changed, 1 deletion(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java index 99b304fc431..9e57b813e8a 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.util.function.LongPredicate; import org.apache.bookkeeper.util.collections.ConcurrentLongLongHashMap; -import org.apache.commons.lang3.StringUtils; /** * Records the total size, remaining size and the set of ledgers that comprise a From 728572b26ee27da93c7cecf6715ea976d8b2bbe5 Mon Sep 17 00:00:00 2001 From: gavingaozhangmin Date: Tue, 18 Oct 2022 14:57:31 +0800 Subject: [PATCH 4/4] add unit test --- .../java/org/apache/bookkeeper/bookie/EntryLogMetadata.java | 4 ++-- .../org/apache/bookkeeper/bookie/DefaultEntryLogTest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java index 9e57b813e8a..1fdb22be545 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogMetadata.java @@ -104,8 +104,8 @@ public void removeLedgerIf(LongPredicate predicate) { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("{ totalSize = ").append(totalSize).append(", remainingSize = ").append(remainingSize) - .append(", ledgersMap = ").append(ledgersMap.toString()).append(" }"); + sb.append("{totalSize = ").append(totalSize).append(", remainingSize = ").append(remainingSize) + .append(", ledgersMap = ").append(ledgersMap.toString()).append("}"); return sb.toString(); } diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java index cc52b5a3187..65aabe0ca54 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/DefaultEntryLogTest.java @@ -190,6 +190,9 @@ public void testCorruptEntryLog() throws Exception { entryLogger = new DefaultEntryLogger(conf, dirsMgr); EntryLogMetadata meta = entryLogger.getEntryLogMetadata(0L); + String metaString = meta.toString(); + assertEquals(metaString, + "{totalSize = 60, remainingSize = 60, ledgersMap = ConcurrentLongLongHashMap{1 => 30, 3 => 30}}"); LOG.info("Extracted Meta From Entry Log {}", meta); assertTrue(meta.getLedgersMap().containsKey(1L)); assertFalse(meta.getLedgersMap().containsKey(2L));