This is an automated email from the ASF dual-hosted git repository. yong pushed a commit to branch branch-4.15 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 4543493a000b9c25ae41d5d867a9470a3b0e8e95 Author: zymap <[email protected]> AuthorDate: Thu Feb 16 17:21:56 2023 +0800 Revert "[refactor][bookkeeper] Refactor ByteBuf release method in DefaultEntryLogger (#3673)" This reverts commit 6b37505e35898a4fee35ad320ea44d02374203bd. --- .../main/java/org/apache/bookkeeper/bookie/EntryLogger.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java index 396410d14e..d69e434ef5 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java @@ -32,7 +32,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.Unpooled; -import io.netty.util.ReferenceCountUtil; import io.netty.util.concurrent.FastThreadLocal; import java.io.BufferedReader; import java.io.File; @@ -189,7 +188,7 @@ public class EntryLogger { throw e; } } finally { - ReferenceCountUtil.safeRelease(serializedMap); + serializedMap.release(); } // Flush the ledger's map out before we write the header. // Otherwise the header might point to something that is not fully @@ -858,7 +857,7 @@ public class EntryLogger { ByteBuf data = allocator.buffer(entrySize, entrySize); int rc = readFromLogChannel(entryLogId, fc, data, pos); if (rc != entrySize) { - ReferenceCountUtil.safeRelease(data); + data.release(); throw new IOException("Bad entry read from log file id: " + entryLogId, new EntryLookupException("Short read for " + ledgerId + "@" + entryId + " in " + entryLogId + "@" @@ -896,7 +895,7 @@ public class EntryLogger { int ledgersCount = headers.readInt(); return new Header(headerVersion, ledgersMapOffset, ledgersCount); } finally { - ReferenceCountUtil.safeRelease(headers); + headers.release(); } } @@ -1042,7 +1041,7 @@ public class EntryLogger { pos += entrySize; } } finally { - ReferenceCountUtil.safeRelease(data); + data.release(); } } @@ -1145,7 +1144,7 @@ public class EntryLogger { } catch (IndexOutOfBoundsException e) { throw new IOException(e); } finally { - ReferenceCountUtil.safeRelease(ledgersMap); + ledgersMap.release(); } if (meta.getLedgersMap().size() != header.ledgersCount) {
