address the comments.

apache · Jan 26, 2024 · 1b74157 · 1b74157
1 parent 8d21ea4
commit 1b74157
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java
@@ -250,7 +250,7 @@ public void batchReadEntries(BookieId addr, long ledgerId, long startEntryId, in
                     }
 
                     try {
-                        ByteBufList data = mockBookies.batchReadEntry(addr, flags, ledgerId, startEntryId,
+                        ByteBufList data = mockBookies.batchReadEntries(addr, flags, ledgerId, startEntryId,
                                 maxCount, maxSize);
                         return FutureUtils.value(data);
                     } catch (BKException bke) {

diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookies.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookies.java
@@ -123,7 +123,7 @@ public ByteBuf readEntry(BookieId bookieId, int flags, long ledgerId, long entry
         return entry;
     }
 
-    public ByteBufList batchReadEntry(BookieId bookieId, int flags, long ledgerId, long startEntryId,
+    public ByteBufList batchReadEntries(BookieId bookieId, int flags, long ledgerId, long startEntryId,
             int maxCount, long maxSize) throws BKException {
         MockLedgerData ledger = getBookieData(bookieId).get(ledgerId);
 
@@ -142,24 +142,17 @@ public ByteBufList batchReadEntry(BookieId bookieId, int flags, long ledgerId, l
         }
         long frameSize = 24 + 8 + 4;
         for (long i = startEntryId; i < startEntryId + maxCount; i++) {
-            try {
-                ByteBuf entry = ledger.getEntry(i);
-                frameSize += entry.readableBytes() + 4;
-                if (data == null) {
-                    data = ByteBufList.get(entry);
-                } else {
-                    if (frameSize > maxSize) {
-                        entry.release();
-                        break;
-                    }
-                    data.add(entry);
-                }
-            } catch (Throwable e) {
-                if (data == null) {
-                    throw e;
-                }
-                break;
-            }
+             ByteBuf entry = ledger.getEntry(i);
+             frameSize += entry.readableBytes() + 4;
+             if (data == null) {
+                 data = ByteBufList.get(entry);
+             } else {
+                 if (frameSize > maxSize) {
+                     entry.release();
+                     break;
+                 }
+                 data.add(entry);
+             }
         }
         return data;
     }