You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2023/03/10 07:28:35 UTC
[iotdb] branch master updated: [IOTDB-5660] Rename StorageGroup related expcetion name to Database
This is an automated email from the ASF dual-hosted git repository.
yongzao 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 617a9c61cb [IOTDB-5660] Rename StorageGroup related expcetion name to Database
617a9c61cb is described below
commit 617a9c61cb5de835f5ea05dccfde3b891a4e47ad
Author: Chen YZ <43...@users.noreply.github.com>
AuthorDate: Fri Mar 10 15:28:27 2023 +0800
[IOTDB-5660] Rename StorageGroup related expcetion name to Database
[IOTDB-5660] Rename StorageGroup related expcetion name to Database
---
...ption.java => DatabaseAlreadySetException.java} | 6 ++--
...Exception.java => DatabaseNotSetException.java} | 8 +++---
.../iotdb/db/metadata/mtree/ConfigMTree.java | 32 +++++++++++-----------
.../db/protocol/rest/handler/ExceptionHandler.java | 6 ++--
4 files changed, 26 insertions(+), 26 deletions(-)
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/DatabaseAlreadySetException.java
similarity index 90%
rename from server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupAlreadySetException.java
rename to server/src/main/java/org/apache/iotdb/db/exception/metadata/DatabaseAlreadySetException.java
index 89aacde85d..20f42144ea 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/DatabaseAlreadySetException.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.db.exception.metadata;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.rpc.TSStatusCode;
-public class StorageGroupAlreadySetException extends MetadataException {
+public class DatabaseAlreadySetException extends MetadataException {
private static final long serialVersionUID = 9110669164701929779L;
@@ -30,13 +30,13 @@ public class StorageGroupAlreadySetException extends MetadataException {
private final String storageGroupPath;
- public StorageGroupAlreadySetException(String path) {
+ public DatabaseAlreadySetException(String path) {
super(getMessage(path, false), TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode());
storageGroupPath = path;
hasChild = false;
}
- public StorageGroupAlreadySetException(String path, boolean hasChild) {
+ public DatabaseAlreadySetException(String path, boolean hasChild) {
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/DatabaseNotSetException.java
similarity index 85%
rename from server/src/main/java/org/apache/iotdb/db/exception/metadata/StorageGroupNotSetException.java
rename to server/src/main/java/org/apache/iotdb/db/exception/metadata/DatabaseNotSetException.java
index 3f48ab9f14..ef395f5de4 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/DatabaseNotSetException.java
@@ -22,22 +22,22 @@ package org.apache.iotdb.db.exception.metadata;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.rpc.TSStatusCode;
-public class StorageGroupNotSetException extends MetadataException {
+public class DatabaseNotSetException extends MetadataException {
private static final long serialVersionUID = 3739300272099030533L;
- public StorageGroupNotSetException(String path) {
+ public DatabaseNotSetException(String path) {
super(String.format("Database is not set for current seriesPath: [%s]", path));
this.errorCode = TSStatusCode.DATABASE_NOT_EXIST.getStatusCode();
}
- public StorageGroupNotSetException(String path, boolean isUserException) {
+ public DatabaseNotSetException(String path, boolean isUserException) {
super(String.format("Database is not set for current seriesPath: [%s]", path));
this.isUserException = isUserException;
this.errorCode = TSStatusCode.DATABASE_NOT_EXIST.getStatusCode();
}
- public StorageGroupNotSetException(String path, String reason) {
+ public DatabaseNotSetException(String path, String reason) {
super(
String.format(
"Database is not set for current seriesPath: [%s], because %s", path, reason));
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java
index 1f08e42efb..91b7ff03e2 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java
@@ -25,9 +25,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.utils.ThriftConfigNodeSerDeUtils;
+import org.apache.iotdb.db.exception.metadata.DatabaseAlreadySetException;
+import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException;
import org.apache.iotdb.db.exception.metadata.PathNotExistException;
-import org.apache.iotdb.db.exception.metadata.StorageGroupAlreadySetException;
-import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.metadata.mnode.IMNode;
import org.apache.iotdb.db.metadata.mnode.IStorageGroupMNode;
import org.apache.iotdb.db.metadata.mnode.InternalMNode;
@@ -112,7 +112,7 @@ public class ConfigMTree {
cur.addChild(nodeNames[i], new InternalMNode(cur, nodeNames[i]));
} else if (temp.isStorageGroup()) {
// before create database, check whether the database already exists
- throw new StorageGroupAlreadySetException(temp.getFullPath());
+ throw new DatabaseAlreadySetException(temp.getFullPath());
}
cur = cur.getChild(nodeNames[i]);
i++;
@@ -124,9 +124,9 @@ public class ConfigMTree {
if (cur.hasChild(nodeNames[i])) {
// node b has child sg
if (cur.getChild(nodeNames[i]).isStorageGroup()) {
- throw new StorageGroupAlreadySetException(path.getFullPath());
+ throw new DatabaseAlreadySetException(path.getFullPath());
} else {
- throw new StorageGroupAlreadySetException(path.getFullPath(), true);
+ throw new DatabaseAlreadySetException(path.getFullPath(), true);
}
} else {
IStorageGroupMNode storageGroupMNode =
@@ -136,7 +136,7 @@ public class ConfigMTree {
IMNode result = cur.addChild(nodeNames[i], storageGroupMNode);
if (result != storageGroupMNode) {
- throw new StorageGroupAlreadySetException(path.getFullPath(), true);
+ throw new DatabaseAlreadySetException(path.getFullPath(), true);
}
}
}
@@ -250,21 +250,21 @@ public class ConfigMTree {
for (int i = 1; i < nodes.length - 1; i++) {
cur = cur.getChild(nodes[i]);
if (cur == null) {
- throw new StorageGroupNotSetException(storageGroupPath.getFullPath());
+ throw new DatabaseNotSetException(storageGroupPath.getFullPath());
}
if (cur.isStorageGroup()) {
- throw new StorageGroupAlreadySetException(cur.getFullPath());
+ throw new DatabaseAlreadySetException(cur.getFullPath());
}
}
cur = cur.getChild(nodes[nodes.length - 1]);
if (cur == null) {
- throw new StorageGroupNotSetException(storageGroupPath.getFullPath());
+ throw new DatabaseNotSetException(storageGroupPath.getFullPath());
}
if (cur.isStorageGroup()) {
return cur.getAsStorageGroupMNode();
} else {
- throw new StorageGroupAlreadySetException(storageGroupPath.getFullPath(), true);
+ throw new DatabaseAlreadySetException(storageGroupPath.getFullPath(), true);
}
}
@@ -288,7 +288,7 @@ public class ConfigMTree {
return cur.getAsStorageGroupMNode();
}
}
- throw new StorageGroupNotSetException(path.getFullPath());
+ throw new DatabaseNotSetException(path.getFullPath());
}
/**
@@ -321,7 +321,7 @@ public class ConfigMTree {
*
* @param path a full path or a prefix path
*/
- public void checkStorageGroupAlreadySet(PartialPath path) throws StorageGroupAlreadySetException {
+ public void checkStorageGroupAlreadySet(PartialPath path) throws DatabaseAlreadySetException {
String[] nodeNames = path.getNodes();
IMNode cur = root;
if (!nodeNames[0].equals(root.getName())) {
@@ -333,17 +333,17 @@ public class ConfigMTree {
}
cur = cur.getChild(nodeNames[i]);
if (cur.isStorageGroup()) {
- throw new StorageGroupAlreadySetException(cur.getFullPath());
+ throw new DatabaseAlreadySetException(cur.getFullPath());
}
}
- throw new StorageGroupAlreadySetException(path.getFullPath(), true);
+ throw new DatabaseAlreadySetException(path.getFullPath(), true);
}
// endregion
// region MTree Node Management
- public IMNode getNodeWithAutoCreate(PartialPath path) throws StorageGroupNotSetException {
+ public IMNode getNodeWithAutoCreate(PartialPath path) throws DatabaseNotSetException {
String[] nodeNames = path.getNodes();
IMNode cur = root;
IMNode child;
@@ -354,7 +354,7 @@ public class ConfigMTree {
if (hasStorageGroup) {
child = cur.addChild(nodeNames[i], new InternalMNode(cur, nodeNames[i]));
} else {
- throw new StorageGroupNotSetException(path.getFullPath());
+ throw new DatabaseNotSetException(path.getFullPath());
}
} else if (child.isStorageGroup()) {
hasStorageGroup = true;
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java
index 5cc980fcc5..f5aee2f325 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java
@@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.db.exception.StorageEngineException;
-import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
+import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
@@ -47,9 +47,9 @@ public class ExceptionHandler {
if (e instanceof QueryProcessException) {
responseResult.setMessage(e.getMessage());
responseResult.setCode(((QueryProcessException) e).getErrorCode());
- } else if (e instanceof StorageGroupNotSetException) {
+ } else if (e instanceof DatabaseNotSetException) {
responseResult.setMessage(e.getMessage());
- responseResult.setCode(((StorageGroupNotSetException) e).getErrorCode());
+ responseResult.setCode(((DatabaseNotSetException) e).getErrorCode());
} else if (e instanceof StorageEngineException) {
responseResult.setMessage(e.getMessage());
responseResult.setCode(((StorageEngineException) e).getErrorCode());