This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 80e84ecb546 Revert "[To rel/1.2][IOTDB-5995] Fix SonarLint bugs in
consensus module (#10321)"
80e84ecb546 is described below
commit 80e84ecb546e2cecbf360b5bcbd1edca89e9c41a
Author: OneSizeFitQuorum <[email protected]>
AuthorDate: Mon Jun 26 17:24:06 2023 +0800
Revert "[To rel/1.2][IOTDB-5995] Fix SonarLint bugs in consensus module
(#10321)"
This reverts commit 550c081659ebadd794d454b2a473d81e3f4fab88.
---
.../org/apache/iotdb/consensus/ratis/RatisConsensus.java | 8 --------
.../org/apache/iotdb/consensus/ratis/RequestMessage.java | 14 ++++++--------
.../org/apache/iotdb/consensus/ratis/ResponseMessage.java | 14 ++++++--------
.../java/org/apache/iotdb/consensus/ratis/utils/Utils.java | 2 +-
4 files changed, 13 insertions(+), 25 deletions(-)
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
index af71ef99f2e..d8fb18e1aae 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
@@ -71,7 +71,6 @@ import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.protocol.SnapshotManagementRequest;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
-import org.apache.ratis.protocol.exceptions.RaftException;
import org.apache.ratis.protocol.exceptions.ResourceUnavailableException;
import org.apache.ratis.server.DivisionInfo;
import org.apache.ratis.server.RaftServer;
@@ -221,13 +220,6 @@ class RatisConsensus implements IConsensus {
Thread.currentThread().interrupt();
}
}
- if (reply == null) {
- return RaftClientReply.newBuilder()
- .setSuccess(false)
- .setException(
- new RaftException("null reply received in writeWithRetry for
request " + caller))
- .build();
- }
return reply;
}
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
index 5d5a338d038..9eed308a914 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
@@ -24,15 +24,14 @@ import org.apache.ratis.protocol.Message;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.com.google.protobuf.UnsafeByteOperations;
-import java.util.concurrent.atomic.AtomicReference;
-
class RequestMessage implements Message {
private final IConsensusRequest actualRequest;
- private AtomicReference<ByteString> serializedContent = new
AtomicReference<>();
+ private volatile ByteString serializedContent;
RequestMessage(IConsensusRequest request) {
this.actualRequest = request;
+ serializedContent = null;
}
IConsensusRequest getActualRequest() {
@@ -41,15 +40,14 @@ class RequestMessage implements Message {
@Override
public ByteString getContent() {
- if (serializedContent.get() == null) {
+ if (serializedContent == null) {
synchronized (this) {
- if (serializedContent.get() == null) {
+ if (serializedContent == null) {
serializedContent =
- new AtomicReference<>(
-
UnsafeByteOperations.unsafeWrap(actualRequest.serializeToByteBuffer()));
+
UnsafeByteOperations.unsafeWrap(actualRequest.serializeToByteBuffer());
}
}
}
- return serializedContent.get();
+ return serializedContent;
}
}
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ResponseMessage.java
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ResponseMessage.java
index fa746b7b519..7a2e30dae80 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ResponseMessage.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ResponseMessage.java
@@ -27,8 +27,6 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.concurrent.atomic.AtomicReference;
-
class ResponseMessage implements Message {
/**
@@ -37,11 +35,12 @@ class ResponseMessage implements Message {
*/
private final Object contentHolder;
- private AtomicReference<ByteString> serializedData = new AtomicReference<>();
+ private volatile ByteString serializedData;
private final Logger logger = LoggerFactory.getLogger(ResponseMessage.class);
ResponseMessage(Object content) {
this.contentHolder = content;
+ this.serializedData = null;
}
Object getContentHolder() {
@@ -50,20 +49,19 @@ class ResponseMessage implements Message {
@Override
public ByteString getContent() {
- if (serializedData.get() == null) {
+ if (serializedData == null) {
synchronized (this) {
- if (serializedData.get() == null) {
+ if (serializedData == null) {
assert contentHolder instanceof TSStatus;
TSStatus status = (TSStatus) contentHolder;
try {
- serializedData =
- new
AtomicReference<>(ByteString.copyFrom(Utils.serializeTSStatus(status)));
+ serializedData =
ByteString.copyFrom(Utils.serializeTSStatus(status));
} catch (TException e) {
logger.warn("serialize TSStatus failed {}", status);
}
}
}
}
- return serializedData.get();
+ return serializedData;
}
}
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java
index 48975189eff..507824a8e59 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/utils/Utils.java
@@ -52,7 +52,7 @@ public class Utils {
private static final byte PADDING_MAGIC = 0x47;
private static final String DATA_REGION_GROUP = "group-0001";
private static final String SCHEMA_REGION_GROUP = "group-0002";
- private static final CommonConfig config =
CommonDescriptor.getInstance().getConfig();
+ private static volatile CommonConfig config =
CommonDescriptor.getInstance().getConfig();
private Utils() {}
