[iotdb] branch master updated: [IOTDB-5284] Fix some code smells (#8612)

[tanxinyu]

This is an automated email from the ASF dual-hosted git repository.

tanxinyu 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 f73b73fd42 [IOTDB-5284] Fix some code smells (#8612)
f73b73fd42 is described below

commit f73b73fd42f399ba82b6f2486dfb385a99251a5c
Author: BUAAserein <65238551+buaaser...@users.noreply.github.com>
AuthorDate: Mon Dec 26 21:19:21 2022 +0800

    [IOTDB-5284] Fix some code smells (#8612)
    
    * fix some code smells
    
    * fix some code smells
---
 .../java/org/apache/iotdb/confignode/manager/ConsensusManager.java | 2 +-
 .../manager/node/heartbeat/ConfigNodeHeartbeatCache.java           | 2 +-
 .../iotdb/confignode/persistence/schema/ClusterSchemaInfo.java     | 2 +-
 .../confignode/procedure/impl/node/AddConfigNodeProcedure.java     | 5 ++++-
 .../main/java/org/apache/iotdb/confignode/service/ConfigNode.java  | 7 +++++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index 884db7d765..5064dff74f 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -344,7 +344,7 @@ public class ConsensusManager {
   @TestOnly
   public void singleCopyMayWaitUntilLeaderReady() {
     long startTime = System.currentTimeMillis();
-    long maxWaitTime = 1000 * 60; // milliseconds, which is 60s
+    long maxWaitTime = 1000L * 60; // milliseconds, which is 60s
     try {
       while (!consensusImpl.isLeader(consensusGroupId)) {
         TimeUnit.MILLISECONDS.sleep(100);
diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/heartbeat/ConfigNodeHeartbeatCache.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/heartbeat/ConfigNodeHeartbeatCache.java
index cf86e92892..97bc7379c4 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/heartbeat/ConfigNodeHeartbeatCache.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/heartbeat/ConfigNodeHeartbeatCache.java
@@ -55,7 +55,7 @@ public class ConfigNodeHeartbeatCache extends BaseNodeCache {
 
     long lastSendTime = 0;
     synchronized (slidingWindow) {
-      if (slidingWindow.size() > 0) {
+      if (!slidingWindow.isEmpty()) {
         lastSendTime = slidingWindow.getLast().getSendTimestamp();
       }
     }
diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
index 4ba5883264..98494e494e 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
@@ -224,7 +224,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor 
{
     try {
       PartialPath patternPath = new 
PartialPath(plan.getStorageGroupPathPattern());
       List<PartialPath> matchedPaths = 
mTree.getBelongedStorageGroups(patternPath);
-      if (matchedPaths.size() != 0) {
+      if (!matchedPaths.isEmpty()) {
         for (PartialPath path : matchedPaths) {
           mTree
               .getStorageGroupNodeByStorageGroupPath(path)
diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java
index 4283d39a16..afff62bfb7 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java
@@ -108,6 +108,8 @@ public class AddConfigNodeProcedure extends 
AbstractNodeProcedure<AddConfigNodeS
         env.removeConfigNodePeer(tConfigNodeLocation);
         LOG.info("Rollback ADD_PEER for: {}", tConfigNodeLocation);
         break;
+      default:
+        break;
     }
   }
 
@@ -117,8 +119,9 @@ public class AddConfigNodeProcedure extends 
AbstractNodeProcedure<AddConfigNodeS
       case CREATE_PEER:
       case ADD_PEER:
         return true;
+      default:
+        return false;
     }
-    return false;
   }
 
   @Override
diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java 
b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index ff464ac622..d923c1290f 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -161,8 +161,11 @@ public class ConfigNode implements ConfigNodeMBean {
 
       boolean isJoinedCluster = false;
       for (int retry = 0; retry < SCHEDULE_WAITING_RETRY_NUM; retry++) {
-        if 
(configManager.getConsensusManager().getConsensusImpl().getAllConsensusGroupIds().size()
-            > 0) {
+        if (!configManager
+            .getConsensusManager()
+            .getConsensusImpl()
+            .getAllConsensusGroupIds()
+            .isEmpty()) {
           isJoinedCluster = true;
           break;
         }