You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by yo...@apache.org on 2023/03/01 02:08:27 UTC
[bookkeeper] branch branch-4.15 updated: Use ReferenceCountUtil.release() istead of ReferenceCountUtil.safeRelease() (#3797)
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
The following commit(s) were added to refs/heads/branch-4.15 by this push:
new 79fe6e91e0 Use ReferenceCountUtil.release() istead of ReferenceCountUtil.safeRelease() (#3797)
79fe6e91e0 is described below
commit 79fe6e91e094158aeaa25ca469f9c01d0accc666
Author: Hang Chen <ch...@apache.org>
AuthorDate: Wed Mar 1 10:08:21 2023 +0800
Use ReferenceCountUtil.release() istead of ReferenceCountUtil.safeRelease() (#3797)
Related to https://github.com/apache/bookkeeper/issues/3792
---
.../src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java | 4 ++--
.../main/java/org/apache/bookkeeper/bookie/BufferedChannel.java | 2 +-
.../src/main/java/org/apache/bookkeeper/proto/BookieProtocol.java | 2 +-
.../src/main/java/org/apache/bookkeeper/util/ByteBufList.java | 2 +-
.../src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java | 8 ++++----
.../distributedlog/impl/logsegment/BKLogSegmentEntryReader.java | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
index 6bc0818577..5ae5b9d481 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
@@ -984,9 +984,9 @@ public class BookieImpl extends BookieCriticalThread implements Bookie {
stateManager.transitionToReadOnlyMode();
throw new IOException(e);
} finally {
- ReferenceCountUtil.safeRelease(entry);
+ ReferenceCountUtil.release(entry);
if (explicitLACEntry != null) {
- ReferenceCountUtil.safeRelease(explicitLACEntry);
+ ReferenceCountUtil.release(explicitLACEntry);
}
}
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
index faf011210a..337a4b4d07 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
@@ -102,7 +102,7 @@ public class BufferedChannel extends BufferedReadChannel implements Closeable {
if (closed) {
return;
}
- ReferenceCountUtil.safeRelease(writeBuffer);
+ ReferenceCountUtil.release(writeBuffer);
fileChannel.close();
closed = true;
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtocol.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtocol.java
index c3b09b856d..25196587a8 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtocol.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtocol.java
@@ -298,7 +298,7 @@ public interface BookieProtocol {
ledgerId = -1;
entryId = -1;
masterKey = null;
- ReferenceCountUtil.safeRelease(data);
+ ReferenceCountUtil.release(data);
data = null;
recyclerHandle.recycle(this);
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java
index f74652bb10..bad3d79524 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ByteBufList.java
@@ -330,7 +330,7 @@ public class ByteBufList extends AbstractReferenceCounted {
ctx.write(bx.retainedDuplicate(), i == (buffersCount - 1) ? promise : ctx.voidPromise());
}
} finally {
- ReferenceCountUtil.safeRelease(b);
+ ReferenceCountUtil.release(b);
}
} else {
ctx.write(msg, promise);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java
index 65f51e2848..ec4895e943 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/ByteBufListTest.java
@@ -303,25 +303,25 @@ public class ByteBufListTest {
@Override
public ChannelFuture write(Object msg) {
- ReferenceCountUtil.safeRelease(msg);
+ ReferenceCountUtil.release(msg);
return null;
}
@Override
public ChannelFuture write(Object msg, ChannelPromise promise) {
- ReferenceCountUtil.safeRelease(msg);
+ ReferenceCountUtil.release(msg);
return null;
}
@Override
public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise) {
- ReferenceCountUtil.safeRelease(msg);
+ ReferenceCountUtil.release(msg);
return null;
}
@Override
public ChannelFuture writeAndFlush(Object msg) {
- ReferenceCountUtil.safeRelease(msg);
+ ReferenceCountUtil.release(msg);
return null;
}
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/logsegment/BKLogSegmentEntryReader.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/logsegment/BKLogSegmentEntryReader.java
index 91c68d4e29..488a952e74 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/logsegment/BKLogSegmentEntryReader.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/logsegment/BKLogSegmentEntryReader.java
@@ -801,7 +801,7 @@ public class BKLogSegmentEntryReader implements SafeRunnable, LogSegmentEntryRea
return;
}
} finally {
- ReferenceCountUtil.safeRelease(removedEntry);
+ ReferenceCountUtil.release(removedEntry);
}
} else if (skipBrokenEntries && BKException.Code.DigestMatchException == entry.getRc()) {
// skip this entry and move forward