You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sp...@apache.org on 2023/03/10 10:31:02 UTC
[iotdb] branch master updated: [IOTDB-5616] Fix some code smells (#9246)
This is an automated email from the ASF dual-hosted git repository.
spricoder 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 f4008210d2 [IOTDB-5616] Fix some code smells (#9246)
f4008210d2 is described below
commit f4008210d271ef5e057445877b03e17c66d53b66
Author: YuFengLiu <38...@users.noreply.github.com>
AuthorDate: Fri Mar 10 18:30:53 2023 +0800
[IOTDB-5616] Fix some code smells (#9246)
* fix confignode.java code smell
* fix confignode code smell
* fix configmanager code smell
* Modify according to review
---
.../iotdb/confignode/manager/ConfigManager.java | 53 ++++++++++------------
.../iotdb/confignode/service/ConfigNode.java | 19 ++++----
2 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 8680b11ff7..8497038c43 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -197,44 +197,46 @@ public class ConfigManager implements IManager {
private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
private static final CommonConfig COMMON_CONF = CommonDescriptor.getInstance().getConfig();
- /** Manage PartitionTable read/write requests through the ConsensusLayer */
+ /** Manage PartitionTable read/write requests through the ConsensusLayer. */
private volatile ConsensusManager consensusManager;
- /** Manage cluster node */
+ /** Manage cluster node. */
private final NodeManager nodeManager;
- /** Manage cluster schema */
+ /** Manage cluster schema. */
private final ClusterSchemaManager clusterSchemaManager;
- /** Manage cluster regions and partitions */
+ /** Manage cluster regions and partitions. */
private final PartitionManager partitionManager;
- /** Manage cluster authorization */
+ /** Manage cluster authorization. */
private final PermissionManager permissionManager;
private final LoadManager loadManager;
- /** Manage procedure */
+ /** Manage procedure. */
private final ProcedureManager procedureManager;
- /** UDF */
+ /** UDF. */
private final UDFManager udfManager;
- /** Manage Trigger */
+ /** Manage Trigger. */
private final TriggerManager triggerManager;
- /** Sync */
+ /** Sync. */
private final SyncManager syncManager;
- /** CQ */
+ /** CQ. */
private final CQManager cqManager;
- /** ML Model */
+ /** ML Model. */
private final ModelManager modelManager;
private final ConfigRegionStateMachine stateMachine;
private final RetryFailedTasksThread retryFailedTasksThread;
+ private static final String DATABASE = "\tDatabase=";
+
public ConfigManager() throws IOException {
// Build the persistence module
NodeInfo nodeInfo = new NodeInfo();
@@ -712,7 +714,7 @@ public class ConfigManager implements IManager {
String database = databaseEntry.getKey();
schemaPartitionRespString
.append(lineSeparator)
- .append("\tDatabase=")
+ .append(DATABASE)
.append(database)
.append(": {");
for (Map.Entry<TSeriesPartitionSlot, TConsensusGroupId> slotEntry :
@@ -728,11 +730,9 @@ public class ConfigManager implements IManager {
schemaPartitionRespString.append(lineSeparator).append("\t},");
}
schemaPartitionRespString.append(lineSeparator).append("}");
-
LOGGER.info(
- "[GetOrCreateSchemaPartition]:"
- + lineSeparator
- + "Receive PathPatternTree: {}, Return TSchemaPartitionTableResp: {}",
+ "[GetOrCreateSchemaPartition]:{} Receive PathPatternTree: {}, Return TSchemaPartitionTableResp: {}",
+ lineSeparator,
devicePathString,
schemaPartitionRespString);
}
@@ -815,11 +815,7 @@ public class ConfigManager implements IManager {
for (Map.Entry<String, Map<TSeriesPartitionSlot, TTimeSlotList>> databaseEntry :
getOrCreateDataPartitionPlan.getPartitionSlotsMap().entrySet()) {
String database = databaseEntry.getKey();
- partitionSlotsMapString
- .append(lineSeparator)
- .append("\tDatabase=")
- .append(database)
- .append(": {");
+ partitionSlotsMapString.append(lineSeparator).append(DATABASE).append(database).append(": {");
for (Map.Entry<TSeriesPartitionSlot, TTimeSlotList> slotEntry :
databaseEntry.getValue().entrySet()) {
partitionSlotsMapString
@@ -845,11 +841,7 @@ public class ConfigManager implements IManager {
String, Map<TSeriesPartitionSlot, Map<TTimePartitionSlot, List<TConsensusGroupId>>>>
databaseEntry : dataPartitionTable.entrySet()) {
String database = databaseEntry.getKey();
- dataPartitionRespString
- .append(lineSeparator)
- .append("\tDatabase=")
- .append(database)
- .append(": {");
+ dataPartitionRespString.append(lineSeparator).append(DATABASE).append(database).append(": {");
for (Map.Entry<TSeriesPartitionSlot, Map<TTimePartitionSlot, List<TConsensusGroupId>>>
seriesSlotEntry : databaseEntry.getValue().entrySet()) {
dataPartitionRespString
@@ -874,9 +866,8 @@ public class ConfigManager implements IManager {
dataPartitionRespString.append(lineSeparator).append("}");
LOGGER.info(
- "[GetOrCreateDataPartition]:"
- + lineSeparator
- + "Receive PartitionSlotsMap: {}, Return TDataPartitionTableResp: {}",
+ "[GetOrCreateDataPartition]:{} Receive PartitionSlotsMap: {}, Return TDataPartitionTableResp: {}",
+ lineSeparator,
partitionSlotsMapString,
dataPartitionRespString);
}
@@ -1717,7 +1708,9 @@ public class ConfigManager implements IManager {
: new TShowCQResp(status, Collections.emptyList());
}
- /** Get all related schemaRegion which may contains the timeSeries matched by given patternTree */
+ /**
+ * Get all related schemaRegion which may contains the timeSeries matched by given patternTree.
+ */
public Map<TConsensusGroupId, TRegionReplicaSet> getRelatedSchemaRegionGroup(
PathPatternTree patternTree) {
Map<String, Map<TSeriesPartitionSlot, TConsensusGroupId>> schemaPartitionTable =
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 e0d85b9b46..08455c4ac7 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
@@ -82,9 +82,9 @@ public class ConfigNode implements ConfigNodeMBean {
public static void main(String[] args) {
LOGGER.info(
- ConfigNodeConstant.GLOBAL_NAME
- + " environment variables: "
- + ConfigNodeConfig.getEnvironmentVariables());
+ "{} environment variables: {}",
+ ConfigNodeConstant.GLOBAL_NAME,
+ ConfigNodeConfig.getEnvironmentVariables());
new ConfigNodeCommandLine().doMain(args);
}
@@ -184,6 +184,7 @@ public class ConfigNode implements ConfigNodeMBean {
TimeUnit.MILLISECONDS.sleep(STARTUP_RETRY_INTERVAL_IN_MS);
} catch (InterruptedException e) {
LOGGER.warn("Waiting leader's scheduling is interrupted.");
+ Thread.currentThread().interrupt();
}
}
@@ -205,7 +206,7 @@ public class ConfigNode implements ConfigNodeMBean {
}
}
- private void setUpInternalServices() throws StartupException, IOException {
+ private void setUpInternalServices() throws StartupException {
// Setup JMXService
registerManager.register(new JMXService());
JMXService.registerMBean(this, mbeanName);
@@ -233,7 +234,7 @@ public class ConfigNode implements ConfigNodeMBean {
LOGGER.info("Successfully initialize ConfigManager.");
}
- /** Register Non-seed ConfigNode when first startup */
+ /** Register Non-seed ConfigNode when first startup. */
private void sendRegisterConfigNodeRequest() throws StartupException, IOException {
TConfigNodeRegisterReq req =
new TConfigNodeRegisterReq(
@@ -284,6 +285,7 @@ public class ConfigNode implements ConfigNodeMBean {
try {
TimeUnit.MILLISECONDS.sleep(STARTUP_RETRY_INTERVAL_IN_MS);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new StartupException("Register ConfigNode failed!");
}
}
@@ -293,7 +295,7 @@ public class ConfigNode implements ConfigNodeMBean {
stop();
}
- private void sendRestartConfigNodeRequest() throws IOException, StartupException {
+ private void sendRestartConfigNodeRequest() throws StartupException {
TConfigNodeRestartReq req =
new TConfigNodeRestartReq(
CONF.getClusterName(),
@@ -329,7 +331,8 @@ public class ConfigNode implements ConfigNodeMBean {
try {
TimeUnit.MILLISECONDS.sleep(STARTUP_RETRY_INTERVAL_IN_MS);
} catch (InterruptedException e) {
- throw new StartupException("Register ConfigNode failed!");
+ Thread.currentThread().interrupt();
+ throw new StartupException("Register ConfigNode failed! ");
}
}
}
@@ -343,7 +346,7 @@ public class ConfigNode implements ConfigNodeMBean {
registerManager.register(configNodeRPCService);
}
- /** Deactivating ConfigNode internal services */
+ /** Deactivating ConfigNode internal services. */
public void deactivate() throws IOException {
LOGGER.info("Deactivating {}...", ConfigNodeConstant.GLOBAL_NAME);
registerManager.deregisterAll();