You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/16 10:56:24 UTC

[iotdb] branch master updated: [IOTDB-4498] Update StatusCode to the latest (#7985)

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

qiaojialin 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 ee49d420f3 [IOTDB-4498] Update StatusCode to the latest (#7985)
ee49d420f3 is described below

commit ee49d420f315b11d959b5eb77d22994b01940e5d
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Wed Nov 16 18:56:16 2022 +0800

    [IOTDB-4498] Update StatusCode to the latest (#7985)
---
 .../client/sync/SyncConfigNodeClientPool.java      |   2 +-
 .../client/sync/SyncDataNodeClientPool.java        |   6 +-
 .../confignode/conf/ConfigNodeRemoveCheck.java     |   2 +-
 .../confignode/manager/ClusterSchemaManager.java   |   6 +-
 .../iotdb/confignode/manager/ConfigManager.java    |   2 +-
 .../iotdb/confignode/manager/SyncManager.java      |   6 +-
 .../iotdb/confignode/manager/TriggerManager.java   |   2 +-
 .../iotdb/confignode/manager/node/NodeManager.java |  14 +-
 .../manager/partition/PartitionManager.java        |   4 +-
 .../iotdb/confignode/persistence/AuthorInfo.java   |  17 ++-
 .../iotdb/confignode/persistence/cq/CQInfo.java    |   2 +-
 .../confignode/persistence/node/NodeInfo.java      |   4 +-
 .../persistence/schema/ClusterSchemaInfo.java      |  22 +--
 .../persistence/sync/ClusterSyncInfo.java          |   2 +-
 .../procedure/env/ConfigNodeProcedureEnv.java      |   2 +-
 .../procedure/env/DataNodeRemoveHandler.java       |   6 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   6 +-
 .../confignode/persistence/AuthorInfoTest.java     |   2 +-
 .../multileader/MultiLeaderConsensus.java          |   2 +-
 .../multileader/client/DispatchLogHandler.java     |   2 +-
 .../service/MultiLeaderRPCServiceProcessor.java    |   2 +-
 .../iotdb/consensus/simple/SimpleConsensus.java    |   2 +-
 docs/UserGuide/API/Status-Codes.md                 | 122 ++++++++++++-----
 docs/zh/UserGuide/API/Status-Codes.md              | 125 ++++++++++++-----
 .../org/apache/iotdb/flink/FlinkIoTDBSource.java   |   2 +-
 .../main/java/org/apache/iotdb/SessionExample.java |   2 +-
 .../iotdb/SyntaxConventionRelatedExample.java      |   2 +-
 .../confignode/it/IoTDBClusterAuthorityIT.java     |   2 +-
 .../iotdb/confignode/it/IoTDBStorageGroupIT.java   |   3 +-
 .../apache/iotdb/db/integration/IoTDBTtlIT.java    |  20 +--
 .../commons/exception/ConfigurationException.java  |   6 +-
 .../commons/exception/sync/PipeSinkException.java  |   4 +-
 .../iotdb/commons/partition/SchemaPartition.java   |   3 +-
 .../apache/iotdb/commons/utils/StatusUtils.java    | 148 +++++++--------------
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |   2 +-
 .../iotdb/db/auth/ClusterAuthorityFetcher.java     |   7 +-
 .../iotdb/db/auth/StandaloneAuthorityFetcher.java  |   7 +-
 .../apache/iotdb/db/engine/StorageEngineV2.java    |   6 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |   4 +-
 .../iotdb/db/exception/DataRegionException.java    |   4 +-
 .../exception/DiskSpaceInsufficientException.java  |   2 +-
 .../apache/iotdb/db/exception/MergeException.java  |   2 +-
 .../db/exception/QueryIdNotExsitException.java     |  29 ----
 .../exception/StorageEngineReadonlyException.java  |   2 +-
 .../db/exception/SyncConnectionException.java      |   6 +-
 .../index/UnsupportedIndexTypeException.java       |   2 +-
 .../metadata/AliasAlreadyExistException.java       |   2 +-
 .../exception/metadata/DeleteFailedException.java  |   2 +-
 .../metadata/MeasurementAlreadyExistException.java |   2 +-
 .../metadata/MeasurementInBlackListException.java  |   2 +-
 .../metadata/PathAlreadyExistException.java        |   2 +-
 .../exception/metadata/PathNotExistException.java  |   6 +-
 .../metadata/StorageGroupAlreadySetException.java  |   4 +-
 .../metadata/StorageGroupNotSetException.java      |   4 +-
 .../schemafile/ColossalRecordException.java        |   6 +-
 .../SchemaFileLogCorruptedException.java           |   2 +-
 .../template/TemplateImcompatibeException.java     |   4 +-
 .../db/exception/query/OutOfTTLException.java      |   2 +-
 .../iotdb/db/exception/query/PathException.java    |  38 ------
 .../query/UnSupportedFillTypeException.java        |   2 +-
 .../iotdb/db/localconfignode/LocalConfigNode.java  |   4 +-
 .../execution/executor/RegionWriteExecutor.java    |   6 +-
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |   2 +-
 .../db/mpp/plan/analyze/ClusterSchemaFetcher.java  |   2 +-
 .../config/executor/ClusterConfigTaskExecutor.java |   2 +-
 .../executor/StandaloneConfigTaskExecutor.java     |   2 +-
 .../db/mpp/plan/scheduler/ClusterScheduler.java    |   2 +-
 .../scheduler/FragmentInstanceDispatcherImpl.java  |   2 +-
 .../db/mpp/plan/scheduler/StandaloneScheduler.java |   2 +-
 .../scheduler/load/LoadTsFileDispatcherImpl.java   |   6 +-
 .../influxdb/meta/NewInfluxDBMetaManager.java      |   2 +-
 .../protocol/rest/filter/AuthorizationFilter.java  |   4 +-
 .../rest/handler/AuthorizationHandler.java         |   4 +-
 .../iotdb/db/query/control/SessionManager.java     |   6 +-
 .../iotdb/db/service/RegionMigrateService.java     |   6 +-
 .../service/thrift/impl/ClientRPCServiceImpl.java  |   4 +-
 .../impl/DataNodeInternalRPCServiceImpl.java       |  13 +-
 .../thrift/impl/NewInfluxDBServiceImpl.java        |   2 +-
 .../db/service/thrift/impl/TSServiceImpl.java      |   4 +-
 .../iotdb/db/sync/common/LocalSyncInfoFetcher.java |   2 +-
 .../db/sync/transport/client/IoTDBSyncClient.java  |   2 +-
 .../db/sync/transport/server/ReceiverManager.java  |   6 +-
 .../apache/iotdb/db/utils/ErrorHandlingUtils.java  |   6 +-
 .../iotdb/db/auth/AuthorizerManagerTest.java       |   4 +-
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    | 121 +++++++----------
 85 files changed, 452 insertions(+), 469 deletions(-)

diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
index 8d156eee89..99fe08b702 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
@@ -102,7 +102,7 @@ public class SyncConfigNodeClientPool {
     }
     LOGGER.error("{} failed on ConfigNode {}", requestType, endPoint, lastException);
     return RpcUtils.getStatus(
-        TSStatusCode.ALL_RETRY_FAILED, "All retry failed due to: " + lastException.getMessage());
+        TSStatusCode.ALL_RETRY_ERROR, "All retry failed due to: " + lastException.getMessage());
   }
 
   /**
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
index 61625cc603..5d5c5c6bb1 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
@@ -81,7 +81,7 @@ public class SyncDataNodeClientPool {
       }
     }
     LOGGER.error("{} failed on DataNode {}", requestType, endPoint, lastException);
-    return new TSStatus(TSStatusCode.ALL_RETRY_FAILED.getStatusCode())
+    return new TSStatus(TSStatusCode.ALL_RETRY_ERROR.getStatusCode())
         .setMessage("All retry failed due to: " + lastException.getMessage());
   }
 
@@ -105,7 +105,7 @@ public class SyncDataNodeClientPool {
       }
     }
     LOGGER.error("{} failed on DataNode {}", requestType, endPoint, lastException);
-    return new TSStatus(TSStatusCode.ALL_RETRY_FAILED.getStatusCode())
+    return new TSStatus(TSStatusCode.ALL_RETRY_ERROR.getStatusCode())
         .setMessage("All retry failed due to: " + lastException.getMessage());
   }
 
@@ -183,7 +183,7 @@ public class SyncDataNodeClientPool {
       status.setMessage(e.getMessage());
     } catch (TException e) {
       LOGGER.error("Change regions leader error on Date node: {}", dataNode, e);
-      status = new TSStatus(TSStatusCode.REGION_LEADER_CHANGE_FAILED.getStatusCode());
+      status = new TSStatus(TSStatusCode.REGION_LEADER_CHANGE_ERROR.getStatusCode());
       status.setMessage(e.getMessage());
     }
     return status;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
index b3a8324647..d7c492275b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
@@ -112,7 +112,7 @@ public class ConfigNodeRemoveCheck {
         break;
       }
 
-      if (status.getCode() == TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode()) {
+      if (status.getCode() == TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode()) {
         LOGGER.warn("Execute removeConfigNode failed for: {}", status.getMessage());
         break;
       }
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
index e7377349c2..008bb69b11 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
@@ -125,7 +125,7 @@ public class ClusterSchemaManager {
       if (metadataException instanceof IllegalPathException) {
         result = new TSStatus(TSStatusCode.PATH_ILLEGAL.getStatusCode());
       } else {
-        result = new TSStatus(TSStatusCode.STORAGE_GROUP_ALREADY_EXISTS.getStatusCode());
+        result = new TSStatus(TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode());
       }
       result.setMessage(metadataException.getMessage());
       return result;
@@ -196,7 +196,7 @@ public class ClusterSchemaManager {
         // Return immediately if some StorageGroups doesn't exist
         return new TShowStorageGroupResp()
             .setStatus(
-                new TSStatus(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode())
+                new TSStatus(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
                     .setMessage(e.getMessage()));
       }
 
@@ -221,7 +221,7 @@ public class ClusterSchemaManager {
 
     if (storageSchemaMap.isEmpty()) {
       return RpcUtils.getStatus(
-          TSStatusCode.STORAGE_GROUP_NOT_EXIST,
+          TSStatusCode.DATABASE_NOT_EXIST,
           "Path [" + new PartialPath(setTTLPlan.getStorageGroupPathPattern()) + "] does not exist");
     }
 
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 542e65b261..747a5c00f2 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
@@ -441,7 +441,7 @@ public class ConfigManager implements IManager {
           getClusterSchemaManager().getMatchedStorageGroupSchemasByName(deletedPaths);
       if (deleteStorageSchemaMap.isEmpty()) {
         return RpcUtils.getStatus(
-            TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode(),
+            TSStatusCode.PATH_NOT_EXIST.getStatusCode(),
             String.format("Path %s does not exist", Arrays.toString(deletedPaths.toArray())));
       }
       ArrayList<TStorageGroupSchema> parsedDeleteStorageGroups =
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/SyncManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/SyncManager.java
index 88c3b31449..288326f936 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/SyncManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/SyncManager.java
@@ -95,7 +95,8 @@ public class SyncManager {
       return getConsensusManager().write(plan).getStatus();
     } catch (PipeSinkException e) {
       LOGGER.error(e.getMessage());
-      return new TSStatus(TSStatusCode.PIPESINK_ERROR.getStatusCode()).setMessage(e.getMessage());
+      return new TSStatus(TSStatusCode.CREATE_PIPE_SINK_ERROR.getStatusCode())
+          .setMessage(e.getMessage());
     }
   }
 
@@ -105,7 +106,8 @@ public class SyncManager {
       return getConsensusManager().write(plan).getStatus();
     } catch (PipeSinkException e) {
       LOGGER.error(e.getMessage());
-      return new TSStatus(TSStatusCode.PIPESINK_ERROR.getStatusCode()).setMessage(e.getMessage());
+      return new TSStatus(TSStatusCode.CREATE_PIPE_SINK_ERROR.getStatusCode())
+          .setMessage(e.getMessage());
     }
   }
 
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
index a6083fd2cd..6f6813952c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/TriggerManager.java
@@ -101,7 +101,7 @@ public class TriggerManager {
       if (targetDataNode.isPresent()) {
         dataNodeLocation = targetDataNode.get();
       } else {
-        return new TSStatus(TSStatusCode.NOT_ENOUGH_DATA_NODE.getStatusCode());
+        return new TSStatus(TSStatusCode.NO_ENOUGH_DATANODE.getStatusCode());
       }
     }
     final String triggerName = req.getTriggerName();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
index edb8ce0e23..86e743437b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
@@ -249,7 +249,7 @@ public class NodeManager {
       status.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
       status.setMessage("registerDataNode success.");
     } else {
-      status.setCode(TSStatusCode.REJECT_REMOVED_DATANODE.getStatusCode());
+      status.setCode(TSStatusCode.REGISTER_REMOVED_DATANODE.getStatusCode());
       status.setMessage("Cannot register datanode, maybe this datanode is already removed.");
     }
 
@@ -290,7 +290,7 @@ public class NodeManager {
     if (configManager.transfer(removeDataNodePlan.getDataNodeLocations()).getCode()
         != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
       dataSet.setStatus(
-          new TSStatus(TSStatusCode.NODE_DELETE_FAILED_ERROR.getStatusCode())
+          new TSStatus(TSStatusCode.NODE_DELETE_ERROR.getStatusCode())
               .setMessage("Fail to do transfer of the DataNodes"));
       return dataSet;
     }
@@ -303,7 +303,7 @@ public class NodeManager {
       status = new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
       status.setMessage("Server accepted the request");
     } else {
-      status = new TSStatus(TSStatusCode.NODE_DELETE_FAILED_ERROR.getStatusCode());
+      status = new TSStatus(TSStatusCode.NODE_DELETE_ERROR.getStatusCode());
       status.setMessage("Server rejected the request, maybe requests are too many");
     }
     dataSet.setStatus(status);
@@ -561,21 +561,21 @@ public class NodeManager {
     try {
       // Check OnlineConfigNodes number
       if (filterConfigNodeThroughStatus(NodeStatus.Running).size() <= 1) {
-        return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode())
+        return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())
             .setMessage(
                 "Remove ConfigNode failed because there is only one ConfigNode in current Cluster.");
       }
 
       // Check whether the registeredConfigNodes contain the ConfigNode to be removed.
       if (!getRegisteredConfigNodes().contains(removeConfigNodePlan.getConfigNodeLocation())) {
-        return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode())
+        return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())
             .setMessage("Remove ConfigNode failed because the ConfigNode not in current Cluster.");
       }
 
       // Check whether the remove ConfigNode is leader
       TConfigNodeLocation leader = getConsensusManager().getLeader();
       if (leader == null) {
-        return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode())
+        return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())
             .setMessage(
                 "Remove ConfigNode failed because the ConfigNodeGroup is on leader election, please retry.");
       }
@@ -609,7 +609,7 @@ public class NodeManager {
                 groupId,
                 new Peer(groupId, newLeader.getConfigNodeId(), newLeader.getConsensusEndPoint()));
     if (!resp.isSuccess()) {
-      return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode())
+      return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())
           .setMessage("Remove ConfigNode failed because transfer ConfigNode leader failed.");
     }
     return new TSStatus(TSStatusCode.NEED_REDIRECTION.getStatusCode())
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
index f130f92894..817091fbfe 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
@@ -397,12 +397,12 @@ public class PartitionManager {
     } catch (NotEnoughDataNodeException e) {
       String prompt = "ConfigNode failed to extend Region because there are not enough DataNodes";
       LOGGER.error(prompt);
-      result.setCode(TSStatusCode.NOT_ENOUGH_DATA_NODE.getStatusCode());
+      result.setCode(TSStatusCode.NO_ENOUGH_DATANODE.getStatusCode());
       result.setMessage(prompt);
     } catch (StorageGroupNotExistsException e) {
       String prompt = "ConfigNode failed to extend Region because some StorageGroup doesn't exist.";
       LOGGER.error(prompt);
-      result.setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode());
+      result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
       result.setMessage(prompt);
     }
 
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
index 69a225f293..8f3eb1b1f0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
@@ -92,7 +92,7 @@ public class AuthorInfo implements SnapshotProcessor {
     }
     if (!status) {
       tsStatus.setMessage(loginMessage != null ? loginMessage : "Authentication failed.");
-      tsStatus.setCode(TSStatusCode.WRONG_LOGIN_PASSWORD_ERROR.getStatusCode());
+      tsStatus.setCode(TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode());
       result.setStatus(tsStatus);
     }
     return result;
@@ -118,12 +118,11 @@ public class AuthorInfo implements SnapshotProcessor {
         result = getUserPermissionInfo(username);
         result.setStatus(RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS));
       } catch (AuthException e) {
-        result.setStatus(
-            RpcUtils.getStatus(TSStatusCode.EXECUTE_PERMISSION_EXCEPTION_ERROR, e.getMessage()));
+        result.setStatus(RpcUtils.getStatus(TSStatusCode.EXECUTE_PERMISSION_ERROR, e.getMessage()));
       }
     } else {
       result = AuthUtils.generateEmptyPermissionInfoResp();
-      result.setStatus(RpcUtils.getStatus(TSStatusCode.NO_PERMISSION_ERROR));
+      result.setStatus(RpcUtils.getStatus(TSStatusCode.NO_PERMISSION));
     }
     return result;
   }
@@ -203,7 +202,7 @@ public class AuthorInfo implements SnapshotProcessor {
           throw new AuthException("unknown type: " + authorPlan.getAuthorType());
       }
     } catch (AuthException e) {
-      return RpcUtils.getStatus(TSStatusCode.EXECUTE_PERMISSION_EXCEPTION_ERROR, e.getMessage());
+      return RpcUtils.getStatus(TSStatusCode.EXECUTE_PERMISSION_ERROR, e.getMessage());
     }
     return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
   }
@@ -219,7 +218,7 @@ public class AuthorInfo implements SnapshotProcessor {
         if (role == null) {
           result.setStatus(
               RpcUtils.getStatus(
-                  TSStatusCode.ROLE_NOT_EXIST_ERROR, "No such role : " + plan.getRoleName()));
+                  TSStatusCode.ROLE_NOT_EXIST, "No such role : " + plan.getRoleName()));
           result.setPermissionInfo(permissionInfo);
           return result;
         }
@@ -255,7 +254,7 @@ public class AuthorInfo implements SnapshotProcessor {
         if (user == null) {
           result.setStatus(
               RpcUtils.getStatus(
-                  TSStatusCode.USER_NOT_EXIST_ERROR, "No such user : " + plan.getUserName()));
+                  TSStatusCode.USER_NOT_EXIST, "No such user : " + plan.getUserName()));
           result.setPermissionInfo(permissionInfo);
           return result;
         }
@@ -282,7 +281,7 @@ public class AuthorInfo implements SnapshotProcessor {
       if (role == null) {
         result.setStatus(
             RpcUtils.getStatus(
-                TSStatusCode.ROLE_NOT_EXIST_ERROR, "No such role : " + plan.getRoleName()));
+                TSStatusCode.ROLE_NOT_EXIST, "No such role : " + plan.getRoleName()));
         result.setPermissionInfo(permissionInfo);
         return result;
       }
@@ -317,7 +316,7 @@ public class AuthorInfo implements SnapshotProcessor {
       if (user == null) {
         result.setStatus(
             RpcUtils.getStatus(
-                TSStatusCode.USER_NOT_EXIST_ERROR, "No such user : " + plan.getUserName()));
+                TSStatusCode.USER_NOT_EXIST, "No such user : " + plan.getUserName()));
         result.setPermissionInfo(permissionInfo);
         return result;
       }
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/cq/CQInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/cq/CQInfo.java
index e90c7167d0..23f7d3eb2b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/cq/CQInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/cq/CQInfo.java
@@ -193,7 +193,7 @@ public class CQInfo implements SnapshotProcessor {
         res.code = TSStatusCode.NO_SUCH_CQ.getStatusCode();
         res.message = String.format("MD5 of CQ %s doesn't match", cqId);
       } else if (cqEntry.lastExecutionTime >= plan.getExecutionTime()) {
-        res.code = TSStatusCode.CQ_UPDATE_LAST_EXEC_TIME_FAILED.getStatusCode();
+        res.code = TSStatusCode.CQ_UPDATE_LAST_EXEC_TIME_ERROR.getStatusCode();
         res.message =
             String.format(
                 "Update last execution time of CQ %s failed because its original last execution time(%d) is larger than the updated one(%d).",
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java
index cb6e0f22ca..c228b4c4aa 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeInfo.java
@@ -326,7 +326,7 @@ public class NodeInfo implements SnapshotProcessor {
       status.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
     } catch (IOException e) {
       LOGGER.error("Update online ConfigNode failed.", e);
-      status.setCode(TSStatusCode.APPLY_CONFIGNODE_FAILED.getStatusCode());
+      status.setCode(TSStatusCode.ADD_CONFIGNODE_ERROR.getStatusCode());
       status.setMessage(
           "Apply new ConfigNode failed because current ConfigNode can't store ConfigNode information.");
     } finally {
@@ -354,7 +354,7 @@ public class NodeInfo implements SnapshotProcessor {
       status.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
     } catch (IOException e) {
       LOGGER.error("Remove online ConfigNode failed.", e);
-      status.setCode(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode());
+      status.setCode(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode());
       status.setMessage(
           "Remove ConfigNode failed because current ConfigNode can't store ConfigNode information.");
     } finally {
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 9d1163a433..1b93dce687 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
@@ -184,7 +184,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
     } catch (MetadataException e) {
       LOGGER.error("Error StorageGroup name", e);
       result.setStatus(
-          new TSStatus(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode())
+          new TSStatus(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
               .setMessage("Error StorageGroup name: " + e.getMessage()));
     } finally {
       storageGroupReadWriteLock.readLock().unlock();
@@ -210,7 +210,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
     } catch (MetadataException e) {
       LOGGER.error("Error StorageGroup name", e);
       result.setStatus(
-          new TSStatus(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode())
+          new TSStatus(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
               .setMessage("Error StorageGroup name: " + e.getMessage()));
     } finally {
       storageGroupReadWriteLock.readLock().unlock();
@@ -233,13 +233,13 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
         }
         result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
       } else {
-        result.setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode());
+        result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
         result.setMessage("StorageGroup does not exist");
       }
     } catch (MetadataException e) {
       LOGGER.error("Error StorageGroup name", e);
       result
-          .setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode())
+          .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
           .setMessage("Error StorageGroupName");
     } finally {
       storageGroupReadWriteLock.writeLock().unlock();
@@ -259,12 +259,12 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
             .setSchemaReplicationFactor(plan.getSchemaReplicationFactor());
         result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
       } else {
-        result.setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode());
+        result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
       }
     } catch (MetadataException e) {
       LOGGER.error("Error StorageGroup name", e);
       result
-          .setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode())
+          .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
           .setMessage("Error StorageGroupName");
     } finally {
       storageGroupReadWriteLock.writeLock().unlock();
@@ -284,12 +284,12 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
             .setDataReplicationFactor(plan.getDataReplicationFactor());
         result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
       } else {
-        result.setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode());
+        result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
       }
     } catch (MetadataException e) {
       LOGGER.error("Error StorageGroup name", e);
       result
-          .setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode())
+          .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
           .setMessage("Error StorageGroupName");
     } finally {
       storageGroupReadWriteLock.writeLock().unlock();
@@ -309,12 +309,12 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
             .setTimePartitionInterval(plan.getTimePartitionInterval());
         result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
       } else {
-        result.setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode());
+        result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
       }
     } catch (MetadataException e) {
       LOGGER.error("Error StorageGroup name", e);
       result
-          .setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode())
+          .setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
           .setMessage("Error StorageGroupName");
     } finally {
       storageGroupReadWriteLock.writeLock().unlock();
@@ -343,7 +343,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
       result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
     } catch (MetadataException e) {
       LOGGER.error("Error StorageGroup name", e);
-      result.setCode(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode());
+      result.setCode(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode());
     } finally {
       storageGroupReadWriteLock.writeLock().unlock();
     }
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/sync/ClusterSyncInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/sync/ClusterSyncInfo.java
index b2805d658b..6ff5fb0ae6 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/sync/ClusterSyncInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/sync/ClusterSyncInfo.java
@@ -82,7 +82,7 @@ public class ClusterSyncInfo implements SnapshotProcessor {
       status.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
     } catch (PipeSinkException e) {
       LOGGER.error("failed to execute CreatePipeSinkPlan {} on ClusterSyncInfo", plan, e);
-      status.setCode(TSStatusCode.PIPESINK_ERROR.getStatusCode());
+      status.setCode(TSStatusCode.CREATE_PIPE_SINK_ERROR.getStatusCode());
       LOGGER.error(e.getMessage());
     }
     return status;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java
index 1f3102a0ce..b0667b09ae 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java
@@ -262,7 +262,7 @@ public class ConfigNodeProcedureEnv {
             getConsensusManager().write(new RemoveConfigNodePlan(tConfigNodeLocation)).getStatus();
       } else {
         tsStatus =
-            new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode())
+            new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())
                 .setMessage(
                     "Remove ConfigNode failed because update ConsensusGroup peer information failed.");
       }
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
index b802fdcc50..17e56d5ea0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
@@ -498,7 +498,7 @@ public class DataNodeRemoveHandler {
               dataNodeLocation);
         }
         if (removedDataNodes.size() == 0) {
-          status.setCode(TSStatusCode.LACK_REPLICATION.getStatusCode());
+          status.setCode(TSStatusCode.NO_ENOUGH_DATANODE.getStatusCode());
           status.setMessage("Failed to remove all requested data nodes");
           return status;
         }
@@ -507,7 +507,7 @@ public class DataNodeRemoveHandler {
 
     int removedDataNodeSize = removeDataNodePlan.getDataNodeLocations().size();
     if (availableDatanodeSize - removedDataNodeSize < NodeInfo.getMinimumDataNode()) {
-      status.setCode(TSStatusCode.LACK_REPLICATION.getStatusCode());
+      status.setCode(TSStatusCode.NO_ENOUGH_DATANODE.getStatusCode());
       status.setMessage(
           String.format(
               "Can't remove datanode due to the limit of replication factor, "
@@ -638,7 +638,7 @@ public class DataNodeRemoveHandler {
     TSStatus status = new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
     if (CONF.getDataRegionConsensusProtocolClass().equals(SIMPLE_CONSENSUS)
         || CONF.getSchemaRegionConsensusProtocolClass().equals(SIMPLE_CONSENSUS)) {
-      status.setCode(TSStatusCode.REMOVE_DATANODE_FAILED.getStatusCode());
+      status.setCode(TSStatusCode.REMOVE_DATANODE_ERROR.getStatusCode());
       status.setMessage("SimpleConsensus protocol is not supported to remove data node");
     }
     return status;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 7c2fc48269..2ca63f47a4 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -476,7 +476,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
   @Override
   public TSStatus deleteConfigNodePeer(TConfigNodeLocation configNodeLocation) {
     if (!configManager.getNodeManager().getRegisteredConfigNodes().contains(configNodeLocation)) {
-      return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode())
+      return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())
           .setMessage(
               "remove ConsensusGroup failed because the ConfigNode not in current Cluster.");
     }
@@ -485,7 +485,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
     ConsensusGenericResponse resp =
         configManager.getConsensusManager().getConsensusImpl().deletePeer(groupId);
     if (!resp.isSuccess()) {
-      return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_FAILED.getStatusCode())
+      return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())
           .setMessage(
               "remove ConsensusGroup failed because internal failure. See other logs for more details");
     }
@@ -576,7 +576,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
         StringBuilder sb = new StringBuilder();
         noExistSg.forEach(storageGroup -> sb.append(storageGroup.getFullPath()).append(","));
         return RpcUtils.getStatus(
-            TSStatusCode.STORAGE_GROUP_NOT_EXIST,
+            TSStatusCode.DATABASE_NOT_EXIST,
             "storageGroup " + sb.subSequence(0, sb.length() - 1) + " does not exist");
       }
     }
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java
index 46bbfdbbb5..55346f6ed1 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/AuthorInfoTest.java
@@ -125,7 +125,7 @@ public class AuthorInfoTest {
         authorInfo
             .checkUserPrivileges("user0", paths, PrivilegeType.DELETE_USER.ordinal())
             .getStatus();
-    Assert.assertEquals(TSStatusCode.NO_PERMISSION_ERROR.getStatusCode(), status.getCode());
+    Assert.assertEquals(TSStatusCode.NO_PERMISSION.getStatusCode(), status.getCode());
 
     // drop user
     authorPlan =
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderConsensus.java b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderConsensus.java
index 7a86bdf540..91d3134b55 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderConsensus.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/MultiLeaderConsensus.java
@@ -159,7 +159,7 @@ public class MultiLeaderConsensus implements IConsensus {
 
     TSStatus status;
     if (impl.isReadOnly()) {
-      status = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM_ERROR.getStatusCode());
+      status = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM.getStatusCode());
       status.setMessage("Fail to do non-query operations because system is read-only.");
     } else if (!impl.isActive()) {
       // TODO: (xingtanzjr) whether we need to define a new status to indicate the inactive status ?
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/client/DispatchLogHandler.java b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/client/DispatchLogHandler.java
index 705aa980e9..0c5ef42e1b 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/client/DispatchLogHandler.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/client/DispatchLogHandler.java
@@ -79,7 +79,7 @@ public class DispatchLogHandler implements AsyncMethodCallback<TSyncLogRes> {
 
   private boolean needRetry(int statusCode) {
     return statusCode == TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode()
-        || statusCode == TSStatusCode.READ_ONLY_SYSTEM_ERROR.getStatusCode()
+        || statusCode == TSStatusCode.READ_ONLY_SYSTEM.getStatusCode()
         || statusCode == TSStatusCode.WRITE_PROCESS_REJECT.getStatusCode();
   }
 
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java
index 5f90cfffb5..fc3bdf123b 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCServiceProcessor.java
@@ -90,7 +90,7 @@ public class MultiLeaderRPCServiceProcessor implements MultiLeaderConsensusIServ
       if (impl.isReadOnly()) {
         String message = "fail to sync log because system is read-only.";
         logger.error(message);
-        TSStatus status = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM_ERROR.getStatusCode());
+        TSStatus status = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM.getStatusCode());
         status.setMessage(message);
         resultHandler.onComplete(new TSyncLogRes(Collections.singletonList(status)));
         return;
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java b/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java
index 1dd3f7dee1..beb5c21dae 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java
@@ -118,7 +118,7 @@ class SimpleConsensus implements IConsensus {
 
     TSStatus status;
     if (impl.isReadOnly()) {
-      status = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM_ERROR.getStatusCode());
+      status = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM.getStatusCode());
       status.setMessage("Fail to do non-query operations because system is read-only.");
     } else {
       status = impl.write(request);
diff --git a/docs/UserGuide/API/Status-Codes.md b/docs/UserGuide/API/Status-Codes.md
index a00c409022..dca83e8474 100644
--- a/docs/UserGuide/API/Status-Codes.md
+++ b/docs/UserGuide/API/Status-Codes.md
@@ -21,7 +21,7 @@
 
 # Status Codes
 
-**Status Code** is introduced in the latest version. A sample solution as IoTDB requires registering the time series first before writing data is:
+A sample solution as IoTDB requires registering the time series first before writing data is:
 
 ```
 try {
@@ -46,64 +46,122 @@ Here is a list of Status Code and related message:
 |:--|:---|:---|
 |200|SUCCESS_STATUS||
 |201|STILL_EXECUTING_STATUS||
-|202|INVALID_HANDLE_STATUS||
 |203|INCOMPATIBLE_VERSION|Incompatible version|
-|298|NODE_DELETE_FAILED_ERROR|Failed while deleting node|
-|299|ALIAS_ALREADY_EXIST_ERROR|Alias already exists|
-|300|PATH_ALREADY_EXIST_ERROR|Path already exists|
-|301|PATH_NOT_EXIST_ERROR|Path does not exist|
-|302|UNSUPPORTED_FETCH_METADATA_OPERATION_ERROR|Unsupported fetch metadata operation|
+|298|NODE_DELETE_ERROR|Failed while deleting node|
+|299|ALIAS_ALREADY_EXIST|Alias already exists|
+|300|PATH_ALREADY_EXIST|Path already exists|
 |303|METADATA_ERROR|Meet error when dealing with metadata|
-|305|OUT_OF_TTL_ERROR|Insertion time is less than TTL time bound|
-|306|CONFIG_ADJUSTER|IoTDB system load is too large|
-|307|MERGE_ERROR|Meet error while merging|
+|304|PATH_NOT_EXIST|Path does not exist|
+|305|OUT_OF_TTL|Insertion time is less than TTL time bound|
+|307|COMPACTION_ERROR|Meet error while merging|
 |308|SYSTEM_CHECK_ERROR|Meet error while system checking|
-|309|SYNC_DEVICE_OWNER_CONFLICT_ERROR|Sync device owners conflict|
-|310|SYNC_CONNECTION_EXCEPTION|Meet error while sync connecting|
-|311|STORAGE_GROUP_PROCESSOR_ERROR|Database processor related error|
-|312|STORAGE_GROUP_ERROR|Database related error|
+|310|SYNC_CONNECTION_ERROR|Meet error while sync connecting|
+|311|DATABASE_PROCESS_ERROR|Database processor related error|
 |313|STORAGE_ENGINE_ERROR|Storage engine related error|
 |314|TSFILE_PROCESSOR_ERROR|TsFile processor related error|
 |315|PATH_ILLEGAL|Illegal path|
 |316|LOAD_FILE_ERROR|Meet error while loading file|
-|317|STORAGE_GROUP_NOT_READY| The database is in recovery mode, not ready fore accepting read/write operation|
+|317|DATABASE_NOT_READY|The database is in recovery mode, not ready fore accepting read/write operation|
+|318|ILLEGAL_PARAMETER|Parameter is illegal|
+|319|ALIGNED_TIMESERIES_ERROR|Meet error in aligned timeseries|
+|320|DUPLICATED_TEMPLATE|Schema template is duplicated|
+|321|UNDEFINED_TEMPLATE|Schema template is not defined|
+|322|DATABASE_NOT_EXIST|Database does not exist|
+|323|CONTINUOUS_QUERY_ERROR|Continuous query error|
+|324|NO_TEMPLATE_ON_MNODE|No schema template on current MNode|
+|325|DIFFERENT_TEMPLATE|Template is not consistent|
+|326|TEMPLATE_IS_IN_USE|Template is in use|
+|327|TEMPLATE_INCOMPATIBLE|Template is not compatible|
+|328|SEGMENT_NOT_FOUND|Segment not found|
+|329|PAGE_OUT_OF_SPACE|No enough space on schema page|
+|330|RECORD_DUPLICATED|Record is duplicated|
+|331|SEGMENT_OUT_OF_SPACE|No enough space on schema segment|
+|332|SCHEMA_FILE_NOT_EXISTS|SchemaFile does not exist|
+|333|WRITE_AHEAD_LOG_ERROR|WAL error|
+|334|CREATE_PIPE_SINK_ERROR|Failed to create a PIPE sink|
+|335|PIPE_ERROR|PIPE error|
+|336|PIPESERVER_ERROR|PIPE server error|
+|337|SERIES_OVERFLOW|Series number exceeds the threshold|
+|340|CREATE_TEMPLATE_ERROR|Create schema template error|
+|341|SYNC_FILE_REDIRECTION_ERROR|Sync TsFile redirection error|
+|342|SYNC_FILE_ERROR|Sync TsFile error|
+|343|VERIFY_METADATA_ERROR|Meet error in validate timeseries schema|
+|344|TIMESERIES_IN_BLACK_LIST|Timeseries is being deleted|
+|349|OVERSIZE_RECORD|Size of record exceeds the threshold of page of SchemaFile|
+|350|SCHEMA_FILE_REDO_LOG_BROKEN|SchemaFile redo log has broken|
+|355|TRIGGER_FIRE_ERROR|Error when firing trigger|
+|360|TRIGGER_LOAD_CLASS_ERROR|Error when load class of trigger|
+|361|TRIGGER_DOWNLOAD_ERROR|Error when download trigger from ConfigNode|
+|362|CREATE_TRIGGER_INSTANCE_ERROR|Error when create trigger instance|
+|363|ACTIVE_TRIGGER_INSTANCE_ERROR|Error when activate trigger instance|
+|364|DROP_TRIGGER_INSTANCE_ERROR|Error when drop trigger instance|
+|365|UPDATE_TRIGGER_LOCATION_ERROR|Error when move stateful trigger to new datanode|
+|370|UDF_LOAD_CLASS_ERROR|Error when loading UDF class|
+|371|UDF_DOWNLOAD_ERROR|DataNode cannot download UDF from ConfigNode|
+|372|CREATE_FUNCTION_ON_DATANODE_ERROR|Error when create UDF on DataNode|
+|373|DROP_FUNCTION_ON_DATANODE_ERROR|Error when drop a UDF on DataNode|
 |400|EXECUTE_STATEMENT_ERROR|Execute statement error|
 |401|SQL_PARSE_ERROR|Meet error while parsing SQL|
 |402|GENERATE_TIME_ZONE_ERROR|Meet error while generating time zone|
 |403|SET_TIME_ZONE_ERROR|Meet error while setting time zone|
-|404|NOT_STORAGE_GROUP_ERROR|Operating object is not a database|
 |405|QUERY_NOT_ALLOWED|Query statements are not allowed error|
-|406|AST_FORMAT_ERROR|AST format related error|
 |407|LOGICAL_OPERATOR_ERROR|Logical operator related error|
 |408|LOGICAL_OPTIMIZE_ERROR|Logical optimize related error|
-|409|UNSUPPORTED_FILL_TYPE_ERROR|Unsupported fill type related error|
-|410|PATH_ERROR|Path related error|
+|409|UNSUPPORTED_FILL_TYPE|Unsupported fill type related error|
 |411|QUERY_PROCESS_ERROR|Query process related error|
 |412|WRITE_PROCESS_ERROR|Writing data related error|
 |413|WRITE_PROCESS_REJECT|Writing data rejected error|
-|414|QUERY_ID_NOT_EXIST|Kill query with non existent queryId|
+|416|SEMANTIC_ERROR|SQL semantic error|
+|417|LOAD_PIECE_OF_TSFILE_ERROR|Error when load a piece of TsFile when loading|
+|423|MEMORY_NOT_ENOUGH|Not enough memory for task execution in MPP|
 |500|INTERNAL_SERVER_ERROR|Internal server error|
 |501|CLOSE_OPERATION_ERROR|Meet error in close operation|
-|502|READ_ONLY_SYSTEM_ERROR|Operating system is read only|
-|503|DISK_SPACE_INSUFFICIENT_ERROR|Disk space is insufficient|
+|502|READ_ONLY_SYSTEM|Operating system is read only|
+|503|DISK_SPACE_INSUFFICIENT|Disk space is insufficient|
 |504|START_UP_ERROR|Meet error while starting up|
 |505|SHUT_DOWN_ERROR|Meet error while shutdown|
 |506|MULTIPLE_ERROR|Meet error when executing multiple statements|
-|507|SESSION_EXPIRED|Session expired|
-|600|WRONG_LOGIN_PASSWORD_ERROR|Username or password is wrong|
-|601|NOT_LOGIN_ERROR|Has not logged in|
-|602|NO_PERMISSION_ERROR|No permissions for this operation, please add privilege|
+|508|TSBLOCK_SERIALIZE_ERROR|TsBlock serialization error|
+|600|WRONG_LOGIN_PASSWORD|Username or password is wrong|
+|601|NOT_LOGIN|Has not logged in|
+|602|NO_PERMISSION|No permissions for this operation, please add privilege|
 |603|UNINITIALIZED_AUTH_ERROR|Uninitialized authorizer|
-|700|PARTITION_NOT_READY|Partition table not ready|
+|605|USER_NOT_EXIST|User does not exist|
+|606|ROLE_NOT_EXIST|Role does not exist|
+|607|AUTHENTICATION_FAILED|Error in authentication|
+|608|CLEAR_PERMISSION_CACHE_ERROR|Error when clear the permission cache|
 |701|TIME_OUT|Operation timeout|
-|702|NO_LEADER|No leader|
 |703|UNSUPPORTED_OPERATION|Unsupported operation|
-|704|NODE_READ_ONLY|Node read only|
-|705|CONSISTENCY_FAILURE|Consistency check failure|
 |706|NO_CONNECTION|Can not get connection error|
 |707|NEED_REDIRECTION|Need direction|
-|800|CONFIG_ERROR|Configuration error|
+|709|ALL_RETRY_ERROR|All retry failed|
+|710|MIGRATE_REGION_ERROR|Error when migrate region|
+|711|CREATE_REGION_ERROR|Create region error|
+|712|DELETE_REGION_ERROR|Delete region error|
+|713|PARTITION_CACHE_UPDATE_ERROR|Update partition cache failed|
+|714|DESERIALIZE_PIECE_OF_TSFILE_ERROR|Error when deserialize a piece of TsFile|
+|715|CONSENSUS_NOT_INITIALIZED|Consensus is not initialized and cannot provide service|
+|800|CONFIGURATION_ERROR|Configuration error|
+|901|DATANODE_ALREADY_REGISTERED|DataNode already registered in cluster|
+|903|DATABASE_ALREADY_EXISTS|Database already exist|
+|904|NO_ENOUGH_DATANODE|The number of DataNode is not enough, cannot remove DataNode or create enough replication|
+|905|ERROR_GLOBAL_CONFIG|Global config in cluster does not consistent|
+|906|ADD_CONFIGNODE_ERROR|Add ConfigNode error|
+|907|REMOVE_CONFIGNODE_ERROR|Remove ConfigNode error|
+|912|DATANODE_NOT_EXIST|DataNode not exist error|
+|917|DATANODE_STOP_ERROR|DataNode stop error|
+|918|REGION_LEADER_CHANGE_ERROR|Region leader migration failed|
+|919|REMOVE_DATANODE_ERROR|Remove datanode failed|
+|920|OVERLAP_WITH_EXISTING_TASK|Current task has some conflict with existing tasks|
+|921|NOT_AVAILABLE_REGION_GROUP|Cannot find an available region group|
+|922|CREATE_TRIGGER_ERROR|ConfigNode create trigger error|
+|923|DROP_TRIGGER_ERROR|ConfigNode delete Trigger error|
+|925|REGISTER_REMOVED_DATANODE|The DataNode to be registered is removed before|
+|930|NO_SUCH_CQ|CQ task does not exist|
+|931|CQ_ALREADY_ACTIVE|CQ is already active|
+|932|CQ_AlREADY_EXIST|CQ is already exist|
+|933|CQ_UPDATE_LAST_EXEC_TIME_ERROR|CQ update last execution time failed|
 
-> All exceptions are refactored in latest version by extracting uniform message into exception classes. Different error codes are added to all exceptions. When an exception is caught and a higher-level exception is thrown, the error code will keep and pass so that users will know the detailed error reason.
+> All exceptions are refactored in the latest version by extracting uniform message into exception classes. Different error codes are added to all exceptions. When an exception is caught and a higher-level exception is thrown, the error code will keep and pass so that users will know the detailed error reason.
 A base exception class "ProcessException" is also added to be extended by all exceptions.
 
diff --git a/docs/zh/UserGuide/API/Status-Codes.md b/docs/zh/UserGuide/API/Status-Codes.md
index 438adf7a95..95f07324dd 100644
--- a/docs/zh/UserGuide/API/Status-Codes.md
+++ b/docs/zh/UserGuide/API/Status-Codes.md
@@ -21,7 +21,7 @@
 
 # 状态码
 
-从 0.10 版本开始 IoTDB 引入了**状态码**这一概念。例如,因为 IoTDB 需要在写入数据之前首先注册时间序列,一种可能的解决方案是:
+IoTDB 引入了**状态码**这一概念。例如,因为 IoTDB 需要在写入数据之前首先注册时间序列,一种可能的解决方案是:
 
 ```
 try {
@@ -38,7 +38,8 @@ try {
 
 ```
 
-利用状态码,我们就可以不必写诸如`if (e.getErrorMessage().contains("exist"))`的代码,只需要使用`e.getStatusType().getCode() == TSStatusCode.TIME_SERIES_NOT_EXIST_ERROR.getStatusCode()`。
+利用状态码,我们就可以不必写诸如`if (e.getErrorMessage().contains("exist"))`的代码,
+只需要使用`e.getStatusType().getCode() == TSStatusCode.TIME_SERIES_NOT_EXIST_ERROR.getStatusCode()`。
 
 这里是状态码和相对应信息的列表:
 
@@ -46,63 +47,123 @@ try {
 |:--|:---|:---|
 |200|SUCCESS_STATUS|成功状态|
 |201|STILL_EXECUTING_STATUS|仍在执行状态|
-|202|INVALID_HANDLE_STATUS|无效句柄状态|
 |203|INCOMPATIBLE_VERSION|版本不兼容|
-|298|NODE_DELETE_FAILED_ERROR|删除节点失败|
-|299|ALIAS_ALREADY_EXIST_ERROR|路径别名已经存在|
-|300|PATH_ALREADY_EXIST_ERROR|路径已经存在|
-|301|PATH_NOT_EXIST_ERROR|路径不存在|
-|302|UNSUPPORTED_FETCH_METADATA_OPERATION_ERROR|不支持的获取元数据操作|
+|298|NODE_DELETE_ERROR|删除节点失败|
+|299|ALIAS_ALREADY_EXIST|路径别名已经存在|
+|300|PATH_ALREADY_EXIST|路径已经存在|
 |303|METADATA_ERROR|处理元数据错误|
-|305|OUT_OF_TTL_ERROR|插入时间少于 TTL 时间边界|
-|306|CONFIG_ADJUSTER|IoTDB 系统负载过大|
-|307|MERGE_ERROR|合并错误|
+|304|PATH_NOT_EXIST|路径不存在|
+|305|OUT_OF_TTL|插入时间少于 TTL 时间边界|
+|307|COMPACTION_ERROR|合并错误|
 |308|SYSTEM_CHECK_ERROR|系统检查错误|
-|309|SYNC_DEVICE_OWNER_CONFLICT_ERROR|回传设备冲突错误|
-|310|SYNC_CONNECTION_EXCEPTION|回传连接错误|
-|311|STORAGE_GROUP_PROCESSOR_ERROR|存储组处理器相关错误|
-|312|STORAGE_GROUP_ERROR|存储组相关错误|
+|310|SYNC_CONNECTION_ERROR|回传连接错误|
+|311|DATABASE_PROCESS_ERROR|存储组处理器相关错误|
 |313|STORAGE_ENGINE_ERROR|存储引擎相关错误|
 |314|TSFILE_PROCESSOR_ERROR|TsFile 处理器相关错误|
 |315|PATH_ILLEGAL|路径不合法|
 |316|LOAD_FILE_ERROR|加载文件错误|
-|317|STORAGE_GROUP_NOT_READY| 存储组还在恢复中,还不能接受读写操作 |
+|317|DATABASE_NOT_READY|Database 还在恢复中,还不能接受读写操作|
+|318|ILLEGAL_PARAMETER|参数错误|
+|319|ALIGNED_TIMESERIES_ERROR|对齐时间序列错误|
+|320|DUPLICATED_TEMPLATE|元数据模板重复|
+|321|UNDEFINED_TEMPLATE|元数据模板未定义|
+|322|DATABASE_NOT_EXIST|数据库不存在|
+|323|CONTINUOUS_QUERY_ERROR|连续查询功能错误|
+|324|NO_TEMPLATE_ON_MNODE|当前元数据节点不存在元数据模板|
+|325|DIFFERENT_TEMPLATE|元数据模板不一致|
+|326|TEMPLATE_IS_IN_USE|元数据模板正在使用|
+|327|TEMPLATE_INCOMPATIBLE|元数据模板不兼容|
+|328|SEGMENT_NOT_FOUND|未找到 Segment|
+|329|PAGE_OUT_OF_SPACE|SchemaFile 中 Page 空间不够|
+|330|RECORD_DUPLICATED|记录重复|
+|331|SEGMENT_OUT_OF_SPACE|SchemaFile 中 segment 空间不够|
+|332|SCHEMA_FILE_NOT_EXISTS|SchemaFile 不存在|
+|333|WRITE_AHEAD_LOG_ERROR|WAL 异常|
+|334|CREATE_PIPE_SINK_ERROR|创建 PIPE Sink 失败|
+|335|PIPE_ERROR|PIPE 异常|
+|336|PIPESERVER_ERROR|PIPE server 异常|
+|337|SERIES_OVERFLOW|序列数量超过阈值|
+|338|MEASUREMENT_ALREADY_EXIST|序列数量超过阈值|
+|340|CREATE_TEMPLATE_ERROR|创建物理量模板失败|
+|341|SYNC_FILE_REDIRECTION_ERROR|同步文件时重定向异常|
+|342|SYNC_FILE_ERROR|同步文件异常|
+|343|VERIFY_METADATA_ERROR|校验元数据失败|
+|344|TIMESERIES_IN_BLACK_LIST|时间序列正在删除|
+|349|OVERSIZE_RECORD|记录大小超过元数据文件页面大小|
+|350|SCHEMA_FILE_REDO_LOG_BROKEN|SchemaFile 的 redo 日志损坏|
+|355|TRIGGER_FIRE_ERROR|触发器执行错误|
+|360|TRIGGER_LOAD_CLASS_ERROR|触发器加载类异常|
+|361|TRIGGER_DOWNLOAD_ERROR|从 ConfigNode 下载触发器异常|
+|362|CREATE_TRIGGER_INSTANCE_ERROR|创建触发器实例异常|
+|363|ACTIVE_TRIGGER_INSTANCE_ERROR|激活触发器实例异常|
+|364|DROP_TRIGGER_INSTANCE_ERROR|删除触发器实例异常|
+|365|UPDATE_TRIGGER_LOCATION_ERROR|更新有状态的触发器所在 DataNode 异常|
+|370|UDF_LOAD_CLASS_ERROR|UDF 加载类异常|
+|371|UDF_DOWNLOAD_ERROR|无法从 ConfigNode 下载 UDF|
+|372|CREATE_FUNCTION_ON_DATANODE_ERROR|在 DataNode 创建 UDF 失败|
+|373|DROP_FUNCTION_ON_DATANODE_ERROR|在 DataNode 卸载 UDF 失败|
 |400|EXECUTE_STATEMENT_ERROR|执行语句错误|
 |401|SQL_PARSE_ERROR|SQL 语句分析错误|
 |402|GENERATE_TIME_ZONE_ERROR|生成时区错误|
 |403|SET_TIME_ZONE_ERROR|设置时区错误|
-|404|NOT_STORAGE_GROUP_ERROR|操作对象不是存储组|
 |405|QUERY_NOT_ALLOWED|查询语句不允许|
-|406|AST_FORMAT_ERROR|AST 格式相关错误|
 |407|LOGICAL_OPERATOR_ERROR|逻辑符相关错误|
 |408|LOGICAL_OPTIMIZE_ERROR|逻辑优化相关错误|
-|409|UNSUPPORTED_FILL_TYPE_ERROR|不支持的填充类型|
-|410|PATH_ERROR|路径相关错误|
+|409|UNSUPPORTED_FILL_TYPE|不支持的填充类型|
 |411|QUERY_PROCESS_ERROR|查询处理相关错误|
 |412|WRITE_PROCESS_ERROR|写入相关错误|
 |413|WRITE_PROCESS_REJECT|写入拒绝错误|
-|414|QUERY_ID_NOT_EXIST|Query id 不存在|
+|416|SEMANTIC_ERROR|SQL 语义错误|
+|417|LOAD_PIECE_OF_TSFILE_ERROR|加载 TsFile 片段异常|
+|423|MEMORY_NOT_ENOUGH|MPP 框架中任务执行内存不足|
 |500|INTERNAL_SERVER_ERROR|服务器内部错误|
 |501|CLOSE_OPERATION_ERROR|关闭操作错误|
-|502|READ_ONLY_SYSTEM_ERROR|系统只读|
-|503|DISK_SPACE_INSUFFICIENT_ERROR|磁盘空间不足|
+|502|READ_ONLY_SYSTEM|系统只读|
+|503|DISK_SPACE_INSUFFICIENT|磁盘空间不足|
 |504|START_UP_ERROR|启动错误|
 |505|SHUT_DOWN_ERROR|关机错误|
 |506|MULTIPLE_ERROR|多行语句执行错误|
-|507|SESSION_EXPIRED|会话过期|
-|600|WRONG_LOGIN_PASSWORD_ERROR|用户名或密码错误|
-|601|NOT_LOGIN_ERROR|没有登录|
-|602|NO_PERMISSION_ERROR|没有操作权限|
+|508|TSBLOCK_SERIALIZE_ERROR|TsBlock 序列化错误|
+|600|WRONG_LOGIN_PASSWORD|用户名或密码错误|
+|601|NOT_LOGIN|没有登录|
+|602|NO_PERMISSION|没有操作权限|
 |603|UNINITIALIZED_AUTH_ERROR|授权人未初始化|
-|700|PARTITION_NOT_READY|分区表未准备好|
+|604|EXECUTE_PERMISSION_EXCEPTION_ERROR||
+|605|USER_NOT_EXIST|用户不存在|
+|606|ROLE_NOT_EXIST|角色不存在|
+|607|AUTHENTICATION_FAILED|权限认证失败|
+|608|CLEAR_PERMISSION_CACHE_ERROR|清空权限缓存失败|
 |701|TIME_OUT|操作超时|
-|702|NO_LEADER|Leader 找不到|
 |703|UNSUPPORTED_OPERATION|不支持的操作|
-|704|NODE_READ_ONLY|节点只读|
-|705|CONSISTENCY_FAILURE|一致性检查失败|
 |706|NO_CONNECTION|连接获取失败|
 |707|NEED_REDIRECTION|需要重定向|
-|800|CONFIG_ERROR|配置文件有错误项|
+|709|ALL_RETRY_ERROR|所有重试失败|
+|710|MIGRATE_REGION_ERROR|Region 迁移失败|
+|711|CREATE_REGION_ERROR|创建 region 失败|
+|712|DELETE_REGION_ERROR|删除 region 失败|
+|713|PARTITION_CACHE_UPDATE_ERROR|更新分区缓存失败|
+|714|DESERIALIZE_PIECE_OF_TSFILE_ERROR|反序列化 TsFile 片段异常|
+|715|CONSENSUS_NOT_INITIALIZED|共识层未初始化,不能提供服务|
+|800|CONFIGURATION_ERROR|配置文件有错误项|
+|901|DATANODE_ALREADY_REGISTERED|DataNode 在集群中已经注册|
+|903|DATABASE_ALREADY_EXISTS|Database 已存在|
+|904|NO_ENOUGH_DATANODE|DataNode 数量不足,无法移除节点或创建副本|
+|905|ERROR_GLOBAL_CONFIG|全局配置参数异常|
+|906|ADD_CONFIGNODE_ERROR|新增 ConfigNode 失败|
+|907|REMOVE_CONFIGNODE_ERROR|移除 ConfigNode 失败|
+|912|DATANODE_NOT_EXIST|此 DataNode 不存在|
+|917|DATANODE_STOP_ERROR|DataNode 关闭失败|
+|918|REGION_LEADER_CHANGE_ERROR|Region leader 迁移失败|
+|919|REMOVE_DATANODE_ERROR|移除 datanode 失败|
+|920|OVERLAP_WITH_EXISTING_TASK|与正在执行的其他操作冲突|
+|921|NOT_AVAILABLE_REGION_GROUP|无法找到可用的 Region 副本组|
+|922|CREATE_TRIGGER_ERROR|ConfigNode 创建 Trigger 失败|
+|923|DROP_TRIGGER_ERROR|ConfigNode 删除 Trigger 失败|
+|925|REGISTER_REMOVED_DATANODE|注册的 DataNode 已经被移除|
+|930|NO_SUCH_CQ|CQ 任务不存在|
+|931|CQ_ALREADY_ACTIVE|CQ 任务已激活|
+|932|CQ_AlREADY_EXIST|CQ 任务已存在|
+|933|CQ_UPDATE_LAST_EXEC_TIME_ERROR|CQ 更新上一次执行时间失败|
 
 > 在最新版本中,我们重构了 IoTDB 的异常类。通过将错误信息统一提取到异常类中,并为所有异常添加不同的错误代码,从而当捕获到异常并引发更高级别的异常时,错误代码将保留并传递,以便用户了解详细的错误原因。
 除此之外,我们添加了一个基础异常类“ProcessException”,由所有异常扩展。
diff --git a/example/flink/src/main/java/org/apache/iotdb/flink/FlinkIoTDBSource.java b/example/flink/src/main/java/org/apache/iotdb/flink/FlinkIoTDBSource.java
index 86bfab113b..9856b41c3b 100644
--- a/example/flink/src/main/java/org/apache/iotdb/flink/FlinkIoTDBSource.java
+++ b/example/flink/src/main/java/org/apache/iotdb/flink/FlinkIoTDBSource.java
@@ -86,7 +86,7 @@ public class FlinkIoTDBSource {
         }
       }
     } catch (StatementExecutionException e) {
-      if (e.getStatusCode() != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
+      if (e.getStatusCode() != TSStatusCode.PATH_ALREADY_EXIST.getStatusCode()) {
         throw e;
       }
     }
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index 44af37064b..67c2c788bd 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -76,7 +76,7 @@ public class SessionExample {
     try {
       session.createDatabase("root.sg1");
     } catch (StatementExecutionException e) {
-      if (e.getStatusCode() != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
+      if (e.getStatusCode() != TSStatusCode.PATH_ALREADY_EXIST.getStatusCode()) {
         throw e;
       }
     }
diff --git a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
index c272ee4410..a296f98e01 100644
--- a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
@@ -86,7 +86,7 @@ public class SyntaxConventionRelatedExample {
     try {
       session.setStorageGroup("root.sg1");
     } catch (StatementExecutionException e) {
-      if (e.getStatusCode() != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
+      if (e.getStatusCode() != TSStatusCode.PATH_ALREADY_EXIST.getStatusCode()) {
         throw e;
       }
     }
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterAuthorityIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterAuthorityIT.java
index 6c7e982e7b..db23693692 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterAuthorityIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterAuthorityIT.java
@@ -153,7 +153,7 @@ public class IoTDBClusterAuthorityIT {
       checkUserPrivilegesReq =
           new TCheckUserPrivilegesReq("tempuser0", paths, PrivilegeType.DELETE_USER.ordinal());
       status = client.checkUserPrivileges(checkUserPrivilegesReq).getStatus();
-      assertEquals(TSStatusCode.NO_PERMISSION_ERROR.getStatusCode(), status.getCode());
+      assertEquals(TSStatusCode.NO_PERMISSION.getStatusCode(), status.getCode());
 
       // drop user
       authorizerReq =
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBStorageGroupIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBStorageGroupIT.java
index 6867a42d44..0010a56420 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBStorageGroupIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBStorageGroupIT.java
@@ -126,8 +126,7 @@ public class IoTDBStorageGroupIT {
 
       // test fail by re-register
       status = client.setStorageGroup(setReq0);
-      Assert.assertEquals(
-          TSStatusCode.STORAGE_GROUP_ALREADY_EXISTS.getStatusCode(), status.getCode());
+      Assert.assertEquals(TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode(), status.getCode());
 
       // test StorageGroup setter interfaces
       PartialPath patternPath = new PartialPath(sg1);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
index 855c119fab..1d909b158b 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
@@ -61,12 +61,12 @@ public class IoTDBTtlIT {
       try {
         statement.execute("SET TTL TO root.TTL_SG1 1000");
       } catch (SQLException e) {
-        assertEquals(TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode(), e.getErrorCode());
+        assertEquals(TSStatusCode.PATH_NOT_EXIST.getStatusCode(), e.getErrorCode());
       }
       try {
         statement.execute("UNSET TTL TO root.TTL_SG1");
       } catch (SQLException e) {
-        assertEquals(TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode(), e.getErrorCode());
+        assertEquals(TSStatusCode.PATH_NOT_EXIST.getStatusCode(), e.getErrorCode());
       }
 
       statement.execute("CREATE DATABASE root.TTL_SG1");
@@ -74,7 +74,7 @@ public class IoTDBTtlIT {
       try {
         statement.execute("SET TTL TO root.TTL_SG1.s1 1000");
       } catch (SQLException e) {
-        assertEquals(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode(), e.getErrorCode());
+        assertEquals(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(), e.getErrorCode());
       }
 
       statement.execute("CREATE DATABASE root.TTL_SG2");
@@ -82,24 +82,24 @@ public class IoTDBTtlIT {
       try {
         statement.execute("SET TTL TO root.TTL_SG2.s1 1000");
       } catch (SQLException e) {
-        assertEquals(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode(), e.getErrorCode());
+        assertEquals(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(), e.getErrorCode());
       }
 
       try {
         statement.execute("SET TTL TO root.** 1000");
       } catch (SQLException e) {
-        assertEquals(TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode(), e.getErrorCode());
+        assertEquals(TSStatusCode.PATH_NOT_EXIST.getStatusCode(), e.getErrorCode());
       }
       try {
         statement.execute("UNSET TTL TO root.**");
       } catch (SQLException e) {
-        assertEquals(TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode(), e.getErrorCode());
+        assertEquals(TSStatusCode.PATH_NOT_EXIST.getStatusCode(), e.getErrorCode());
       }
 
       try {
         statement.execute("SET TTL TO root.**.s1 1000");
       } catch (SQLException e) {
-        assertEquals(TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode(), e.getErrorCode());
+        assertEquals(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(), e.getErrorCode());
       }
 
       long now = System.currentTimeMillis();
@@ -137,7 +137,7 @@ public class IoTDBTtlIT {
               String.format(
                   "INSERT INTO root.TTL_SG1(timestamp, s1) VALUES (%d, %d)", now - 500000 + i, i));
         } catch (SQLException e) {
-          if (TSStatusCode.OUT_OF_TTL_ERROR.getStatusCode() == e.getErrorCode()) {
+          if (TSStatusCode.OUT_OF_TTL.getStatusCode() == e.getErrorCode()) {
             caught = true;
           }
         }
@@ -223,7 +223,7 @@ public class IoTDBTtlIT {
                   "INSERT INTO root.sg.TTL_SG3(timestamp, s1) VALUES (%d, %d)",
                   now - 500000 + i, i));
         } catch (SQLException e) {
-          if (TSStatusCode.OUT_OF_TTL_ERROR.getStatusCode() == e.getErrorCode()) {
+          if (TSStatusCode.OUT_OF_TTL.getStatusCode() == e.getErrorCode()) {
             caught = true;
           }
         }
@@ -237,7 +237,7 @@ public class IoTDBTtlIT {
                   "INSERT INTO root.sg.TTL_SG4(timestamp, s1) VALUES (%d, %d)",
                   now - 500000 + i, i));
         } catch (SQLException e) {
-          if (TSStatusCode.OUT_OF_TTL_ERROR.getStatusCode() == e.getErrorCode()) {
+          if (TSStatusCode.OUT_OF_TTL.getStatusCode() == e.getErrorCode()) {
             caught = true;
           }
         }
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/exception/ConfigurationException.java b/node-commons/src/main/java/org/apache/iotdb/commons/exception/ConfigurationException.java
index 7f5a6546d4..a71e42cd86 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/exception/ConfigurationException.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/exception/ConfigurationException.java
@@ -34,7 +34,7 @@ public class ConfigurationException extends IoTDBException {
     super(
         String.format(
             "Parameter %s can not be %s, please set to: %s", parameter, badValue, correctValue),
-        TSStatusCode.CONFIG_ERROR.getStatusCode());
+        TSStatusCode.CONFIGURATION_ERROR.getStatusCode());
     this.parameter = parameter;
     this.correctValue = correctValue;
   }
@@ -46,11 +46,11 @@ public class ConfigurationException extends IoTDBException {
   public ConfigurationException(String parameter, String badValue) {
     super(
         String.format("Parameter %s can not be %s", parameter, badValue),
-        TSStatusCode.CONFIG_ERROR.getStatusCode());
+        TSStatusCode.CONFIGURATION_ERROR.getStatusCode());
   }
 
   public ConfigurationException(String errorStr) {
-    super(errorStr, TSStatusCode.CONFIG_ERROR.getStatusCode());
+    super(errorStr, TSStatusCode.CONFIGURATION_ERROR.getStatusCode());
   }
 
   public String getParameter() {
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/exception/sync/PipeSinkException.java b/node-commons/src/main/java/org/apache/iotdb/commons/exception/sync/PipeSinkException.java
index acaafb476c..f2711b0f79 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/exception/sync/PipeSinkException.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/exception/sync/PipeSinkException.java
@@ -31,12 +31,12 @@ public class PipeSinkException extends IoTDBException {
   }
 
   public PipeSinkException(String message) {
-    super(message, TSStatusCode.PIPESINK_ERROR.getStatusCode());
+    super(message, TSStatusCode.CREATE_PIPE_SINK_ERROR.getStatusCode());
   }
 
   public PipeSinkException(String attr, String value, String attrType) {
     super(
         String.format("%s=%s has wrong format, require for %s.", attr, value, attrType),
-        TSStatusCode.PIPESINK_ERROR.getStatusCode());
+        TSStatusCode.CREATE_PIPE_SINK_ERROR.getStatusCode());
   }
 }
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
index 949c9f310d..b8a1004d9b 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
@@ -69,8 +69,7 @@ public class SchemaPartition extends Partition {
     TSeriesPartitionSlot seriesPartitionSlot = calculateDeviceGroupId(deviceName);
     if (schemaPartitionMap.get(storageGroup) == null) {
       throw new RuntimeException(
-          new IoTDBException(
-              "Path does not exist. ", TSStatusCode.PATH_NOT_EXIST_ERROR.getStatusCode()));
+          new IoTDBException("Path does not exist. ", TSStatusCode.PATH_NOT_EXIST.getStatusCode()));
     }
     return schemaPartitionMap.get(storageGroup).get(seriesPartitionSlot);
   }
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/utils/StatusUtils.java b/node-commons/src/main/java/org/apache/iotdb/commons/utils/StatusUtils.java
index dc2d0ae966..54d66c0ea9 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/utils/StatusUtils.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/utils/StatusUtils.java
@@ -29,24 +29,10 @@ import java.util.Map;
 public class StatusUtils {
   private StatusUtils() {}
 
-  public static final TSStatus PARTITION_TABLE_NOT_READY =
-      getStatus(TSStatusCode.PARTITION_NOT_READY);
   public static final TSStatus OK = getStatus(TSStatusCode.SUCCESS_STATUS);
-  public static final TSStatus TIME_OUT = getStatus(TSStatusCode.TIME_OUT);
-  public static final TSStatus NO_LEADER = getStatus(TSStatusCode.NO_LEADER);
   public static final TSStatus INTERNAL_ERROR = getStatus(TSStatusCode.INTERNAL_SERVER_ERROR);
-  public static final TSStatus UNSUPPORTED_OPERATION =
-      getStatus(TSStatusCode.UNSUPPORTED_OPERATION);
   public static final TSStatus EXECUTE_STATEMENT_ERROR =
       getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR);
-  public static final TSStatus NO_STORAGE_GROUP = getStatus(TSStatusCode.STORAGE_GROUP_ERROR);
-  public static final TSStatus NODE_READ_ONLY = getStatus(TSStatusCode.NODE_READ_ONLY);
-  public static final TSStatus CONSISTENCY_FAILURE = getStatus(TSStatusCode.CONSISTENCY_FAILURE);
-  public static final TSStatus TIMESERIES_NOT_EXIST_ERROR =
-      getStatus(TSStatusCode.TIMESERIES_NOT_EXIST);
-  public static final TSStatus NO_CONNECTION = getStatus(TSStatusCode.NO_CONNECTION);
-  public static final TSStatus PARSE_LOG_ERROR = getStatus(TSStatusCode.PARSE_LOG_ERROR);
-  public static final TSStatus DUPLICATED_TEMPLATE = getStatus(TSStatusCode.DUPLICATED_TEMPLATE);
 
   /**
    * @param statusMap index -> status
@@ -69,151 +55,119 @@ public class StatusUtils {
     status.setCode(statusCode.getStatusCode());
     switch (statusCode) {
       case SUCCESS_STATUS:
-        status.setMessage("Executed successfully. ");
+        status.setMessage("Executed successfully.");
         break;
       case TIME_OUT:
-        status.setMessage("Request timed out. ");
-        break;
-      case NO_LEADER:
-        status.setMessage("Leader cannot be found. ");
-        break;
-      case PARTITION_NOT_READY:
-        status.setMessage("Partition table is not ready. ");
-        break;
-      case NODE_READ_ONLY:
-        status.setMessage(
-            "Current node is read-only, please retry to find another available node. ");
+        status.setMessage("Request timed out.");
         break;
       case INCOMPATIBLE_VERSION:
-        status.setMessage("Incompatible version. ");
+        status.setMessage("Incompatible version.");
         break;
-      case NODE_DELETE_FAILED_ERROR:
-        status.setMessage("Failed while deleting node. ");
+      case NODE_DELETE_ERROR:
+        status.setMessage("Failed while deleting node.");
         break;
-      case ALIAS_ALREADY_EXIST_ERROR:
-        status.setMessage("Alias already exists. ");
+      case ALIAS_ALREADY_EXIST:
+        status.setMessage("Alias already exists.");
         break;
-      case PATH_ALREADY_EXIST_ERROR:
-        status.setMessage("Path already exist. ");
+      case PATH_ALREADY_EXIST:
+        status.setMessage("Path already exist.");
         break;
-      case PATH_NOT_EXIST_ERROR:
-      case TIMESERIES_NOT_EXIST:
-        status.setMessage("Path does not exist. ");
-        break;
-      case UNSUPPORTED_FETCH_METADATA_OPERATION_ERROR:
-        status.setMessage("Unsupported fetch metadata operation. ");
+      case PATH_NOT_EXIST:
+        status.setMessage("Path does not exist.");
         break;
       case METADATA_ERROR:
-        status.setMessage("Meet error when dealing with metadata. ");
-        break;
-      case OUT_OF_TTL_ERROR:
-        status.setMessage("Insertion time is less than TTL time bound. ");
+        status.setMessage("Meet error when dealing with metadata.");
         break;
-      case CONFIG_ADJUSTER:
-        status.setMessage("IoTDB system load is too large. ");
+      case OUT_OF_TTL:
+        status.setMessage("Insertion time is less than TTL time bound.");
         break;
-      case MERGE_ERROR:
-        status.setMessage("Meet error while merging. ");
+      case COMPACTION_ERROR:
+        status.setMessage("Meet error while merging.");
         break;
       case SYSTEM_CHECK_ERROR:
-        status.setMessage("Meet error while system checking. ");
+        status.setMessage("Meet error while system checking.");
         break;
-      case SYNC_CONNECTION_EXCEPTION:
-        status.setMessage("Meet error while sync connecting. ");
+      case SYNC_CONNECTION_ERROR:
+        status.setMessage("Meet error while sync connecting.");
         break;
-      case DATA_REGION_ERROR:
-        status.setMessage("Database processor related error. ");
-        break;
-      case STORAGE_GROUP_ERROR:
-        status.setMessage("No associated database. ");
+      case DATABASE_PROCESS_ERROR:
+        status.setMessage("Database processor related error.");
         break;
       case STORAGE_ENGINE_ERROR:
-        status.setMessage("Storage engine related error. ");
+        status.setMessage("Storage engine related error.");
         break;
       case TSFILE_PROCESSOR_ERROR:
-        status.setMessage("TsFile processor related error. ");
+        status.setMessage("TsFile processor related error.");
         break;
       case PATH_ILLEGAL:
-        status.setMessage("Illegal path. ");
+        status.setMessage("Illegal path.");
         break;
       case LOAD_FILE_ERROR:
-        status.setMessage("Meet error while loading file. ");
+        status.setMessage("Meet error while loading file.");
         break;
       case EXECUTE_STATEMENT_ERROR:
-        status.setMessage("Execute statement error. ");
+        status.setMessage("Execute statement error.");
         break;
       case SQL_PARSE_ERROR:
-        status.setMessage("Meet error while parsing SQL. ");
+        status.setMessage("Meet error while parsing SQL.");
         break;
       case GENERATE_TIME_ZONE_ERROR:
-        status.setMessage("Meet error while generating time zone. ");
+        status.setMessage("Meet error while generating time zone.");
         break;
       case SET_TIME_ZONE_ERROR:
-        status.setMessage("Meet error while setting time zone. ");
-        break;
-      case NOT_STORAGE_GROUP_ERROR:
-        status.setMessage("Operating object is not a database. ");
+        status.setMessage("Meet error while setting time zone.");
         break;
       case QUERY_NOT_ALLOWED:
-        status.setMessage("Query statements are not allowed error. ");
-        break;
-      case AST_FORMAT_ERROR:
-        status.setMessage("AST format related error. ");
+        status.setMessage("Query statements are not allowed error.");
         break;
       case LOGICAL_OPERATOR_ERROR:
-        status.setMessage("Logical operator related error. ");
+        status.setMessage("Logical operator related error.");
         break;
       case LOGICAL_OPTIMIZE_ERROR:
-        status.setMessage("Logical optimize related error. ");
+        status.setMessage("Logical optimize related error.");
         break;
-      case UNSUPPORTED_FILL_TYPE_ERROR:
-        status.setMessage("Unsupported fill type related error. ");
-        break;
-      case PATH_ERROR:
-        status.setMessage("Path related error. ");
+      case UNSUPPORTED_FILL_TYPE:
+        status.setMessage("Unsupported fill type related error.");
         break;
       case QUERY_PROCESS_ERROR:
-        status.setMessage("Query process related error. ");
+        status.setMessage("Query process related error.");
         break;
       case WRITE_PROCESS_ERROR:
-        status.setMessage("Writing data related error. ");
+        status.setMessage("Writing data related error.");
         break;
       case INTERNAL_SERVER_ERROR:
-        status.setMessage("Internal server error. ");
+        status.setMessage("Internal server error.");
         break;
       case CLOSE_OPERATION_ERROR:
-        status.setMessage("Meet error in close operation. ");
+        status.setMessage("Meet error in close operation.");
         break;
-      case READ_ONLY_SYSTEM_ERROR:
-        status.setMessage("Database is read-only. ");
+      case READ_ONLY_SYSTEM:
+        status.setMessage("Database is read-only.");
         break;
-      case DISK_SPACE_INSUFFICIENT_ERROR:
-        status.setMessage("Disk space is insufficient. ");
+      case DISK_SPACE_INSUFFICIENT:
+        status.setMessage("Disk space is insufficient.");
         break;
       case START_UP_ERROR:
-        status.setMessage("Meet error while starting up. ");
+        status.setMessage("Meet error while starting up.");
         break;
-      case WRONG_LOGIN_PASSWORD_ERROR:
-        status.setMessage("Username or password is wrong. ");
+      case WRONG_LOGIN_PASSWORD:
+        status.setMessage("Username or password is wrong.");
         break;
-      case NOT_LOGIN_ERROR:
-        status.setMessage("Has not logged in. ");
+      case NOT_LOGIN:
+        status.setMessage("Has not logged in.");
         break;
-      case NO_PERMISSION_ERROR:
-        status.setMessage("No permissions for this operation, please add privilege. ");
+      case NO_PERMISSION:
+        status.setMessage("No permissions for this operation, please add privilege.");
         break;
       case UNINITIALIZED_AUTH_ERROR:
-        status.setMessage("Uninitialized authorizer. ");
+        status.setMessage("Uninitialized authorizer.");
         break;
       case UNSUPPORTED_OPERATION:
-        status.setMessage("Unsupported operation. ");
+        status.setMessage("Unsupported operation.");
         break;
       case NO_CONNECTION:
         status.setMessage("Node cannot be reached.");
         break;
-      case PARSE_LOG_ERROR:
-        status.setMessage("Parse log error.");
-        break;
       default:
         status.setMessage("");
         break;
diff --git a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index a051d44e08..c5a57f3014 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -148,7 +148,7 @@ public class AuthorityChecker {
     try {
       if (!checkAuthorization(statement, session.getUsername())) {
         return RpcUtils.getStatus(
-            TSStatusCode.NO_PERMISSION_ERROR,
+            TSStatusCode.NO_PERMISSION,
             "No permissions for this operation, please add privilege "
                 + PrivilegeType.values()[
                     AuthorityChecker.translateToPermissionId(statement.getType())]);
diff --git a/server/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java b/server/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java
index 17c11b50cc..caa0d582db 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/ClusterAuthorityFetcher.java
@@ -79,7 +79,7 @@ public class ClusterAuthorityFetcher implements IAuthorityFetcher {
         try {
           if (!user.checkPrivilege(path, permission)) {
             if (user.getRoleList().isEmpty()) {
-              return RpcUtils.getStatus(TSStatusCode.NO_PERMISSION_ERROR);
+              return RpcUtils.getStatus(TSStatusCode.NO_PERMISSION);
             }
             boolean status = false;
             for (String roleName : user.getRoleList()) {
@@ -97,7 +97,7 @@ public class ClusterAuthorityFetcher implements IAuthorityFetcher {
               }
             }
             if (!status) {
-              return RpcUtils.getStatus(TSStatusCode.NO_PERMISSION_ERROR);
+              return RpcUtils.getStatus(TSStatusCode.NO_PERMISSION);
             }
           }
         } catch (AuthException e) {
@@ -192,8 +192,7 @@ public class ClusterAuthorityFetcher implements IAuthorityFetcher {
       if (password != null && AuthUtils.validatePassword(password, user.getPassword())) {
         return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
       } else {
-        return RpcUtils.getStatus(
-            TSStatusCode.WRONG_LOGIN_PASSWORD_ERROR, "Authentication failed.");
+        return RpcUtils.getStatus(TSStatusCode.WRONG_LOGIN_PASSWORD, "Authentication failed.");
       }
     } else {
       TLoginReq req = new TLoginReq(username, password);
diff --git a/server/src/main/java/org/apache/iotdb/db/auth/StandaloneAuthorityFetcher.java b/server/src/main/java/org/apache/iotdb/db/auth/StandaloneAuthorityFetcher.java
index d6f82c86bc..735fd42c35 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/StandaloneAuthorityFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/StandaloneAuthorityFetcher.java
@@ -47,11 +47,10 @@ public class StandaloneAuthorityFetcher implements IAuthorityFetcher {
       if (localConfigNode.login(username, password)) {
         return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
       } else {
-        return RpcUtils.getStatus(
-            TSStatusCode.WRONG_LOGIN_PASSWORD_ERROR, "Authentication failed.");
+        return RpcUtils.getStatus(TSStatusCode.WRONG_LOGIN_PASSWORD, "Authentication failed.");
       }
     } catch (AuthException e) {
-      return RpcUtils.getStatus(TSStatusCode.AUTHENTICATION_ERROR, e.getMessage());
+      return RpcUtils.getStatus(TSStatusCode.AUTHENTICATION_FAILED, e.getMessage());
     }
   }
 
@@ -72,7 +71,7 @@ public class StandaloneAuthorityFetcher implements IAuthorityFetcher {
     if (checkStatus) {
       return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
     } else {
-      return RpcUtils.getStatus(TSStatusCode.NO_PERMISSION_ERROR, checkMessage);
+      return RpcUtils.getStatus(TSStatusCode.NO_PERMISSION, checkMessage);
     }
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java
index 94ae35c0cd..edc2483679 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java
@@ -715,7 +715,7 @@ public class StorageEngineV2 implements IService {
               "Parse Page error when writing piece node of TsFile %s to DataRegion %s.",
               pieceNode.getTsFile(), dataRegionId),
           e);
-      status.setCode(TSStatusCode.TSFILE_RUNTIME_ERROR.getStatusCode());
+      status.setCode(TSStatusCode.LOAD_PIECE_OF_TSFILE_ERROR.getStatusCode());
       status.setMessage(e.getMessage());
       return status;
     } catch (IOException e) {
@@ -724,7 +724,7 @@ public class StorageEngineV2 implements IService {
               "IO error when writing piece node of TsFile %s to DataRegion %s.",
               pieceNode.getTsFile(), dataRegionId),
           e);
-      status.setCode(TSStatusCode.DATA_REGION_ERROR.getStatusCode());
+      status.setCode(TSStatusCode.DATABASE_PROCESS_ERROR.getStatusCode());
       status.setMessage(e.getMessage());
       return status;
     }
@@ -765,7 +765,7 @@ public class StorageEngineV2 implements IService {
       }
     } catch (IOException e) {
       logger.error(String.format("Execute load command %s error.", loadCommand), e);
-      status.setCode(TSStatusCode.DATA_REGION_ERROR.getStatusCode());
+      status.setCode(TSStatusCode.DATABASE_PROCESS_ERROR.getStatusCode());
       status.setMessage(e.getMessage());
     } catch (LoadFileException e) {
       logger.error(String.format("Execute load command %s error.", loadCommand), e);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
index 06a0525455..e265af1e13 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
@@ -949,7 +949,7 @@ public class DataRegion {
         if (!isAlive(currTime)) {
           results[loc] =
               RpcUtils.getStatus(
-                  TSStatusCode.OUT_OF_TTL_ERROR,
+                  TSStatusCode.OUT_OF_TTL,
                   "time " + currTime + " in current line is out of TTL: " + dataTTL);
           loc++;
           noFailure = false;
@@ -3070,7 +3070,7 @@ public class DataRegion {
               .put(
                   i,
                   RpcUtils.getStatus(
-                      TSStatusCode.OUT_OF_TTL_ERROR.getStatusCode(),
+                      TSStatusCode.OUT_OF_TTL.getStatusCode(),
                       String.format(
                           "Insertion time [%s] is less than ttl time bound [%s]",
                           DateTimeUtils.convertMillsecondToZonedDateTime(insertRowNode.getTime()),
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/DataRegionException.java b/server/src/main/java/org/apache/iotdb/db/exception/DataRegionException.java
index 329a9cb249..5c76935147 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/DataRegionException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/DataRegionException.java
@@ -26,10 +26,10 @@ public class DataRegionException extends IoTDBException {
   private static final long serialVersionUID = 7373978140952977661L;
 
   public DataRegionException(Exception exception) {
-    super(exception, TSStatusCode.DATA_REGION_ERROR.getStatusCode());
+    super(exception, TSStatusCode.DATABASE_PROCESS_ERROR.getStatusCode());
   }
 
   public DataRegionException(String message) {
-    super(message, TSStatusCode.DATA_REGION_ERROR.getStatusCode());
+    super(message, TSStatusCode.DATABASE_PROCESS_ERROR.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java b/server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
index 5a5bd33dc6..8d3c7a9ef3 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
@@ -29,6 +29,6 @@ public class DiskSpaceInsufficientException extends StorageEngineException {
   public DiskSpaceInsufficientException(List<String> folders) {
     super(
         String.format("Can't get next folder from [%s], because they are all full.", folders),
-        TSStatusCode.DISK_SPACE_INSUFFICIENT_ERROR.getStatusCode());
+        TSStatusCode.DISK_SPACE_INSUFFICIENT.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/MergeException.java b/server/src/main/java/org/apache/iotdb/db/exception/MergeException.java
index f31593278b..4b0f7ddf9d 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/MergeException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/MergeException.java
@@ -27,6 +27,6 @@ public class MergeException extends IoTDBException {
   private static final long serialVersionUID = 5445240999141374140L;
 
   public MergeException(Throwable cause) {
-    super(cause.getMessage(), TSStatusCode.MERGE_ERROR.getStatusCode());
+    super(cause.getMessage(), TSStatusCode.COMPACTION_ERROR.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/QueryIdNotExsitException.java b/server/src/main/java/org/apache/iotdb/db/exception/QueryIdNotExsitException.java
deleted file mode 100644
index f82ce146f3..0000000000
--- a/server/src/main/java/org/apache/iotdb/db/exception/QueryIdNotExsitException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.iotdb.db.exception;
-
-import org.apache.iotdb.commons.exception.IoTDBException;
-import org.apache.iotdb.rpc.TSStatusCode;
-
-public class QueryIdNotExsitException extends IoTDBException {
-
-  public QueryIdNotExsitException(String message) {
-    super(message, TSStatusCode.QUERY_ID_NOT_EXIST.getStatusCode());
-  }
-}
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/StorageEngineReadonlyException.java b/server/src/main/java/org/apache/iotdb/db/exception/StorageEngineReadonlyException.java
index f8f1b59995..184e584683 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/StorageEngineReadonlyException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/StorageEngineReadonlyException.java
@@ -27,6 +27,6 @@ public class StorageEngineReadonlyException extends StorageEngineException {
       "Database is read-only, and does not accept non-query operation now";
 
   public StorageEngineReadonlyException() {
-    super(ERROR_MESSAGE, TSStatusCode.READ_ONLY_SYSTEM_ERROR.getStatusCode());
+    super(ERROR_MESSAGE, TSStatusCode.READ_ONLY_SYSTEM.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java b/server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
index 74dfa74c05..eec90c83af 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
@@ -26,14 +26,14 @@ public class SyncConnectionException extends IoTDBException {
   private static final long serialVersionUID = -6661904365503849681L;
 
   public SyncConnectionException(String message) {
-    super(message, TSStatusCode.SYNC_CONNECTION_EXCEPTION.getStatusCode());
+    super(message, TSStatusCode.SYNC_CONNECTION_ERROR.getStatusCode());
   }
 
   public SyncConnectionException(String message, Throwable cause) {
-    super(message + cause.getMessage(), TSStatusCode.SYNC_CONNECTION_EXCEPTION.getStatusCode());
+    super(message + cause.getMessage(), TSStatusCode.SYNC_CONNECTION_ERROR.getStatusCode());
   }
 
   public SyncConnectionException(Throwable cause) {
-    super(cause.getMessage(), TSStatusCode.SYNC_CONNECTION_EXCEPTION.getStatusCode());
+    super(cause.getMessage(), TSStatusCode.SYNC_CONNECTION_ERROR.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/index/UnsupportedIndexTypeException.java b/server/src/main/java/org/apache/iotdb/db/exception/index/UnsupportedIndexTypeException.java
index 911a2f2615..1bea1415c6 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/index/UnsupportedIndexTypeException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/index/UnsupportedIndexTypeException.java
@@ -27,6 +27,6 @@ public class UnsupportedIndexTypeException extends QueryProcessException {
   public UnsupportedIndexTypeException(String indexType) {
     super(
         "Unsupported index type: " + indexType,
-        TSStatusCode.UNSUPPORTED_INDEX_TYPE_ERROR.getStatusCode());
+        TSStatusCode.UNSUPPORTED_INDEX_TYPE.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java
index 0b6c0f51c0..2df35dead3 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java
@@ -30,7 +30,7 @@ public class AliasAlreadyExistException extends MetadataException {
   public AliasAlreadyExistException(String path, String alias) {
     super(
         String.format("Alias [%s] for Path [%s] already exist", alias, path),
-        TSStatusCode.ALIAS_ALREADY_EXIST_ERROR.getStatusCode());
+        TSStatusCode.ALIAS_ALREADY_EXIST.getStatusCode());
     this.isUserException = true;
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/DeleteFailedException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/DeleteFailedException.java
index eecd18d8d7..2bff5f9300 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/DeleteFailedException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/DeleteFailedException.java
@@ -30,7 +30,7 @@ public class DeleteFailedException extends MetadataException {
   public DeleteFailedException(String name) {
     super(
         String.format("Node [%s] is being used. Deletion failed.", name),
-        TSStatusCode.NODE_DELETE_FAILED_ERROR.getStatusCode());
+        TSStatusCode.NODE_DELETE_ERROR.getStatusCode());
     this.name = name;
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java
index c5a9afbc68..9ff7116d71 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java
@@ -31,7 +31,7 @@ public class MeasurementAlreadyExistException extends MetadataException {
   public MeasurementAlreadyExistException(String path, MeasurementPath measurementPath) {
     super(
         String.format("Path [%s] already exist", path),
-        TSStatusCode.MEASUREMENT_ALREADY_EXIST.getStatusCode());
+        TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode());
     this.isUserException = true;
     this.measurementPath = measurementPath;
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementInBlackListException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementInBlackListException.java
index 3aef42cec0..d6dd5c3cab 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementInBlackListException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementInBlackListException.java
@@ -31,7 +31,7 @@ public class MeasurementInBlackListException extends MetadataException {
   public MeasurementInBlackListException(PartialPath path) {
     super(
         String.format("Some task is deleting timeseries [%s]", path),
-        TSStatusCode.MEASUREMENT_IN_BLACK_LIST.getStatusCode());
+        TSStatusCode.TIMESERIES_IN_BLACK_LIST.getStatusCode());
     this.path = path;
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java
index b644c22d9c..d91ea75dba 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java
@@ -30,7 +30,7 @@ public class PathAlreadyExistException extends MetadataException {
   public PathAlreadyExistException(String path) {
     super(
         String.format("Path [%s] already exist", path),
-        TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode());
+        TSStatusCode.PATH_ALREADY_EXIST.getStatusCode());
     this.isUserException = true;
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathNotExistException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathNotExistException.java
index b7b5950f14..855b8d27da 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathNotExistException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/PathNotExistException.java
@@ -31,13 +31,13 @@ public class PathNotExistException extends MetadataException {
   public PathNotExistException(String path) {
     super(
         String.format(PATH_NOT_EXIST_WRONG_MESSAGE, path),
-        TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode());
+        TSStatusCode.PATH_NOT_EXIST.getStatusCode());
   }
 
   public PathNotExistException(String path, boolean isUserException) {
     super(
         String.format(PATH_NOT_EXIST_WRONG_MESSAGE, path),
-        TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode(),
+        TSStatusCode.PATH_NOT_EXIST.getStatusCode(),
         isUserException);
   }
 
@@ -48,6 +48,6 @@ public class PathNotExistException extends MetadataException {
             paths.size() == 1
                 ? paths.get(0)
                 : paths.get(0) + " ... " + paths.get(paths.size() - 1)),
-        TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode());
+        TSStatusCode.PATH_NOT_EXIST.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupAlreadySetException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupAlreadySetException.java
index 9529bbf904..89aacde85d 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupAlreadySetException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupAlreadySetException.java
@@ -31,13 +31,13 @@ public class StorageGroupAlreadySetException extends MetadataException {
   private final String storageGroupPath;
 
   public StorageGroupAlreadySetException(String path) {
-    super(getMessage(path, false), TSStatusCode.STORAGE_GROUP_ALREADY_EXISTS.getStatusCode());
+    super(getMessage(path, false), TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode());
     storageGroupPath = path;
     hasChild = false;
   }
 
   public StorageGroupAlreadySetException(String path, boolean hasChild) {
-    super(getMessage(path, hasChild), TSStatusCode.STORAGE_GROUP_ALREADY_EXISTS.getStatusCode());
+    super(getMessage(path, hasChild), TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode());
     this.hasChild = hasChild;
     storageGroupPath = path;
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupNotSetException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupNotSetException.java
index 4a0428fd87..3f48ab9f14 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupNotSetException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupNotSetException.java
@@ -28,13 +28,13 @@ public class StorageGroupNotSetException extends MetadataException {
 
   public StorageGroupNotSetException(String path) {
     super(String.format("Database is not set for current seriesPath: [%s]", path));
-    this.errorCode = TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode();
+    this.errorCode = TSStatusCode.DATABASE_NOT_EXIST.getStatusCode();
   }
 
   public StorageGroupNotSetException(String path, boolean isUserException) {
     super(String.format("Database is not set for current seriesPath: [%s]", path));
     this.isUserException = isUserException;
-    this.errorCode = TSStatusCode.STORAGE_GROUP_NOT_EXIST.getStatusCode();
+    this.errorCode = TSStatusCode.DATABASE_NOT_EXIST.getStatusCode();
   }
 
   public StorageGroupNotSetException(String path, String reason) {
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/ColossalRecordException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/ColossalRecordException.java
index 39f1968ab7..96777d38ef 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/ColossalRecordException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/ColossalRecordException.java
@@ -33,21 +33,21 @@ public class ColossalRecordException extends MetadataException {
     super(
         String.format(
             "Record of key [%s] is too large for SchemaFile to store, content size:%d", key, size),
-        TSStatusCode.COLOSSAL_RECORD.getStatusCode(),
+        TSStatusCode.OVERSIZE_RECORD.getStatusCode(),
         true);
   }
 
   public ColossalRecordException(String key) {
     super(
         String.format("Key [%s] is too large to store in a InternalPage as index entry.", key),
-        TSStatusCode.COLOSSAL_RECORD.getStatusCode(),
+        TSStatusCode.OVERSIZE_RECORD.getStatusCode(),
         true);
   }
 
   public ColossalRecordException(String key, String alias) {
     super(
         String.format("Key-Alias pair (%s, %s) is too large for SchemaFile to store.", key, alias),
-        TSStatusCode.COLOSSAL_RECORD.getStatusCode(),
+        TSStatusCode.OVERSIZE_RECORD.getStatusCode(),
         true);
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java
index 47b67f34d5..fab2200350 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SchemaFileLogCorruptedException.java
@@ -28,7 +28,7 @@ public class SchemaFileLogCorruptedException extends MetadataException {
   public SchemaFileLogCorruptedException(String fileName, String reason) {
     super(
         String.format("SchemaFileLog [%s] corrupted for [%s].", fileName, reason),
-        TSStatusCode.SCHEMA_FILE_LOG_CORR.getStatusCode(),
+        TSStatusCode.SCHEMA_FILE_REDO_LOG_BROKEN.getStatusCode(),
         true);
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateImcompatibeException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateImcompatibeException.java
index 9dc21a8c2c..9e3a8fb1fd 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateImcompatibeException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateImcompatibeException.java
@@ -28,14 +28,14 @@ public class TemplateImcompatibeException extends MetadataException {
   public TemplateImcompatibeException(String path, String templateName) {
     super(
         String.format("Path [%s] already exists in [%s]", path, templateName),
-        TSStatusCode.TEMPLATE_IMCOMPATIBLE.getStatusCode());
+        TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode());
     this.isUserException = true;
   }
 
   public TemplateImcompatibeException(String path, String templateName, String overlapNodeName) {
     super(
         String.format("Path [%s] overlaps with [%s] on [%s]", path, templateName, overlapNodeName),
-        TSStatusCode.TEMPLATE_IMCOMPATIBLE.getStatusCode());
+        TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode());
     this.isUserException = true;
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java b/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java
index 748f6c06e6..d92edefa22 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java
@@ -34,7 +34,7 @@ public class OutOfTTLException extends WriteProcessException {
         String.format(
             "Insertion time [%s] is less than ttl time bound [%s]",
             new Date(insertionTime), new Date(timeLowerBound)),
-        TSStatusCode.OUT_OF_TTL_ERROR.getStatusCode(),
+        TSStatusCode.OUT_OF_TTL.getStatusCode(),
         true);
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/query/PathException.java b/server/src/main/java/org/apache/iotdb/db/exception/query/PathException.java
deleted file mode 100644
index 5fd792b3ca..0000000000
--- a/server/src/main/java/org/apache/iotdb/db/exception/query/PathException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.iotdb.db.exception.query;
-
-import org.apache.iotdb.rpc.TSStatusCode;
-
-public class PathException extends QueryProcessException {
-
-  private static final long serialVersionUID = 2141197032898163234L;
-
-  public PathException() {
-    super("Timeseries is null", TSStatusCode.PATH_ERROR.getStatusCode());
-  }
-
-  public PathException(String message) {
-    super(message, TSStatusCode.PATH_ERROR.getStatusCode());
-  }
-
-  public PathException(String message, int errorCode) {
-    super(message, errorCode);
-  }
-}
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java b/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java
index 95f2fc96da..05cdca67d0 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java
@@ -28,6 +28,6 @@ public class UnSupportedFillTypeException extends QueryProcessException {
   public UnSupportedFillTypeException(TSDataType dataType) {
     super(
         String.format("Unsupported linear fill data type: [%s]", dataType),
-        TSStatusCode.UNSUPPORTED_FILL_TYPE_ERROR.getStatusCode());
+        TSStatusCode.UNSUPPORTED_FILL_TYPE.getStatusCode());
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
index 8b5fba03da..99eb51cb96 100644
--- a/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
@@ -1322,7 +1322,7 @@ public class LocalConfigNode {
     try {
       syncService.addPipeSink(createPipeSinkStatement);
     } catch (PipeSinkException e) {
-      return RpcUtils.getStatus(TSStatusCode.PIPESINK_ERROR, e.getMessage());
+      return RpcUtils.getStatus(TSStatusCode.CREATE_PIPE_SINK_ERROR, e.getMessage());
     }
     return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
   }
@@ -1331,7 +1331,7 @@ public class LocalConfigNode {
     try {
       syncService.dropPipeSink(pipeSinkName);
     } catch (PipeSinkException e) {
-      return RpcUtils.getStatus(TSStatusCode.PIPESINK_ERROR, e.getMessage());
+      return RpcUtils.getStatus(TSStatusCode.CREATE_PIPE_SINK_ERROR, e.getMessage());
     }
     return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
index e43e293298..e63309b26c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
@@ -417,7 +417,7 @@ public class RegionWriteExecutor {
               failingMeasurementMap.entrySet()) {
             metadataException = failingMeasurement.getValue();
             if (metadataException.getErrorCode()
-                == TSStatusCode.MEASUREMENT_ALREADY_EXIST.getStatusCode()) {
+                == TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode()) {
               LOGGER.info(
                   "There's no need to internal create timeseries. {}",
                   failingMeasurement.getValue().getMessage());
@@ -447,7 +447,7 @@ public class RegionWriteExecutor {
           if (failingStatus.isEmpty()) {
             if (executionStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
               if (executionStatus.getSubStatus().get(0).getCode()
-                  == TSStatusCode.MEASUREMENT_ALREADY_EXIST.getStatusCode()) {
+                  == TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode()) {
                 // there's only measurement_already_exist exception
                 alreadyExistingStatus.addAll(executionStatus.getSubStatus());
               } else {
@@ -459,7 +459,7 @@ public class RegionWriteExecutor {
           } else {
             if (executionStatus.getCode() == TSStatusCode.MULTIPLE_ERROR.getStatusCode()) {
               if (executionStatus.getSubStatus().get(0).getCode()
-                  != TSStatusCode.MEASUREMENT_ALREADY_EXIST.getStatusCode()) {
+                  != TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode()) {
                 failingStatus.addAll(executionStatus.getSubStatus());
               }
             } else if (executionStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index f4f90bbd93..2690173377 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -1742,7 +1742,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
                 schemaFetcher,
                 IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
     if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()
-        && result.status.code != TSStatusCode.STORAGE_GROUP_ALREADY_EXISTS.getStatusCode()) {
+        && result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
       logger.error(String.format("Create Database error, statement: %s.", statement));
       logger.error(String.format("Create database result status : %s.", result.status));
       throw new LoadFileException(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
index e987735e2d..6a683fc4ce 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
@@ -493,7 +493,7 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
     List<String> failedCreationList = new ArrayList<>();
     List<MeasurementPath> alreadyExistingMeasurements = new ArrayList<>();
     for (TSStatus subStatus : executionResult.status.subStatus) {
-      if (subStatus.code == TSStatusCode.MEASUREMENT_ALREADY_EXIST.getStatusCode()) {
+      if (subStatus.code == TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode()) {
         alreadyExistingMeasurements.add(
             MeasurementPath.parseDataFromString(subStatus.getMessage()));
       } else {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
index f597340b75..8f3f0da402 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
@@ -540,7 +540,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
                     + createTriggerStatement.getClassName()
                     + "', because it's not found in jar file: "
                     + createTriggerStatement.getUriString(),
-                TSStatusCode.TRIGGER_LOAD_CLASS.getStatusCode()));
+                TSStatusCode.TRIGGER_LOAD_CLASS_ERROR.getStatusCode()));
         return future;
       }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
index 62ae2e5b2b..15be2fa2cd 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
@@ -192,7 +192,7 @@ public class StandaloneConfigTaskExecutor implements IConfigTaskExecutor {
                 String.format(
                     "Path %s does not exist",
                     Arrays.toString(deleteStorageGroupStatement.getPrefixPath().toArray())),
-                TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode()));
+                TSStatusCode.PATH_NOT_EXIST.getStatusCode()));
         return future;
       } else {
         LocalConfigNode.getInstance().deleteStorageGroups(deletePathList);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
index 303a824c0d..fde66f115b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
@@ -97,7 +97,7 @@ public class ClusterScheduler implements IScheduler {
   private boolean needRetry(TSStatus failureStatus) {
     return failureStatus != null
         && queryType == QueryType.READ
-        && failureStatus.getCode() == TSStatusCode.SYNC_CONNECTION_EXCEPTION.getStatusCode();
+        && failureStatus.getCode() == TSStatusCode.SYNC_CONNECTION_ERROR.getStatusCode();
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
index 1128b97341..6c8bca7a51 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
@@ -192,7 +192,7 @@ public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher {
     } catch (IOException | TException e) {
       logger.error("can't connect to node {}", endPoint, e);
       TSStatus status = new TSStatus();
-      status.setCode(TSStatusCode.SYNC_CONNECTION_EXCEPTION.getStatusCode());
+      status.setCode(TSStatusCode.SYNC_CONNECTION_ERROR.getStatusCode());
       status.setMessage("can't connect to node {}" + endPoint);
       // If the DataNode cannot be connected, its endPoint will be put into black list
       // so that the following retry will avoid dispatching instance towards this DataNode.
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java
index 70b243ee79..698dff38cc 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java
@@ -132,7 +132,7 @@ public class StandaloneScheduler implements IScheduler {
       case WRITE:
         // reject non-query operations when system is read-only
         if (CommonDescriptor.getInstance().getConfig().isReadOnly()) {
-          TSStatus failedStatus = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM_ERROR.getStatusCode());
+          TSStatus failedStatus = new TSStatus(TSStatusCode.READ_ONLY_SYSTEM.getStatusCode());
           failedStatus.setMessage("Fail to do non-query operations because system is read-only.");
           stateMachine.transitionToFailed(failedStatus);
           return;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
index 3471aa3563..0e6749ad46 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
@@ -138,7 +138,7 @@ public class LoadTsFileDispatcherImpl implements IFragInstanceDispatcher {
     } catch (IOException | TException e) {
       logger.error("can't connect to node {}", endPoint, e);
       TSStatus status = new TSStatus();
-      status.setCode(TSStatusCode.SYNC_CONNECTION_EXCEPTION.getStatusCode());
+      status.setCode(TSStatusCode.SYNC_CONNECTION_ERROR.getStatusCode());
       status.setMessage("can't connect to node {}" + endPoint);
       throw new FragmentInstanceDispatchException(status);
     }
@@ -157,7 +157,7 @@ public class LoadTsFileDispatcherImpl implements IFragInstanceDispatcher {
           (LoadTsFilePieceNode) PlanNodeType.deserialize(planNode.serializeToByteBuffer());
       if (pieceNode == null) {
         throw new FragmentInstanceDispatchException(
-            new TSStatus(TSStatusCode.NODE_DESERIALIZE_ERROR.getStatusCode()));
+            new TSStatus(TSStatusCode.DESERIALIZE_PIECE_OF_TSFILE_ERROR.getStatusCode()));
       }
       TSStatus resultStatus =
           StorageEngineV2.getInstance()
@@ -226,7 +226,7 @@ public class LoadTsFileDispatcherImpl implements IFragInstanceDispatcher {
     } catch (IOException | TException e) {
       logger.error("can't connect to node {}", endPoint, e);
       TSStatus status = new TSStatus();
-      status.setCode(TSStatusCode.SYNC_CONNECTION_EXCEPTION.getStatusCode());
+      status.setCode(TSStatusCode.SYNC_CONNECTION_ERROR.getStatusCode());
       status.setMessage("can't connect to node {}" + endPoint);
       throw new FragmentInstanceDispatchException(status);
     }
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/NewInfluxDBMetaManager.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/NewInfluxDBMetaManager.java
index 2f5422b034..7992a70000 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/NewInfluxDBMetaManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/NewInfluxDBMetaManager.java
@@ -118,7 +118,7 @@ public class NewInfluxDBMetaManager extends AbstractInfluxDBMetaManager {
   public void setStorageGroup(String database, long sessionID) {
     TSStatus status = clientRPCService.setStorageGroup(sessionID, "root." + database);
     if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()
-        || status.getCode() == TSStatusCode.STORAGE_GROUP_ALREADY_EXISTS.getStatusCode()) {
+        || status.getCode() == TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
       return;
     }
     throw new InfluxDBException(status.getMessage());
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java
index f03e2f80a6..f9c774fa2a 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java
@@ -126,8 +126,8 @@ public class AuthorizationFilter implements ContainerRequestFilter {
                 .type(MediaType.APPLICATION_JSON)
                 .entity(
                     new ExecutionStatus()
-                        .code(TSStatusCode.WRONG_LOGIN_PASSWORD_ERROR.getStatusCode())
-                        .message(TSStatusCode.WRONG_LOGIN_PASSWORD_ERROR.name()))
+                        .code(TSStatusCode.WRONG_LOGIN_PASSWORD.getStatusCode())
+                        .message(TSStatusCode.WRONG_LOGIN_PASSWORD.name()))
                 .build();
         containerRequestContext.abortWith(resp);
         return null;
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java
index 434b986e11..289b9fc523 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java
@@ -35,8 +35,8 @@ public class AuthorizationHandler {
         return Response.ok()
             .entity(
                 new ExecutionStatus()
-                    .code(TSStatusCode.NO_PERMISSION_ERROR.getStatusCode())
-                    .message(TSStatusCode.NO_PERMISSION_ERROR.name()))
+                    .code(TSStatusCode.NO_PERMISSION.getStatusCode())
+                    .message(TSStatusCode.NO_PERMISSION.name()))
             .build();
       }
     } catch (AuthException e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
index e2d255be1e..f7cc96b676 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
@@ -129,7 +129,7 @@ public class SessionManager implements SessionManagerMBean {
       LOGGER.error("Failed to connect to ConfigNode, because ", e);
       openSessionResp
           .sessionId(-1)
-          .setCode(TSStatusCode.AUTHENTICATION_ERROR.getStatusCode())
+          .setCode(TSStatusCode.AUTHENTICATION_FAILED.getStatusCode())
           .setMessage(e.getMessage());
     }
 
@@ -181,7 +181,7 @@ public class SessionManager implements SessionManagerMBean {
       Consumer<Long> releaseByQueryId) {
     if (!checkLogin(session)) {
       return RpcUtils.getStatus(
-          TSStatusCode.NOT_LOGIN_ERROR,
+          TSStatusCode.NOT_LOGIN,
           "Log in failed. Either you are not authorized or the session has timed out.");
     }
 
@@ -271,7 +271,7 @@ public class SessionManager implements SessionManagerMBean {
     try {
       if (!checkAuthorization(plan, session.getUsername())) {
         return RpcUtils.getStatus(
-            TSStatusCode.NO_PERMISSION_ERROR,
+            TSStatusCode.NO_PERMISSION,
             "No permissions for this operation, please add privilege "
                 + PrivilegeType.values()[
                     AuthorityChecker.translateToPermissionId(plan.getOperatorType())]);
diff --git a/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java b/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java
index 8c37145a4b..fc68469a3d 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java
@@ -406,7 +406,7 @@ public class RegionMigrateService implements IService {
           removePeerSucceed = false;
           taskLogger.error(
               "Remove peer {} for region {} error, retry times: {}", oldPeerNode, regionId, i, e);
-          status.setCode(TSStatusCode.REGION_MIGRATE_FAILED.getStatusCode());
+          status.setCode(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
           status.setMessage(
               "remove peer: "
                   + oldPeerNode
@@ -500,14 +500,14 @@ public class RegionMigrateService implements IService {
         }
       } catch (Throwable e) {
         taskLogger.error("DeleteOldRegionPeer error, regionId: {}", regionId, e);
-        status.setCode(TSStatusCode.REGION_MIGRATE_FAILED.getStatusCode());
+        status.setCode(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
         status.setMessage(
             "deleteOldRegionPeer for region: " + regionId + " error. exception: " + e.getMessage());
         return status;
       }
       if (!resp.isSuccess()) {
         taskLogger.error("DeleteOldRegionPeer error, regionId: {}", regionId, resp.getException());
-        status.setCode(TSStatusCode.REGION_MIGRATE_FAILED.getStatusCode());
+        status.setCode(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
         status.setMessage(
             String.format(
                 "deleteOldRegionPeer error, regionId: %s, errorMessage: %s",
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
index b8673f2705..27646db877 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
@@ -470,7 +470,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
     return new TSStatus(
         !SESSION_MANAGER.closeSession(
                 SESSION_MANAGER.getCurrSession(), COORDINATOR::cleanupQueryExecution)
-            ? RpcUtils.getStatus(TSStatusCode.NOT_LOGIN_ERROR)
+            ? RpcUtils.getStatus(TSStatusCode.NOT_LOGIN)
             : RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS));
   }
 
@@ -1774,7 +1774,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
 
   private TSStatus getNotLoggedInStatus() {
     return RpcUtils.getStatus(
-        TSStatusCode.NOT_LOGIN_ERROR,
+        TSStatusCode.NOT_LOGIN,
         "Log in failed. Either you are not authorized or the session has timed out.");
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index f691488eb6..a3e4266ec1 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -347,7 +347,8 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
         ConsensusGroupId.Factory.createFromTConsensusGroupId(req.consensusGroupId);
     LoadTsFilePieceNode pieceNode = (LoadTsFilePieceNode) PlanNodeType.deserialize(req.body);
     if (pieceNode == null) {
-      return createTLoadResp(new TSStatus(TSStatusCode.NODE_DESERIALIZE_ERROR.getStatusCode()));
+      return createTLoadResp(
+          new TSStatus(TSStatusCode.DESERIALIZE_PIECE_OF_TSFILE_ERROR.getStatusCode()));
     }
 
     TSStatus resultStatus =
@@ -971,7 +972,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
     if (result) {
       return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
     } else {
-      return RpcUtils.getStatus(TSStatusCode.CACHE_UPDATE_FAIL);
+      return RpcUtils.getStatus(TSStatusCode.PARTITION_CACHE_UPDATE_ERROR);
     }
   }
 
@@ -1063,7 +1064,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
     if (AuthorizerManager.getInstance().invalidateCache(req.getUsername(), req.getRoleName())) {
       return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
     }
-    return RpcUtils.getStatus(TSStatusCode.INVALIDATE_PERMISSION_CACHE_ERROR);
+    return RpcUtils.getStatus(TSStatusCode.CLEAR_PERMISSION_CACHE_ERROR);
   }
 
   @Override
@@ -1188,13 +1189,13 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
     } else if (regionId instanceof SchemaRegionId) {
       resp = SchemaRegionConsensusImpl.getInstance().transferLeader(regionId, newLeaderPeer);
     } else {
-      status.setCode(TSStatusCode.REGION_LEADER_CHANGE_FAILED.getStatusCode());
+      status.setCode(TSStatusCode.REGION_LEADER_CHANGE_ERROR.getStatusCode());
       status.setMessage("Error Region type. region: " + regionId);
       return status;
     }
     if (!resp.isSuccess()) {
       LOGGER.error("change region {} leader failed", regionId, resp.getException());
-      status.setCode(TSStatusCode.REGION_LEADER_CHANGE_FAILED.getStatusCode());
+      status.setCode(TSStatusCode.REGION_LEADER_CHANGE_ERROR.getStatusCode());
       status.setMessage(resp.getException().getMessage());
       return status;
     }
@@ -1449,7 +1450,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
           peers,
           regionId,
           resp.getException());
-      status.setCode(TSStatusCode.REGION_MIGRATE_FAILED.getStatusCode());
+      status.setCode(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
       status.setMessage(resp.getException().getMessage());
       return status;
     }
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/NewInfluxDBServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/NewInfluxDBServiceImpl.java
index 38a3a4d157..a033c00af9 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/NewInfluxDBServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/NewInfluxDBServiceImpl.java
@@ -137,7 +137,7 @@ public class NewInfluxDBServiceImpl implements IInfluxDBServiceWithHandler {
   public InfluxTSStatus createDatabase(InfluxCreateDatabaseReq req) {
     TSStatus tsStatus =
         clientRPCService.setStorageGroup(req.sessionId, "root." + req.getDatabase());
-    if (tsStatus.getCode() == TSStatusCode.STORAGE_GROUP_ALREADY_EXISTS.getStatusCode()) {
+    if (tsStatus.getCode() == TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
       tsStatus.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
       tsStatus.setMessage("Execute successfully");
     }
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
index bddca8c86c..d086f5ba57 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
@@ -629,7 +629,7 @@ public class TSServiceImpl implements IClientRPCServiceWithHandler {
         && !SESSION_MANAGER.checkAuthorization(plan, username)) {
       return RpcUtils.getTSExecuteStatementResp(
           RpcUtils.getStatus(
-              TSStatusCode.NO_PERMISSION_ERROR,
+              TSStatusCode.NO_PERMISSION,
               "No permissions for this operation, please add privilege "
                   + OperatorType.values()[
                       AuthorityChecker.translateToPermissionId(plan.getOperatorType())]));
@@ -1508,7 +1508,7 @@ public class TSServiceImpl implements IClientRPCServiceWithHandler {
 
   private TSStatus getNotLoggedInStatus() {
     return RpcUtils.getStatus(
-        TSStatusCode.NOT_LOGIN_ERROR,
+        TSStatusCode.NOT_LOGIN,
         "Log in failed. Either you are not authorized or the session has timed out.");
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/common/LocalSyncInfoFetcher.java b/server/src/main/java/org/apache/iotdb/db/sync/common/LocalSyncInfoFetcher.java
index 923828ceda..956f4698a4 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/common/LocalSyncInfoFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/common/LocalSyncInfoFetcher.java
@@ -91,7 +91,7 @@ public class LocalSyncInfoFetcher implements ISyncInfoFetcher {
     } catch (IOException e) {
       return RpcUtils.getStatus(TSStatusCode.INTERNAL_SERVER_ERROR, e.getMessage());
     } catch (PipeSinkException e) {
-      return RpcUtils.getStatus(TSStatusCode.PIPESINK_ERROR, e.getMessage());
+      return RpcUtils.getStatus(TSStatusCode.CREATE_PIPE_SINK_ERROR, e.getMessage());
     }
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java
index d7146bc988..09cd80122b 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java
@@ -209,7 +209,7 @@ public class IoTDBSyncClient implements ISyncClient {
         if ((status.code == TSStatusCode.SUCCESS_STATUS.getStatusCode())) {
           // Success
           position += dataLength;
-        } else if (status.code == TSStatusCode.SYNC_FILE_REBASE.getStatusCode()) {
+        } else if (status.code == TSStatusCode.SYNC_FILE_REDIRECTION_ERROR.getStatusCode()) {
           position = Long.parseLong(status.message);
         } else if (status.code == TSStatusCode.SYNC_FILE_ERROR.getStatusCode()) {
           logger.error(
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java
index 1085617f35..cf0542aaf2 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java
@@ -261,8 +261,8 @@ public class ReceiverManager {
    * Receive TsFile based on startIndex.
    *
    * @return {@link TSStatusCode#SUCCESS_STATUS} if receive successfully; {@link
-   *     TSStatusCode#SYNC_FILE_REBASE} if startIndex needs to rollback because mismatched; {@link
-   *     TSStatusCode#SYNC_FILE_ERROR} if fail to receive file.
+   *     TSStatusCode#SYNC_FILE_REDIRECTION_ERROR} if startIndex needs to rollback because
+   *     mismatched; {@link TSStatusCode#SYNC_FILE_ERROR} if fail to receive file.
    * @throws TException The connection between the sender and the receiver has not been established
    *     by {@link ReceiverManager#handshake(TSyncIdentityInfo)}
    */
@@ -284,7 +284,7 @@ public class ReceiverManager {
     try {
       CheckResult result = checkStartIndexValid(new File(fileDir, fileName), startIndex);
       if (!result.isResult()) {
-        return RpcUtils.getStatus(TSStatusCode.SYNC_FILE_REBASE, result.getIndex());
+        return RpcUtils.getStatus(TSStatusCode.SYNC_FILE_REDIRECTION_ERROR, result.getIndex());
       }
     } catch (IOException e) {
       logger.error(e.getMessage());
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java
index f2aaf0a841..e01a94ab79 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java
@@ -80,7 +80,7 @@ public class ErrorHandlingUtils {
     TSStatus status = tryCatchQueryException(e);
     if (status != null) {
       // ignore logging sg not ready exception
-      if (status.getCode() != TSStatusCode.STORAGE_GROUP_NOT_READY.getStatusCode()) {
+      if (status.getCode() != TSStatusCode.DATABASE_NOT_READY.getStatusCode()) {
         String message =
             String.format(
                 "Status code: %s, Query Statement: %s failed", status.getCode(), operation);
@@ -108,7 +108,7 @@ public class ErrorHandlingUtils {
     Throwable rootCause = getRootCause(e);
     // ignore logging sg not ready exception
     if (rootCause instanceof StorageGroupNotReadyException) {
-      return RpcUtils.getStatus(TSStatusCode.STORAGE_GROUP_NOT_READY, rootCause.getMessage());
+      return RpcUtils.getStatus(TSStatusCode.DATABASE_NOT_READY, rootCause.getMessage());
     }
 
     Throwable t = e instanceof ExecutionException ? e.getCause() : e;
@@ -159,7 +159,7 @@ public class ErrorHandlingUtils {
       BatchProcessException batchException = (BatchProcessException) e;
       // ignore logging sg not ready exception
       for (TSStatus status : batchException.getFailingStatus()) {
-        if (status.getCode() == TSStatusCode.STORAGE_GROUP_NOT_READY.getStatusCode()) {
+        if (status.getCode() == TSStatusCode.DATABASE_NOT_READY.getStatusCode()) {
           return RpcUtils.getStatus(Arrays.asList(batchException.getFailingStatus()));
         }
       }
diff --git a/server/src/test/java/org/apache/iotdb/db/auth/AuthorizerManagerTest.java b/server/src/test/java/org/apache/iotdb/db/auth/AuthorizerManagerTest.java
index 6a356d00fa..6d22218d66 100644
--- a/server/src/test/java/org/apache/iotdb/db/auth/AuthorizerManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/auth/AuthorizerManagerTest.java
@@ -108,7 +108,7 @@ public class AuthorizerManagerTest {
             .getCode());
     // User does not have permission
     Assert.assertEquals(
-        TSStatusCode.NO_PERMISSION_ERROR.getStatusCode(),
+        TSStatusCode.NO_PERMISSION.getStatusCode(),
         authorityFetcher
             .checkUserPrivileges(
                 "user", Collections.singletonList("root.ln"), PrivilegeType.CREATE_USER.ordinal())
@@ -149,7 +149,7 @@ public class AuthorizerManagerTest {
             .getCode());
     // role does not have permission
     Assert.assertEquals(
-        TSStatusCode.NO_PERMISSION_ERROR.getStatusCode(),
+        TSStatusCode.NO_PERMISSION.getStatusCode(),
         authorityFetcher
             .checkUserPrivileges(
                 "user", Collections.singletonList("root.ln"), PrivilegeType.CREATE_USER.ordinal())
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
index a76e4c2922..5bb34bc0f0 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
@@ -22,62 +22,63 @@ package org.apache.iotdb.rpc;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * When update this class, remember to update the following files
+ *
+ * <p>docs/UserGuide/API/Status-Codes.md
+ *
+ * <p>docs/zh/UserGuide/API/Status-Codes.md
+ */
 public enum TSStatusCode {
   SUCCESS_STATUS(200),
   STILL_EXECUTING_STATUS(201),
-  INVALID_HANDLE_STATUS(202),
   INCOMPATIBLE_VERSION(203),
 
-  NODE_DELETE_FAILED_ERROR(298),
-  ALIAS_ALREADY_EXIST_ERROR(299),
-  PATH_ALREADY_EXIST_ERROR(300),
-  PATH_NOT_EXIST_ERROR(301),
-  UNSUPPORTED_FETCH_METADATA_OPERATION_ERROR(302),
+  NODE_DELETE_ERROR(298),
+  ALIAS_ALREADY_EXIST(299),
+  PATH_ALREADY_EXIST(300),
   METADATA_ERROR(303),
-  TIMESERIES_NOT_EXIST(304),
-  OUT_OF_TTL_ERROR(305),
-  CONFIG_ADJUSTER(306),
-  MERGE_ERROR(307),
+  PATH_NOT_EXIST(304),
+  OUT_OF_TTL(305),
+  COMPACTION_ERROR(307),
   SYSTEM_CHECK_ERROR(308),
-  SYNC_CONNECTION_EXCEPTION(310),
-  DATA_REGION_ERROR(311),
-  STORAGE_GROUP_ERROR(312),
+  SYNC_CONNECTION_ERROR(310),
+  DATABASE_PROCESS_ERROR(311),
   STORAGE_ENGINE_ERROR(313),
   TSFILE_PROCESSOR_ERROR(314),
   PATH_ILLEGAL(315),
   LOAD_FILE_ERROR(316),
-  STORAGE_GROUP_NOT_READY(317),
+  DATABASE_NOT_READY(317),
   ILLEGAL_PARAMETER(318),
   ALIGNED_TIMESERIES_ERROR(319),
   DUPLICATED_TEMPLATE(320),
   UNDEFINED_TEMPLATE(321),
-  STORAGE_GROUP_NOT_EXIST(322),
+  DATABASE_NOT_EXIST(322),
   CONTINUOUS_QUERY_ERROR(323),
   NO_TEMPLATE_ON_MNODE(324),
   DIFFERENT_TEMPLATE(325),
   TEMPLATE_IS_IN_USE(326),
-  TEMPLATE_IMCOMPATIBLE(327),
+  TEMPLATE_INCOMPATIBLE(327),
   SEGMENT_NOT_FOUND(328),
   PAGE_OUT_OF_SPACE(329),
   RECORD_DUPLICATED(330),
   SEGMENT_OUT_OF_SPACE(331),
   SCHEMA_FILE_NOT_EXISTS(332),
   WRITE_AHEAD_LOG_ERROR(333),
-  PIPESINK_ERROR(334),
+  CREATE_PIPE_SINK_ERROR(334),
   PIPE_ERROR(335),
   PIPESERVER_ERROR(336),
   SERIES_OVERFLOW(337),
-  MEASUREMENT_ALREADY_EXIST(338),
-  TEMPLATE_NOT_EXIST(339),
+  TIMESERIES_ALREADY_EXIST(338),
   CREATE_TEMPLATE_ERROR(340),
-  SYNC_FILE_REBASE(341),
+  SYNC_FILE_REDIRECTION_ERROR(341),
   SYNC_FILE_ERROR(342),
   VERIFY_METADATA_ERROR(343),
-  MEASUREMENT_IN_BLACK_LIST(344),
-  COLOSSAL_RECORD(349),
-  SCHEMA_FILE_LOG_CORR(350),
+  TIMESERIES_IN_BLACK_LIST(344),
+  OVERSIZE_RECORD(349),
+  SCHEMA_FILE_REDO_LOG_BROKEN(350),
   TRIGGER_FIRE_ERROR(355),
-  TRIGGER_LOAD_CLASS(360),
+  TRIGGER_LOAD_CLASS_ERROR(360),
   TRIGGER_DOWNLOAD_ERROR(361),
   CREATE_TRIGGER_INSTANCE_ERROR(362),
   ACTIVE_TRIGGER_INSTANCE_ERROR(363),
@@ -93,98 +94,76 @@ public enum TSStatusCode {
   SQL_PARSE_ERROR(401),
   GENERATE_TIME_ZONE_ERROR(402),
   SET_TIME_ZONE_ERROR(403),
-  NOT_STORAGE_GROUP_ERROR(404),
   QUERY_NOT_ALLOWED(405),
-  AST_FORMAT_ERROR(406),
   LOGICAL_OPERATOR_ERROR(407),
   LOGICAL_OPTIMIZE_ERROR(408),
-  UNSUPPORTED_FILL_TYPE_ERROR(409),
-  PATH_ERROR(410),
+  UNSUPPORTED_FILL_TYPE(409),
   QUERY_PROCESS_ERROR(411),
   WRITE_PROCESS_ERROR(412),
   WRITE_PROCESS_REJECT(413),
-  QUERY_ID_NOT_EXIST(414),
-  SNAPSHOT_DIR_NOT_LEGAL(415),
   SEMANTIC_ERROR(416),
-  TSFILE_RUNTIME_ERROR(417),
+  LOAD_PIECE_OF_TSFILE_ERROR(417),
 
-  UNSUPPORTED_INDEX_FUNC_ERROR(421),
-  UNSUPPORTED_INDEX_TYPE_ERROR(422),
+  UNSUPPORTED_INDEX_TYPE(422),
 
   MEMORY_NOT_ENOUGH(423),
 
   INTERNAL_SERVER_ERROR(500),
   CLOSE_OPERATION_ERROR(501),
-  READ_ONLY_SYSTEM_ERROR(502),
-  DISK_SPACE_INSUFFICIENT_ERROR(503),
+  READ_ONLY_SYSTEM(502),
+  DISK_SPACE_INSUFFICIENT(503),
   START_UP_ERROR(504),
   SHUT_DOWN_ERROR(505),
   MULTIPLE_ERROR(506),
-  SESSION_EXPIRED(507),
   TSBLOCK_SERIALIZE_ERROR(508),
 
-  WRONG_LOGIN_PASSWORD_ERROR(600),
-  NOT_LOGIN_ERROR(601),
-  NO_PERMISSION_ERROR(602),
+  WRONG_LOGIN_PASSWORD(600),
+  NOT_LOGIN(601),
+  NO_PERMISSION(602),
   UNINITIALIZED_AUTH_ERROR(603),
-  EXECUTE_PERMISSION_EXCEPTION_ERROR(604),
-  USER_NOT_EXIST_ERROR(605),
-  ROLE_NOT_EXIST_ERROR(606),
-  AUTHENTICATION_ERROR(607),
-  INVALIDATE_PERMISSION_CACHE_ERROR(608),
+  EXECUTE_PERMISSION_ERROR(604),
+  USER_NOT_EXIST(605),
+  ROLE_NOT_EXIST(606),
+  AUTHENTICATION_FAILED(607),
+  CLEAR_PERMISSION_CACHE_ERROR(608),
 
   // cluster-related errors
-  PARTITION_NOT_READY(700),
   TIME_OUT(701),
-  NO_LEADER(702),
   UNSUPPORTED_OPERATION(703),
-  NODE_READ_ONLY(704),
-  CONSISTENCY_FAILURE(705),
   NO_CONNECTION(706),
   NEED_REDIRECTION(707),
-  PARSE_LOG_ERROR(708),
-  ALL_RETRY_FAILED(709),
+  ALL_RETRY_ERROR(709),
   MIGRATE_REGION_ERROR(710),
   CREATE_REGION_ERROR(711),
   DELETE_REGION_ERROR(712),
-  CACHE_UPDATE_FAIL(713),
-  NODE_DESERIALIZE_ERROR(714),
+  PARTITION_CACHE_UPDATE_ERROR(713),
+  DESERIALIZE_PIECE_OF_TSFILE_ERROR(714),
   CONSENSUS_NOT_INITIALIZED(715),
 
   // configuration
-  CONFIG_ERROR(800),
+  CONFIGURATION_ERROR(800),
 
   // ConfigNode response
   DATANODE_ALREADY_REGISTERED(901),
-  SET_STORAGE_GROUP_FAILED(902),
-  STORAGE_GROUP_ALREADY_EXISTS(903),
-  NOT_ENOUGH_DATA_NODE(904),
+  DATABASE_ALREADY_EXISTS(903),
+  NO_ENOUGH_DATANODE(904),
   ERROR_GLOBAL_CONFIG(905),
-  APPLY_CONFIGNODE_FAILED(906),
-  REGISTER_CONFIGNODE_FAILED(907),
-  REMOVE_CONFIGNODE_FAILED(908),
-  REMOVE_CONFIGNODE_DUPLICATION(909),
-  STOP_CONOFIGNODE_FAILED(910),
-  PERSISTENCE_FAILURE(911),
+  ADD_CONFIGNODE_ERROR(906),
+  REMOVE_CONFIGNODE_ERROR(907),
   DATANODE_NOT_EXIST(912),
-  DUPLICATE_REMOVE(913),
-  REQUEST_SIZE_EXCEED(914),
-  REGION_MIGRATE_FAILED(915),
-  LACK_REPLICATION(916),
   DATANODE_STOP_ERROR(917),
-  REGION_LEADER_CHANGE_FAILED(918),
-  REMOVE_DATANODE_FAILED(919),
+  REGION_LEADER_CHANGE_ERROR(918),
+  REMOVE_DATANODE_ERROR(919),
   OVERLAP_WITH_EXISTING_TASK(920),
   NOT_AVAILABLE_REGION_GROUP(921),
   CREATE_TRIGGER_ERROR(922),
   DROP_TRIGGER_ERROR(923),
-  UPDATE_DATANODE_FAILED(924),
-  REJECT_REMOVED_DATANODE(925),
+  REGISTER_REMOVED_DATANODE(925),
 
   NO_SUCH_CQ(930),
   CQ_ALREADY_ACTIVE(931),
   CQ_AlREADY_EXIST(932),
-  CQ_UPDATE_LAST_EXEC_TIME_FAILED(933);
+  CQ_UPDATE_LAST_EXEC_TIME_ERROR(933);
 
   private final int statusCode;