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 2023/01/02 15:01:09 UTC
[iotdb] branch master updated: [IOTDB-5284] Fix some confignode code smells (#8648)
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 be9e023710 [IOTDB-5284] Fix some confignode code smells (#8648)
be9e023710 is described below
commit be9e023710acc5140c8d58c3bf7515c0e990b722
Author: BUAAserein <65...@users.noreply.github.com>
AuthorDate: Mon Jan 2 23:01:02 2023 +0800
[IOTDB-5284] Fix some confignode code smells (#8648)
* fix some code smells
Co-authored-by: Potato <ta...@apache.org>
---
.../persistence/schema/ClusterSchemaInfo.java | 46 ++++++++++------------
.../procedure/impl/cq/CreateCQProcedure.java | 4 +-
.../impl/node/RemoveConfigNodeProcedure.java | 4 +-
.../impl/sync/AbstractOperatePipeProcedure.java | 4 +-
.../procedure/impl/sync/CreatePipeProcedure.java | 3 +-
.../impl/trigger/CreateTriggerProcedure.java | 4 +-
.../impl/trigger/DropTriggerProcedure.java | 4 +-
7 files changed, 32 insertions(+), 37 deletions(-)
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 3022dfac26..573e1b05a5 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
@@ -95,7 +95,9 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
private final ReentrantReadWriteLock storageGroupReadWriteLock;
private final ConfigMTree mTree;
- private final String SNAPSHOT_FILENAME = "cluster_schema.bin";
+ private static final String SNAPSHOT_FILENAME = "cluster_schema.bin";
+
+ private final String ERROR_NAME = "Error StorageGroup name";
private final TemplateTable templateTable;
@@ -138,7 +140,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
+ LOGGER.error(ERROR_NAME, e);
result.setCode(e.getErrorCode()).setMessage(e.getMessage());
} finally {
storageGroupReadWriteLock.writeLock().unlock();
@@ -182,10 +184,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result.setCount(mTree.getStorageGroupNum(patternPath, false));
result.setStatus(new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()));
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
+ LOGGER.error(ERROR_NAME, e);
result.setStatus(
new TSStatus(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
- .setMessage("Error StorageGroup name: " + e.getMessage()));
+ .setMessage(ERROR_NAME + ": " + e.getMessage()));
} finally {
storageGroupReadWriteLock.readLock().unlock();
}
@@ -208,10 +210,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result.setSchemaMap(schemaMap);
result.setStatus(new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()));
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
+ LOGGER.error(ERROR_NAME, e);
result.setStatus(
new TSStatus(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
- .setMessage("Error StorageGroup name: " + e.getMessage()));
+ .setMessage(ERROR_NAME + ": " + e.getMessage()));
} finally {
storageGroupReadWriteLock.readLock().unlock();
}
@@ -237,10 +239,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result.setMessage("StorageGroup does not exist");
}
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
- result
- .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
- .setMessage("Error StorageGroupName");
+ LOGGER.error(ERROR_NAME, e);
+ result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode()).setMessage(ERROR_NAME);
} finally {
storageGroupReadWriteLock.writeLock().unlock();
}
@@ -262,10 +262,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
}
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
- result
- .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
- .setMessage("Error StorageGroupName");
+ LOGGER.error(ERROR_NAME, e);
+ result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode()).setMessage(ERROR_NAME);
} finally {
storageGroupReadWriteLock.writeLock().unlock();
}
@@ -287,10 +285,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
}
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
- result
- .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
- .setMessage("Error StorageGroupName");
+ LOGGER.error(ERROR_NAME, e);
+ result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode()).setMessage(ERROR_NAME);
} finally {
storageGroupReadWriteLock.writeLock().unlock();
}
@@ -312,10 +308,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
}
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
- result
- .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
- .setMessage("Error StorageGroupName");
+ LOGGER.error(ERROR_NAME, e);
+ result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode()).setMessage(ERROR_NAME);
} finally {
storageGroupReadWriteLock.writeLock().unlock();
}
@@ -342,7 +336,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
}
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
} catch (MetadataException e) {
- LOGGER.error("Error StorageGroup name", e);
+ LOGGER.error(ERROR_NAME, e);
result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
} finally {
storageGroupReadWriteLock.writeLock().unlock();
@@ -429,7 +423,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
}
}
} catch (MetadataException e) {
- LOGGER.warn("Error StorageGroup name", e);
+ LOGGER.warn(ERROR_NAME, e);
} finally {
storageGroupReadWriteLock.readLock().unlock();
}
@@ -457,7 +451,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
return storageGroupSchema.getMaxDataRegionGroupNum();
}
} catch (MetadataException e) {
- LOGGER.warn("Error StorageGroup name", e);
+ LOGGER.warn(ERROR_NAME, e);
return -1;
} finally {
storageGroupReadWriteLock.readLock().unlock();
@@ -800,7 +794,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
path.getFullPath(), mTree.getStorageGroupNodeByPath(path).getStorageGroupSchema());
}
} catch (MetadataException e) {
- LOGGER.warn("Error StorageGroup name", e);
+ LOGGER.warn(ERROR_NAME, e);
} finally {
storageGroupReadWriteLock.readLock().unlock();
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java
index 266e77536d..f310d00c20 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java
@@ -54,7 +54,7 @@ public class CreateCQProcedure extends AbstractNodeProcedure<CreateCQState> {
private static final Logger LOGGER = LoggerFactory.getLogger(CreateCQProcedure.class);
- private static final int retryThreshold = 5;
+ private static final int RETRY_THRESHOLD = 5;
private final ScheduledExecutorService executor;
@@ -158,7 +158,7 @@ public class CreateCQProcedure extends AbstractNodeProcedure<CreateCQState> {
} else {
LOGGER.error(
"Retrievable error trying to create cq [{}], state [{}]", req.getCqId(), state, t);
- if (getCycles() > retryThreshold) {
+ if (getCycles() > RETRY_THRESHOLD) {
setFailure(
new ProcedureException(
String.format(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
index 6c568a4ebb..a441d82c7b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
@@ -37,7 +37,7 @@ import java.nio.ByteBuffer;
/** remove config node procedure */
public class RemoveConfigNodeProcedure extends AbstractNodeProcedure<RemoveConfigNodeState> {
private static final Logger LOG = LoggerFactory.getLogger(RemoveConfigNodeProcedure.class);
- private static final int retryThreshold = 5;
+ private static final int RETRY_THRESHOLD = 5;
private TConfigNodeLocation removedConfigNode;
@@ -82,7 +82,7 @@ public class RemoveConfigNodeProcedure extends AbstractNodeProcedure<RemoveConfi
removedConfigNode,
state,
e);
- if (getCycles() > retryThreshold) {
+ if (getCycles() > RETRY_THRESHOLD) {
setFailure(new ProcedureException("State stuck at " + state));
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java
index 7af1093843..c1ffa6bdf1 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java
@@ -38,7 +38,7 @@ abstract class AbstractOperatePipeProcedure
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractOperatePipeProcedure.class);
- private static final int retryThreshold = 3;
+ private static final int RETRY_THRESHOLD = 3;
/**
* Execute at state OPERATE_CHECK
@@ -91,7 +91,7 @@ abstract class AbstractOperatePipeProcedure
setFailure(new ProcedureException(e.getMessage()));
} else {
LOGGER.error("Retrievable error trying to {} at state [{}]", getOperation(), state, e);
- if (getCycles() > retryThreshold) {
+ if (getCycles() > RETRY_THRESHOLD) {
setFailure(
new ProcedureException(
String.format("Fail to %s because %s", getOperation().name(), e.getMessage())));
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/CreatePipeProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/CreatePipeProcedure.java
index 3eaf0e356f..24dc3cef22 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/CreatePipeProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/CreatePipeProcedure.java
@@ -129,8 +129,9 @@ public class CreatePipeProcedure 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/trigger/CreateTriggerProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
index 0aee01f65b..53ca34797b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
@@ -48,7 +48,7 @@ import java.nio.ByteBuffer;
/** create trigger procedure */
public class CreateTriggerProcedure extends AbstractNodeProcedure<CreateTriggerState> {
private static final Logger LOG = LoggerFactory.getLogger(CreateTriggerProcedure.class);
- private static final int retryThreshold = 5;
+ private static final int RETRY_THRESHOLD = 5;
private TriggerInformation triggerInformation;
private Binary jarFile;
@@ -161,7 +161,7 @@ public class CreateTriggerProcedure extends AbstractNodeProcedure<CreateTriggerS
triggerInformation.getTriggerName(),
state,
e);
- if (getCycles() > retryThreshold) {
+ if (getCycles() > RETRY_THRESHOLD) {
setFailure(
new ProcedureException(
String.format(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
index e9ff497d8b..d2b0e6eb59 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
@@ -43,7 +43,7 @@ import java.nio.ByteBuffer;
/** drop trigger procedure */
public class DropTriggerProcedure extends AbstractNodeProcedure<DropTriggerState> {
private static final Logger LOG = LoggerFactory.getLogger(DropTriggerProcedure.class);
- private static final int retryThreshold = 5;
+ private static final int RETRY_THRESHOLD = 5;
private String triggerName;
@@ -110,7 +110,7 @@ public class DropTriggerProcedure extends AbstractNodeProcedure<DropTriggerState
} else {
LOG.error(
"Retrievable error trying to drop trigger [{}], state [{}]", triggerName, state, e);
- if (getCycles() > retryThreshold) {
+ if (getCycles() > RETRY_THRESHOLD) {
setFailure(
new ProcedureException(
String.format("Fail to drop trigger [%s] at STATE [%s]", triggerName, state)));