You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2022/12/29 13:58:53 UTC
[iotdb] branch master updated: fix some code smells (#8658)
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 bed0552fcc fix some code smells (#8658)
bed0552fcc is described below
commit bed0552fcc731f8fcdc1b11bca2beb93a2896b45
Author: BUAAserein <65...@users.noreply.github.com>
AuthorDate: Thu Dec 29 21:58:48 2022 +0800
fix some code smells (#8658)
---
.../iotdb/confignode/consensus/response/StorageGroupSchemaResp.java | 4 +++-
.../iotdb/confignode/consensus/response/TemplateSetInfoResp.java | 4 +++-
.../iotdb/confignode/manager/partition/heartbeat/RegionCache.java | 2 +-
.../java/org/apache/iotdb/confignode/persistence/TriggerInfo.java | 2 +-
.../main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java | 2 +-
.../apache/iotdb/confignode/persistence/partition/PartitionInfo.java | 4 +++-
.../persistence/partition/maintainer/RegionMaintainTask.java | 2 +-
.../org/apache/iotdb/confignode/persistence/schema/TemplateTable.java | 2 +-
.../java/org/apache/iotdb/confignode/procedure/StoppableThread.java | 2 +-
.../iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java | 2 +-
.../iotdb/confignode/procedure/impl/sync/StartPipeProcedure.java | 3 ++-
.../iotdb/confignode/procedure/impl/sync/StopPipeProcedure.java | 3 ++-
.../confignode/procedure/scheduler/SimpleProcedureScheduler.java | 2 +-
13 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java
index aa7f43f78a..d7b017fea6 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java
@@ -33,7 +33,9 @@ public class StorageGroupSchemaResp implements DataSet {
// Map<StorageGroupName, TStorageGroupSchema>
private Map<String, TStorageGroupSchema> schemaMap;
- public StorageGroupSchemaResp() {}
+ public StorageGroupSchemaResp() {
+ // empty constructor
+ }
public TSStatus getStatus() {
return status;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/TemplateSetInfoResp.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/TemplateSetInfoResp.java
index 9f0c76593f..f7573499fa 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/TemplateSetInfoResp.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/TemplateSetInfoResp.java
@@ -33,7 +33,9 @@ public class TemplateSetInfoResp implements DataSet {
// <path pattern represents possible device paths, possible templates set on device>
private Map<PartialPath, List<Template>> patternTemplateMap;
- public TemplateSetInfoResp() {}
+ public TemplateSetInfoResp() {
+ // empty constructor
+ }
public TSStatus getStatus() {
return status;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/heartbeat/RegionCache.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/heartbeat/RegionCache.java
index 10f33e6300..706b40e3e8 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/heartbeat/RegionCache.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/heartbeat/RegionCache.java
@@ -39,7 +39,7 @@ public class RegionCache {
synchronized (slidingWindow) {
// Only sequential HeartbeatSamples are accepted.
// And un-sequential HeartbeatSamples will be discarded.
- if (slidingWindow.size() == 0
+ if (slidingWindow.isEmpty()
|| getLastSample().getSendTimestamp() < newHeartbeatSample.getSendTimestamp()) {
slidingWindow.add(newHeartbeatSample);
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
index 1de673f89c..ef6353c5e5 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
@@ -80,7 +80,7 @@ public class TriggerInfo implements SnapshotProcessor {
private final ReentrantLock triggerTableLock = new ReentrantLock();
- private final String snapshotFileName = "trigger_info.bin";
+ private static final String snapshotFileName = "trigger_info.bin";
public TriggerInfo() throws IOException {
triggerTable = new TriggerTable();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
index bddbbdfd7f..dc9e695d4f 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
@@ -69,7 +69,7 @@ public class UDFInfo implements SnapshotProcessor {
private final ReentrantLock udfTableLock = new ReentrantLock();
- private final String snapshotFileName = "udf_info.bin";
+ private static final String snapshotFileName = "udf_info.bin";
public UDFInfo() throws IOException {
udfTable = new UDFTable();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
index 4fed025aa4..ffedfa87ad 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
@@ -111,7 +111,7 @@ public class PartitionInfo implements SnapshotProcessor {
// For RegionReplicas' asynchronous management
private final List<RegionMaintainTask> regionMaintainTaskList;
- private final String snapshotFileName = "partition_info.bin";
+ private static final String snapshotFileName = "partition_info.bin";
public PartitionInfo() {
this.nextRegionGroupId = new AtomicInteger(-1);
@@ -237,6 +237,8 @@ public class PartitionInfo implements SnapshotProcessor {
case ROLLBACK:
storageGroupPartitionTable.setPredeleted(false);
break;
+ default:
+ break;
}
return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/maintainer/RegionMaintainTask.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/maintainer/RegionMaintainTask.java
index ee9aba11da..b71a935490 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/maintainer/RegionMaintainTask.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/maintainer/RegionMaintainTask.java
@@ -36,7 +36,7 @@ public abstract class RegionMaintainTask {
protected final RegionMaintainType type;
protected TDataNodeLocation targetDataNode;
- public RegionMaintainTask(RegionMaintainType type) {
+ protected RegionMaintainTask(RegionMaintainType type) {
this.type = type;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/TemplateTable.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/TemplateTable.java
index 5f770e7077..8dca4ab431 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/TemplateTable.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/TemplateTable.java
@@ -57,7 +57,7 @@ public class TemplateTable {
private final Map<String, Template> templateMap = new ConcurrentHashMap<>();
private final Map<Integer, Template> templateIdMap = new ConcurrentHashMap<>();
- private final String snapshotFileName = "template_info.bin";
+ private static final String snapshotFileName = "template_info.bin";
public TemplateTable() {
templateReadWriteLock = new ReentrantReadWriteLock();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/StoppableThread.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/StoppableThread.java
index 84f2f27ed1..b3a3432030 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/StoppableThread.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/StoppableThread.java
@@ -27,7 +27,7 @@ public abstract class StoppableThread extends Thread {
private static final int JOIN_TIMEOUT = 250;
private static final Logger LOG = LoggerFactory.getLogger(StoppableThread.class);
- public StoppableThread(ThreadGroup threadGroup, String name) {
+ protected StoppableThread(ThreadGroup threadGroup, String name) {
super(threadGroup, name);
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java
index 719964bede..f42e46e2aa 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveDataNodeProcedure.java
@@ -150,7 +150,7 @@ public class RemoveDataNodeProcedure extends AbstractNodeProcedure<RemoveDataNod
.filter(replica -> replica.getDataNodeLocations().contains(removedDataNode))
.map(TRegionReplicaSet::getRegionId)
.collect(Collectors.toList());
- if (migratedFailedRegions.size() > 0) {
+ if (!migratedFailedRegions.isEmpty()) {
LOG.warn(
"{}, Some regions are migrated failed, the StopDataNode process should not be executed, migratedFailedRegions: {}",
REMOVE_DATANODE_PROCESS,
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StartPipeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StartPipeProcedure.java
index a0bf020a7e..d7e68434d9 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StartPipeProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StartPipeProcedure.java
@@ -137,8 +137,9 @@ public class StartPipeProcedure extends AbstractOperatePipeProcedure {
case PRE_OPERATE_PIPE_CONFIGNODE:
case OPERATE_PIPE_DATANODE:
return true;
+ default:
+ return false;
}
- return false;
}
@Override
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StopPipeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StopPipeProcedure.java
index 9572ba0fa4..0f15b04840 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StopPipeProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/StopPipeProcedure.java
@@ -137,8 +137,9 @@ public class StopPipeProcedure extends AbstractOperatePipeProcedure {
case PRE_OPERATE_PIPE_CONFIGNODE:
case OPERATE_PIPE_DATANODE:
return true;
+ default:
+ return false;
}
- return false;
}
@Override
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/scheduler/SimpleProcedureScheduler.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/scheduler/SimpleProcedureScheduler.java
index f6065a585a..8940efeda2 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/scheduler/SimpleProcedureScheduler.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/scheduler/SimpleProcedureScheduler.java
@@ -59,7 +59,7 @@ public class SimpleProcedureScheduler extends AbstractProcedureScheduler {
@Override
public boolean queueHasRunnables() {
- return runnables.size() > 0;
+ return !runnables.isEmpty();
}
@Override