This is an automated email from the ASF dual-hosted git repository.
wangchao316 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2db45ac660a Fix some code smells (#11575)
2db45ac660a is described below
commit 2db45ac660a4a48f48c0e2bb9f47b23e5f288fce
Author: Bo Cui <[email protected]>
AuthorDate: Mon Nov 20 17:18:37 2023 +0800
Fix some code smells (#11575)
Fix some code smells (#11575)
---
.../service/IoTConsensusRPCServiceProcessor.java | 27 +++++++++++-----------
.../iotdb/consensus/ratis/RatisConsensus.java | 2 +-
.../request/PipeTransferTabletRawReq.java | 2 +-
.../legacy/IoTDBLegacyPipeReceiverAgent.java | 6 ++---
.../receiver/thrift/IoTDBThriftReceiverV1.java | 2 +-
.../trigger/service/TriggerInformationUpdater.java | 2 +-
6 files changed, 21 insertions(+), 20 deletions(-)
diff --git
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java
index a793d40139b..9f795c2f536 100644
---
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java
+++
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java
@@ -61,7 +61,8 @@ import java.util.stream.Collectors;
public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.AsyncIface {
- private final Logger logger =
LoggerFactory.getLogger(IoTConsensusRPCServiceProcessor.class);
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(IoTConsensusRPCServiceProcessor.class);
private final IoTConsensus consensus;
@@ -81,7 +82,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
String.format(
"unexpected consensusGroupId %s for TSyncLogEntriesReq which
size is %s",
groupId, req.getLogEntries().size());
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new
TSyncLogEntriesRes(Collections.singletonList(status)));
@@ -89,7 +90,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
}
if (impl.isReadOnly()) {
String message = "fail to sync logEntries because system is
read-only.";
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.SYSTEM_READ_ONLY.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new
TSyncLogEntriesRes(Collections.singletonList(status)));
@@ -122,7 +123,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
.recordDeserializeCost(System.nanoTime() - buildRequestTime);
TSStatus writeStatus =
impl.syncLog(logEntriesInThisBatch.getSourcePeerId(),
deserializedRequest);
- logger.debug(
+ LOGGER.debug(
"execute TSyncLogEntriesReq for {} with result {}",
req.consensusGroupId,
writeStatus.subStatus);
@@ -142,7 +143,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for inactivatePeer
request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TInactivatePeerRes(status));
@@ -162,7 +163,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for inactivatePeer
request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TActivatePeerRes(status));
@@ -183,7 +184,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for
buildSyncLogChannel request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TBuildSyncLogChannelRes(status));
@@ -210,7 +211,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for
buildSyncLogChannel request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TRemoveSyncLogChannelRes(status));
@@ -237,7 +238,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for
waitSyncLogComplete request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TWaitSyncLogCompleteRes(true, 0, 0));
@@ -259,7 +260,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for
buildSyncLogChannel request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TSendSnapshotFragmentRes(status));
@@ -286,7 +287,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for
buildSyncLogChannel request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TTriggerSnapshotLoadRes(status));
@@ -308,7 +309,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
if (impl == null) {
String message =
String.format("unexpected consensusGroupId %s for
buildSyncLogChannel request", groupId);
- logger.error(message);
+ LOGGER.error(message);
TSStatus status = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
status.setMessage(message);
resultHandler.onComplete(new TCleanupTransferredSnapshotRes(status));
@@ -319,7 +320,7 @@ public class IoTConsensusRPCServiceProcessor implements
IoTConsensusIService.Asy
impl.cleanupTransferredSnapshot(req.snapshotId);
responseStatus = new
TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
} catch (ConsensusGroupModifyPeerException e) {
- logger.error(String.format("failed to cleanup transferred snapshot %s",
req.snapshotId), e);
+ LOGGER.error("failed to cleanup transferred snapshot {}",
req.snapshotId, e);
responseStatus = new
TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
responseStatus.setMessage(e.getMessage());
}
diff --git
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
index a4aece95010..349bde3a804 100644
---
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
+++
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
@@ -744,7 +744,7 @@ class RatisConsensus implements IConsensus {
try {
return clientManager.borrowClient(group);
} catch (ClientManagerException e) {
- logger.error(String.format("Borrow client from pool for group %s
failed.", group), e);
+ logger.error("Borrow client from pool for group {} failed.", group, e);
// rethrow the exception
throw e;
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReq.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReq.java
index ee69b78e75b..71babe20982 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReq.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReq.java
@@ -85,7 +85,7 @@ public class PipeTransferTabletRawReq extends
TPipeTransferReq {
return StatementGenerator.createStatement(request);
} catch (MetadataException e) {
- LOGGER.warn(String.format("Generate Statement from tablet %s error.",
tablet), e);
+ LOGGER.warn("Generate Statement from tablet {} error.", tablet, e);
return null;
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/legacy/IoTDBLegacyPipeReceiverAgent.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/legacy/IoTDBLegacyPipeReceiverAgent.java
index 4b1c659927f..bc5b79e4c79 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/legacy/IoTDBLegacyPipeReceiverAgent.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/legacy/IoTDBLegacyPipeReceiverAgent.java
@@ -143,12 +143,12 @@ public class IoTDBLegacyPipeReceiverAgent {
IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()
&& result.status.code !=
TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
- LOGGER.error("Create Database error, statement: {}.", statement);
- LOGGER.error("Create database result status : {}.", result.status);
+ LOGGER.error(
+ "Create Database error, statement: {}, result status : {}.",
statement, result.status);
return false;
}
} catch (IllegalPathException e) {
- LOGGER.error(String.format("Parse database PartialPath %s error",
database), e);
+ LOGGER.error("Parse database PartialPath {} error", database, e);
return false;
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiverV1.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiverV1.java
index cb0a0de3bb5..e0cbae58464 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiverV1.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiverV1.java
@@ -311,7 +311,7 @@ public class IoTDBThriftReceiverV1 implements
IoTDBThriftReceiver {
return PipeTransferFilePieceResp.toTPipeTransferResp(
RpcUtils.SUCCESS_STATUS, writingFileWriter.length());
} catch (Exception e) {
- LOGGER.warn(String.format("Failed to write file piece from req %s.",
req), e);
+ LOGGER.warn("Failed to write file piece from req {}.", req, e);
final TSStatus status =
RpcUtils.getStatus(
TSStatusCode.PIPE_TRANSFER_FILE_ERROR,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java
index dae446f8988..ee76cfc527c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java
@@ -97,7 +97,7 @@ public class TriggerInformationUpdater {
triggerInformation.getTriggerName(),
triggerInformation.getDataNodeLocation());
}
} catch (Exception e) {
- LOGGER.warn(String.format("Meet error when updating trigger information:
%s", e));
+ LOGGER.warn("Meet error when updating trigger information:", e);
}
}
}
