[bookkeeper] branch master updated: [minor] cleanup on InterleavedLedgerStorage (#3210)

[eolivelli]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 28834d037 [minor] cleanup on InterleavedLedgerStorage (#3210)
28834d037 is described below

commit 28834d037c17268c4398ce7dbbc1246ab56a6f3e
Author: ZhangJian He <shoot...@gmail.com>
AuthorDate: Sat Apr 23 00:10:59 2022 +0800

    [minor] cleanup on InterleavedLedgerStorage (#3210)
---
 .../apache/bookkeeper/bookie/InMemoryEntryLogMetadataMap.java    | 2 +-
 .../org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java   | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InMemoryEntryLogMetadataMap.java
 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InMemoryEntryLogMetadataMap.java
index 88648428e..106a382f5 100644
--- 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InMemoryEntryLogMetadataMap.java
+++ 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InMemoryEntryLogMetadataMap.java
@@ -30,7 +30,7 @@ import java.util.function.BiConsumer;
  */
 public class InMemoryEntryLogMetadataMap implements EntryLogMetadataMap {
 
-    private Map<Long, EntryLogMetadata> entryLogMetaMap = new 
ConcurrentHashMap<Long, EntryLogMetadata>();
+    private final Map<Long, EntryLogMetadata> entryLogMetaMap = new 
ConcurrentHashMap<>();
 
     @Override
     public boolean containsKey(long entryLogId) {
diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
index 8d346f55a..a1dc14b2f 100644
--- 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
+++ 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
@@ -31,7 +31,6 @@ import static 
org.apache.bookkeeper.bookie.BookKeeperServerStats.STORAGE_GET_OFF
 import static 
org.apache.bookkeeper.bookie.BookKeeperServerStats.STORAGE_SCRUB_PAGES_SCANNED;
 import static 
org.apache.bookkeeper.bookie.BookKeeperServerStats.STORAGE_SCRUB_PAGE_RETRIES;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.RateLimiter;
 
@@ -88,7 +87,6 @@ import org.slf4j.LoggerFactory;
 )
 public class InterleavedLedgerStorage implements CompactableLedgerStorage, 
EntryLogListener {
     private static final Logger LOG = 
LoggerFactory.getLogger(InterleavedLedgerStorage.class);
-    public static final long INVALID_ENTRYID = -1;
 
     EntryLogger entryLogger;
     @Getter
@@ -109,8 +107,6 @@ public class InterleavedLedgerStorage implements 
CompactableLedgerStorage, Entry
     // this indicates that a write has happened since the last flush
     private final AtomicBoolean somethingWritten = new AtomicBoolean(false);
 
-    private int pageSize;
-
     // Expose Stats
     @StatsDoc(
         name = STORAGE_GET_OFFSET,
@@ -128,9 +124,8 @@ public class InterleavedLedgerStorage implements 
CompactableLedgerStorage, Entry
     private OpStatsLogger pageScanStats;
     private Counter retryCounter;
 
-    @VisibleForTesting
     public InterleavedLedgerStorage() {
-        activeLedgers = new SnapshotMap<Long, Boolean>();
+        activeLedgers = new SnapshotMap<>();
     }
 
     @Override
@@ -181,7 +176,6 @@ public class InterleavedLedgerStorage implements 
CompactableLedgerStorage, Entry
         this.checkpointer = checkpointer;
     }
 
-    @VisibleForTesting
     public void initializeWithEntryLogger(ServerConfiguration conf,
                 LedgerManager ledgerManager,
                 LedgerDirsManager ledgerDirsManager,
@@ -196,7 +190,6 @@ public class InterleavedLedgerStorage implements 
CompactableLedgerStorage, Entry
                 null == indexDirsManager ? ledgerDirsManager : 
indexDirsManager, statsLogger);
         gcThread = new GarbageCollectorThread(conf, ledgerManager, 
ledgerDirsManager,
             this, statsLogger.scope("gc"));
-        pageSize = conf.getPageSize();
         ledgerDirsManager.addLedgerDirsListener(getLedgerDirsListener());
         // Expose Stats
         getOffsetStats = statsLogger.getOpStatsLogger(STORAGE_GET_OFFSET);