You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by zy...@apache.org on 2023/03/13 08:05:09 UTC
[iotdb] branch master updated: [IOTDB-5660] Update deprecated storage group name (#9285)
This is an automated email from the ASF dual-hosted git repository.
zyk 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 33ad44f5d7 [IOTDB-5660] Update deprecated storage group name (#9285)
33ad44f5d7 is described below
commit 33ad44f5d7153041d20f7db1eb7acab160ad24e6
Author: Chen YZ <43...@users.noreply.github.com>
AuthorDate: Mon Mar 13 16:05:02 2023 +0800
[IOTDB-5660] Update deprecated storage group name (#9285)
---
.../storagegroup/SetDataReplicationFactorPlan.java | 19 ++--
.../SetSchemaReplicationFactorPlan.java | 18 ++--
.../request/write/storagegroup/SetTTLPlan.java | 22 ++--
.../confignode/manager/ClusterSchemaManager.java | 7 +-
.../persistence/schema/ClusterSchemaInfo.java | 112 ++++++++++-----------
.../iotdb/db/metadata/mtree/ConfigMTree.java | 50 +++++----
.../db/metadata/mtree/store/CachedMTreeStore.java | 2 +-
.../mtree/store/disk/schemafile/ISchemaFile.java | 2 +-
.../store/disk/schemafile/MockSchemaFile.java | 2 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 2 +-
...SGCollector.java => MNodeAboveDBCollector.java} | 14 +--
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 9 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 16 +--
.../plan/execution/config/ConfigTaskVisitor.java | 22 ++--
.../config/executor/ClusterConfigTaskExecutor.java | 85 ++++++++--------
.../config/executor/IConfigTaskExecutor.java | 15 ++-
...torageGroupTask.java => CountDatabaseTask.java} | 12 +--
.../config/metadata/DatabaseSchemaTask.java | 23 ++---
.../config/metadata/DeleteStorageGroupTask.java | 10 +-
...StorageGroupTask.java => ShowDatabaseTask.java} | 12 +--
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 34 +++----
.../db/mpp/plan/parser/StatementGenerator.java | 29 +++---
.../db/mpp/plan/statement/StatementVisitor.java | 20 ++--
...pStatement.java => CountDatabaseStatement.java} | 4 +-
.../metadata/DatabaseSchemaStatement.java | 16 ++-
...Statement.java => DeleteDatabaseStatement.java} | 6 +-
.../plan/statement/metadata/SetTTLStatement.java | 14 ++-
...upStatement.java => ShowDatabaseStatement.java} | 4 +-
.../service/thrift/impl/ClientRPCServiceImpl.java | 4 +-
.../db/sync/transport/server/ReceiverManager.java | 2 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 4 +-
.../iotdb/db/metadata/mtree/ConfigMTreeTest.java | 80 +++++++--------
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 14 +--
.../mtree/schemafile/SchemaFileLogTest.java | 2 +-
.../metadata/mtree/schemafile/SchemaFileTest.java | 4 +-
35 files changed, 330 insertions(+), 361 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetDataReplicationFactorPlan.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetDataReplicationFactorPlan.java
index 7525f58cb2..2488da41af 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetDataReplicationFactorPlan.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetDataReplicationFactorPlan.java
@@ -29,7 +29,7 @@ import java.util.Objects;
public class SetDataReplicationFactorPlan extends ConfigPhysicalPlan {
- private String storageGroup;
+ private String database;
private int dataReplicationFactor;
@@ -37,14 +37,14 @@ public class SetDataReplicationFactorPlan extends ConfigPhysicalPlan {
super(ConfigPhysicalPlanType.SetDataReplicationFactor);
}
- public SetDataReplicationFactorPlan(String storageGroup, int dataReplicationFactor) {
+ public SetDataReplicationFactorPlan(String Database, int dataReplicationFactor) {
this();
- this.storageGroup = storageGroup;
+ this.database = Database;
this.dataReplicationFactor = dataReplicationFactor;
}
- public String getStorageGroup() {
- return storageGroup;
+ public String getDatabase() {
+ return database;
}
public int getDataReplicationFactor() {
@@ -55,13 +55,13 @@ public class SetDataReplicationFactorPlan extends ConfigPhysicalPlan {
protected void serializeImpl(DataOutputStream stream) throws IOException {
stream.writeShort(getType().getPlanType());
- BasicStructureSerDeUtil.write(storageGroup, stream);
+ BasicStructureSerDeUtil.write(database, stream);
stream.writeInt(dataReplicationFactor);
}
@Override
protected void deserializeImpl(ByteBuffer buffer) throws IOException {
- storageGroup = BasicStructureSerDeUtil.readString(buffer);
+ database = BasicStructureSerDeUtil.readString(buffer);
dataReplicationFactor = buffer.getInt();
}
@@ -70,12 +70,11 @@ public class SetDataReplicationFactorPlan extends ConfigPhysicalPlan {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
SetDataReplicationFactorPlan that = (SetDataReplicationFactorPlan) o;
- return dataReplicationFactor == that.dataReplicationFactor
- && storageGroup.equals(that.storageGroup);
+ return dataReplicationFactor == that.dataReplicationFactor && database.equals(that.database);
}
@Override
public int hashCode() {
- return Objects.hash(storageGroup, dataReplicationFactor);
+ return Objects.hash(database, dataReplicationFactor);
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetSchemaReplicationFactorPlan.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetSchemaReplicationFactorPlan.java
index f20b2127e2..84718d985c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetSchemaReplicationFactorPlan.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetSchemaReplicationFactorPlan.java
@@ -29,7 +29,7 @@ import java.util.Objects;
public class SetSchemaReplicationFactorPlan extends ConfigPhysicalPlan {
- private String storageGroup;
+ private String database;
private int schemaReplicationFactor;
@@ -37,14 +37,14 @@ public class SetSchemaReplicationFactorPlan extends ConfigPhysicalPlan {
super(ConfigPhysicalPlanType.SetSchemaReplicationFactor);
}
- public SetSchemaReplicationFactorPlan(String storageGroup, int schemaReplicationFactor) {
+ public SetSchemaReplicationFactorPlan(String database, int schemaReplicationFactor) {
this();
- this.storageGroup = storageGroup;
+ this.database = database;
this.schemaReplicationFactor = schemaReplicationFactor;
}
- public String getStorageGroup() {
- return storageGroup;
+ public String getDatabase() {
+ return database;
}
public int getSchemaReplicationFactor() {
@@ -55,13 +55,13 @@ public class SetSchemaReplicationFactorPlan extends ConfigPhysicalPlan {
protected void serializeImpl(DataOutputStream stream) throws IOException {
stream.writeShort(getType().getPlanType());
- BasicStructureSerDeUtil.write(storageGroup, stream);
+ BasicStructureSerDeUtil.write(database, stream);
stream.writeInt(schemaReplicationFactor);
}
@Override
protected void deserializeImpl(ByteBuffer buffer) throws IOException {
- storageGroup = BasicStructureSerDeUtil.readString(buffer);
+ database = BasicStructureSerDeUtil.readString(buffer);
schemaReplicationFactor = buffer.getInt();
}
@@ -71,11 +71,11 @@ public class SetSchemaReplicationFactorPlan extends ConfigPhysicalPlan {
if (o == null || getClass() != o.getClass()) return false;
SetSchemaReplicationFactorPlan that = (SetSchemaReplicationFactorPlan) o;
return schemaReplicationFactor == that.schemaReplicationFactor
- && storageGroup.equals(that.storageGroup);
+ && database.equals(that.database);
}
@Override
public int hashCode() {
- return Objects.hash(storageGroup, schemaReplicationFactor);
+ return Objects.hash(database, schemaReplicationFactor);
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetTTLPlan.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetTTLPlan.java
index 2f9670b278..2dd0e17cf0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetTTLPlan.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/SetTTLPlan.java
@@ -31,7 +31,7 @@ import java.util.Objects;
public class SetTTLPlan extends ConfigPhysicalPlan {
- private String[] storageGroupPathPattern;
+ private String[] databasePathPattern;
private long TTL;
@@ -39,14 +39,14 @@ public class SetTTLPlan extends ConfigPhysicalPlan {
super(ConfigPhysicalPlanType.SetTTL);
}
- public SetTTLPlan(List<String> storageGroupPathPattern, long TTL) {
+ public SetTTLPlan(List<String> databasePathPattern, long TTL) {
this();
- this.storageGroupPathPattern = storageGroupPathPattern.toArray(new String[0]);
+ this.databasePathPattern = databasePathPattern.toArray(new String[0]);
this.TTL = TTL;
}
- public String[] getStorageGroupPathPattern() {
- return storageGroupPathPattern;
+ public String[] getDatabasePathPattern() {
+ return databasePathPattern;
}
public long getTTL() {
@@ -57,8 +57,8 @@ public class SetTTLPlan extends ConfigPhysicalPlan {
protected void serializeImpl(DataOutputStream stream) throws IOException {
stream.writeShort(getType().getPlanType());
- stream.writeInt(storageGroupPathPattern.length);
- for (String node : storageGroupPathPattern) {
+ stream.writeInt(databasePathPattern.length);
+ for (String node : databasePathPattern) {
BasicStructureSerDeUtil.write(node, stream);
}
stream.writeLong(TTL);
@@ -68,9 +68,9 @@ public class SetTTLPlan extends ConfigPhysicalPlan {
protected void deserializeImpl(ByteBuffer buffer) throws IOException {
int length = buffer.getInt();
- storageGroupPathPattern = new String[length];
+ databasePathPattern = new String[length];
for (int i = 0; i < length; i++) {
- storageGroupPathPattern[i] = BasicStructureSerDeUtil.readString(buffer);
+ databasePathPattern[i] = BasicStructureSerDeUtil.readString(buffer);
}
TTL = buffer.getLong();
}
@@ -81,11 +81,11 @@ public class SetTTLPlan extends ConfigPhysicalPlan {
if (o == null || getClass() != o.getClass()) return false;
SetTTLPlan setTTLPlan = (SetTTLPlan) o;
return TTL == setTTLPlan.TTL
- && Arrays.equals(this.storageGroupPathPattern, setTTLPlan.storageGroupPathPattern);
+ && Arrays.equals(this.databasePathPattern, setTTLPlan.databasePathPattern);
}
@Override
public int hashCode() {
- return Objects.hash(storageGroupPathPattern, TTL);
+ return Objects.hash(databasePathPattern, TTL);
}
}
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 1d949a621e..c01d6470a9 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
@@ -130,7 +130,7 @@ public class ClusterSchemaManager {
}
try {
- clusterSchemaInfo.checkContainsStorageGroup(databaseSchemaPlan.getSchema().getName());
+ clusterSchemaInfo.checkContainsDatabase(databaseSchemaPlan.getSchema().getName());
} catch (MetadataException metadataException) {
// Reject if StorageGroup already set
if (metadataException instanceof IllegalPathException) {
@@ -312,13 +312,12 @@ public class ClusterSchemaManager {
public TSStatus setTTL(SetTTLPlan setTTLPlan) {
Map<String, TDatabaseSchema> storageSchemaMap =
- clusterSchemaInfo.getMatchedStorageGroupSchemasByOneName(
- setTTLPlan.getStorageGroupPathPattern());
+ clusterSchemaInfo.getMatchedDatabaseSchemasByOneName(setTTLPlan.getDatabasePathPattern());
if (storageSchemaMap.isEmpty()) {
return RpcUtils.getStatus(
TSStatusCode.DATABASE_NOT_EXIST,
- "Path [" + new PartialPath(setTTLPlan.getStorageGroupPathPattern()) + "] does not exist");
+ "Path [" + new PartialPath(setTTLPlan.getDatabasePathPattern()) + "] does not exist");
}
// Map<DataNodeId, TDataNodeLocation>
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 20c5b25f87..c010515280 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
@@ -127,14 +127,14 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
TSStatus result = new TSStatus();
databaseReadWriteLock.writeLock().lock();
try {
- // Set StorageGroup
+ // Set Database
TDatabaseSchema storageGroupSchema = plan.getSchema();
PartialPath partialPathName = new PartialPath(storageGroupSchema.getName());
mTree.setStorageGroup(partialPathName);
- // Set StorageGroupSchema
+ // Set DatabaseSchema
mTree
- .getStorageGroupNodeByStorageGroupPath(partialPathName)
+ .getDatabaseNodeByDatabasePath(partialPathName)
.setStorageGroupSchema(storageGroupSchema);
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
@@ -161,7 +161,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
PartialPath partialPathName = new PartialPath(alterSchema.getName());
TDatabaseSchema currentSchema =
- mTree.getStorageGroupNodeByStorageGroupPath(partialPathName).getStorageGroupSchema();
+ mTree.getDatabaseNodeByDatabasePath(partialPathName).getStorageGroupSchema();
// TODO: Support alter other fields
if (alterSchema.isSetMinSchemaRegionGroupNum()) {
currentSchema.setMinSchemaRegionGroupNum(alterSchema.getMinSchemaRegionGroupNum());
@@ -194,9 +194,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
currentSchema.getMaxDataRegionGroupNum());
}
- mTree
- .getStorageGroupNodeByStorageGroupPath(partialPathName)
- .setStorageGroupSchema(currentSchema);
+ mTree.getDatabaseNodeByDatabasePath(partialPathName).setStorageGroupSchema(currentSchema);
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
} catch (MetadataException e) {
LOGGER.error(ERROR_NAME, e);
@@ -208,19 +206,19 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
}
/**
- * Delete StorageGroup
+ * Delete Database
*
- * @param plan DeleteStorageGroupPlan
+ * @param plan DeleteDatabasePlan
* @return SUCCESS_STATUS
*/
public TSStatus deleteDatabase(DeleteDatabasePlan plan) {
TSStatus result = new TSStatus();
databaseReadWriteLock.writeLock().lock();
try {
- // Delete StorageGroup
+ // Delete Database
String storageGroup = plan.getName();
PartialPath partialPathName = new PartialPath(storageGroup);
- mTree.deleteStorageGroup(partialPathName);
+ mTree.deleteDatabase(partialPathName);
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
} catch (MetadataException e) {
@@ -240,7 +238,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
databaseReadWriteLock.readLock().lock();
try {
PartialPath patternPath = new PartialPath(plan.getStorageGroupPattern());
- result.setCount(mTree.getStorageGroupNum(patternPath, false));
+ result.setCount(mTree.getDatabaseNum(patternPath, false));
result.setStatus(new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()));
} catch (MetadataException e) {
LOGGER.error(ERROR_NAME, e);
@@ -253,18 +251,17 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
return result;
}
- /** @return All StorageGroupSchemas that matches to the specific StorageGroup pattern */
+ /** @return All DatabaseSchemas that matches to the specific Database pattern */
public DatabaseSchemaResp getMatchedDatabaseSchemas(GetDatabasePlan plan) {
DatabaseSchemaResp result = new DatabaseSchemaResp();
databaseReadWriteLock.readLock().lock();
try {
Map<String, TDatabaseSchema> schemaMap = new HashMap<>();
PartialPath patternPath = new PartialPath(plan.getStorageGroupPattern());
- List<PartialPath> matchedPaths = mTree.getMatchedStorageGroups(patternPath, false);
+ List<PartialPath> matchedPaths = mTree.getMatchedDatabases(patternPath, false);
for (PartialPath path : matchedPaths) {
schemaMap.put(
- path.getFullPath(),
- mTree.getStorageGroupNodeByStorageGroupPath(path).getStorageGroupSchema());
+ path.getFullPath(), mTree.getDatabaseNodeByDatabasePath(path).getStorageGroupSchema());
}
result.setSchemaMap(schemaMap);
result.setStatus(new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()));
@@ -283,14 +280,11 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
TSStatus result = new TSStatus();
databaseReadWriteLock.writeLock().lock();
try {
- PartialPath patternPath = new PartialPath(plan.getStorageGroupPathPattern());
- List<PartialPath> matchedPaths = mTree.getBelongedStorageGroups(patternPath);
+ PartialPath patternPath = new PartialPath(plan.getDatabasePathPattern());
+ List<PartialPath> matchedPaths = mTree.getBelongedDatabases(patternPath);
if (!matchedPaths.isEmpty()) {
for (PartialPath path : matchedPaths) {
- mTree
- .getStorageGroupNodeByStorageGroupPath(path)
- .getStorageGroupSchema()
- .setTTL(plan.getTTL());
+ mTree.getDatabaseNodeByDatabasePath(path).getStorageGroupSchema().setTTL(plan.getTTL());
}
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
} else {
@@ -310,10 +304,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
TSStatus result = new TSStatus();
databaseReadWriteLock.writeLock().lock();
try {
- PartialPath path = new PartialPath(plan.getStorageGroup());
- if (mTree.isStorageGroupAlreadySet(path)) {
+ PartialPath path = new PartialPath(plan.getDatabase());
+ if (mTree.isDatabaseAlreadySet(path)) {
mTree
- .getStorageGroupNodeByStorageGroupPath(path)
+ .getDatabaseNodeByDatabasePath(path)
.getStorageGroupSchema()
.setSchemaReplicationFactor(plan.getSchemaReplicationFactor());
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
@@ -333,10 +327,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
TSStatus result = new TSStatus();
databaseReadWriteLock.writeLock().lock();
try {
- PartialPath path = new PartialPath(plan.getStorageGroup());
- if (mTree.isStorageGroupAlreadySet(path)) {
+ PartialPath path = new PartialPath(plan.getDatabase());
+ if (mTree.isDatabaseAlreadySet(path)) {
mTree
- .getStorageGroupNodeByStorageGroupPath(path)
+ .getDatabaseNodeByDatabasePath(path)
.getStorageGroupSchema()
.setDataReplicationFactor(plan.getDataReplicationFactor());
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
@@ -357,9 +351,9 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
databaseReadWriteLock.writeLock().lock();
try {
PartialPath path = new PartialPath(plan.getStorageGroup());
- if (mTree.isStorageGroupAlreadySet(path)) {
+ if (mTree.isDatabaseAlreadySet(path)) {
mTree
- .getStorageGroupNodeByStorageGroupPath(path)
+ .getDatabaseNodeByDatabasePath(path)
.getStorageGroupSchema()
.setTimePartitionInterval(plan.getTimePartitionInterval());
result.setCode(TSStatusCode.SUCCESS_STATUS.getStatusCode());
@@ -389,7 +383,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
plan.getMaxRegionGroupNumMap().entrySet()) {
PartialPath path = new PartialPath(entry.getKey());
TDatabaseSchema storageGroupSchema =
- mTree.getStorageGroupNodeByStorageGroupPath(path).getStorageGroupSchema();
+ mTree.getDatabaseNodeByDatabasePath(path).getStorageGroupSchema();
storageGroupSchema.setMaxSchemaRegionGroupNum(entry.getValue().getLeft());
storageGroupSchema.setMaxDataRegionGroupNum(entry.getValue().getRight());
}
@@ -410,13 +404,13 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
/**
* Only leader use this interface.
*
- * @return List<StorageGroupName>, all Databases' name
+ * @return List<DatabaseName>, all Databases' name
*/
public List<String> getDatabaseNames() {
List<String> databases = new ArrayList<>();
databaseReadWriteLock.readLock().lock();
try {
- List<PartialPath> namePaths = mTree.getAllStorageGroupPaths();
+ List<PartialPath> namePaths = mTree.getAllDatabasePaths();
for (PartialPath path : namePaths) {
databases.add(path.getFullPath());
}
@@ -435,53 +429,51 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
public boolean isDatabaseExisted(String databaseName) throws IllegalPathException {
databaseReadWriteLock.readLock().lock();
try {
- return mTree.isStorageGroupAlreadySet(new PartialPath(databaseName));
+ return mTree.isDatabaseAlreadySet(new PartialPath(databaseName));
} finally {
databaseReadWriteLock.readLock().unlock();
}
}
/**
- * Only leader use this interface. Check if the specific StorageGroup already exists.
+ * Only leader use this interface. Check if the specific Database already exists.
*
- * @param storageName The specific StorageGroup's name
- * @throws MetadataException If the specific StorageGroup already exists
+ * @param databaseName The specific Database's name
+ * @throws MetadataException If the specific Database already exists
*/
- public void checkContainsStorageGroup(String storageName) throws MetadataException {
+ public void checkContainsDatabase(String databaseName) throws MetadataException {
databaseReadWriteLock.readLock().lock();
try {
- mTree.checkStorageGroupAlreadySet(new PartialPath(storageName));
+ mTree.checkDatabaseAlreadySet(new PartialPath(databaseName));
} finally {
databaseReadWriteLock.readLock().unlock();
}
}
/**
- * Only leader use this interface. Get the specific StorageGroupSchema
+ * Only leader use this interface. Get the specific DatabaseSchema
*
- * @param storageGroup StorageGroupName
- * @return The specific StorageGroupSchema
- * @throws DatabaseNotExistsException When the specific StorageGroup doesn't exist
+ * @param database DatabaseName
+ * @return The specific DatabaseSchema
+ * @throws DatabaseNotExistsException When the specific Database doesn't exist
*/
- public TDatabaseSchema getMatchedDatabaseSchemaByName(String storageGroup)
+ public TDatabaseSchema getMatchedDatabaseSchemaByName(String database)
throws DatabaseNotExistsException {
databaseReadWriteLock.readLock().lock();
try {
- return mTree
- .getStorageGroupNodeByStorageGroupPath(new PartialPath(storageGroup))
- .getStorageGroupSchema();
+ return mTree.getDatabaseNodeByDatabasePath(new PartialPath(database)).getStorageGroupSchema();
} catch (MetadataException e) {
- throw new DatabaseNotExistsException(storageGroup);
+ throw new DatabaseNotExistsException(database);
} finally {
databaseReadWriteLock.readLock().unlock();
}
}
/**
- * Only leader use this interface. Get the matched StorageGroupSchemas.
+ * Only leader use this interface. Get the matched DatabaseSchemas.
*
- * @param rawPathList StorageGroups' path patterns or full paths
- * @return All StorageGroupSchemas that matches to the specific StorageGroup patterns
+ * @param rawPathList Databases' path patterns or full paths
+ * @return All DatabaseSchemas that matches to the specific Database patterns
*/
public Map<String, TDatabaseSchema> getMatchedDatabaseSchemasByName(List<String> rawPathList) {
Map<String, TDatabaseSchema> schemaMap = new HashMap<>();
@@ -489,10 +481,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
try {
for (String rawPath : rawPathList) {
PartialPath patternPath = new PartialPath(rawPath);
- List<PartialPath> matchedPaths = mTree.getMatchedStorageGroups(patternPath, false);
+ List<PartialPath> matchedPaths = mTree.getMatchedDatabases(patternPath, false);
for (PartialPath path : matchedPaths) {
schemaMap.put(
- path.getFullPath(), mTree.getStorageGroupNodeByPath(path).getStorageGroupSchema());
+ path.getFullPath(), mTree.getDatabaseNodeByPath(path).getStorageGroupSchema());
}
}
} catch (MetadataException e) {
@@ -515,7 +507,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
try {
PartialPath path = new PartialPath(database);
TDatabaseSchema storageGroupSchema =
- mTree.getStorageGroupNodeByStorageGroupPath(path).getStorageGroupSchema();
+ mTree.getDatabaseNodeByDatabasePath(path).getStorageGroupSchema();
switch (consensusGroupType) {
case SchemaRegion:
return storageGroupSchema.getMinSchemaRegionGroupNum();
@@ -543,7 +535,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
try {
PartialPath path = new PartialPath(database);
TDatabaseSchema storageGroupSchema =
- mTree.getStorageGroupNodeByStorageGroupPath(path).getStorageGroupSchema();
+ mTree.getDatabaseNodeByDatabasePath(path).getStorageGroupSchema();
switch (consensusGroupType) {
case SchemaRegion:
return storageGroupSchema.getMaxSchemaRegionGroupNum();
@@ -869,16 +861,16 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
}
}
- public Map<String, TDatabaseSchema> getMatchedStorageGroupSchemasByOneName(
- String[] storageGroupPathPattern) {
+ public Map<String, TDatabaseSchema> getMatchedDatabaseSchemasByOneName(
+ String[] databasePathPattern) {
Map<String, TDatabaseSchema> schemaMap = new HashMap<>();
databaseReadWriteLock.readLock().lock();
try {
- PartialPath patternPath = new PartialPath(storageGroupPathPattern);
- List<PartialPath> matchedPaths = mTree.getBelongedStorageGroups(patternPath);
+ PartialPath patternPath = new PartialPath(databasePathPattern);
+ List<PartialPath> matchedPaths = mTree.getBelongedDatabases(patternPath);
for (PartialPath path : matchedPaths) {
schemaMap.put(
- path.getFullPath(), mTree.getStorageGroupNodeByPath(path).getStorageGroupSchema());
+ path.getFullPath(), mTree.getDatabaseNodeByPath(path).getStorageGroupSchema());
}
} catch (MetadataException e) {
LOGGER.warn(ERROR_NAME, e);
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 91b7ff03e2..e427680ade 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
@@ -35,7 +35,7 @@ import org.apache.iotdb.db.metadata.mnode.StorageGroupMNode;
import org.apache.iotdb.db.metadata.mnode.iterator.IMNodeIterator;
import org.apache.iotdb.db.metadata.mtree.store.MemMTreeStore;
import org.apache.iotdb.db.metadata.mtree.traverser.collector.DatabaseCollector;
-import org.apache.iotdb.db.metadata.mtree.traverser.collector.MNodeAboveSGCollector;
+import org.apache.iotdb.db.metadata.mtree.traverser.collector.MNodeAboveDBCollector;
import org.apache.iotdb.db.metadata.mtree.traverser.collector.MNodeCollector;
import org.apache.iotdb.db.metadata.mtree.traverser.counter.DatabaseCounter;
import org.apache.iotdb.db.metadata.utils.MetaFormatUtils;
@@ -99,7 +99,7 @@ public class ConfigMTree {
*/
public void setStorageGroup(PartialPath path) throws MetadataException {
String[] nodeNames = path.getNodes();
- MetaFormatUtils.checkStorageGroup(path.getFullPath());
+ MetaFormatUtils.checkDatabase(path.getFullPath());
if (nodeNames.length <= 1 || !nodeNames[0].equals(root.getName())) {
throw new IllegalPathException(path.getFullPath());
}
@@ -143,8 +143,8 @@ public class ConfigMTree {
}
/** Delete a database */
- public void deleteStorageGroup(PartialPath path) throws MetadataException {
- IStorageGroupMNode storageGroupMNode = getStorageGroupNodeByStorageGroupPath(path);
+ public void deleteDatabase(PartialPath path) throws MetadataException {
+ IStorageGroupMNode storageGroupMNode = getDatabaseNodeByDatabasePath(path);
IMNode cur = storageGroupMNode.getParent();
// Suppose current system has root.a.b.sg1, root.a.sg2, and delete root.a.b.sg1
// delete the database node sg1
@@ -167,9 +167,8 @@ public class ConfigMTree {
* @param pathPattern a path pattern or a full path
* @return a list contains all databases related to given path
*/
- public List<PartialPath> getBelongedStorageGroups(PartialPath pathPattern)
- throws MetadataException {
- return collectStorageGroups(pathPattern, false, true);
+ public List<PartialPath> getBelongedDatabases(PartialPath pathPattern) throws MetadataException {
+ return collectDatabases(pathPattern, false, true);
}
/**
@@ -181,12 +180,12 @@ public class ConfigMTree {
* @param isPrefixMatch if true, the path pattern is used to match prefix path
* @return a list contains all database names under given path pattern
*/
- public List<PartialPath> getMatchedStorageGroups(PartialPath pathPattern, boolean isPrefixMatch)
+ public List<PartialPath> getMatchedDatabases(PartialPath pathPattern, boolean isPrefixMatch)
throws MetadataException {
- return collectStorageGroups(pathPattern, isPrefixMatch, false);
+ return collectDatabases(pathPattern, isPrefixMatch, false);
}
- private List<PartialPath> collectStorageGroups(
+ private List<PartialPath> collectDatabases(
PartialPath pathPattern, boolean isPrefixMatch, boolean collectInternal)
throws MetadataException {
List<PartialPath> result = new LinkedList<>();
@@ -208,7 +207,7 @@ public class ConfigMTree {
*
* @return a list contains all distinct databases
*/
- public List<PartialPath> getAllStorageGroupPaths() {
+ public List<PartialPath> getAllDatabasePaths() {
List<PartialPath> res = new ArrayList<>();
Deque<IMNode> nodeStack = new ArrayDeque<>();
nodeStack.add(root);
@@ -230,7 +229,7 @@ public class ConfigMTree {
* @param pathPattern a path pattern or a full path, may contain wildcard.
* @param isPrefixMatch if true, the path pattern is used to match prefix path
*/
- public int getStorageGroupNum(PartialPath pathPattern, boolean isPrefixMatch)
+ public int getDatabaseNum(PartialPath pathPattern, boolean isPrefixMatch)
throws MetadataException {
try (DatabaseCounter counter = new DatabaseCounter(root, pathPattern, store, isPrefixMatch)) {
return (int) counter.count();
@@ -240,7 +239,7 @@ public class ConfigMTree {
/**
* E.g., root.sg is database given [root, sg], if the give path is not a database, throw exception
*/
- public IStorageGroupMNode getStorageGroupNodeByStorageGroupPath(PartialPath storageGroupPath)
+ public IStorageGroupMNode getDatabaseNodeByDatabasePath(PartialPath storageGroupPath)
throws MetadataException {
String[] nodes = storageGroupPath.getNodes();
if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
@@ -273,7 +272,7 @@ public class ConfigMTree {
* device], return the MNode of root.sg Get database node, the give path don't need to be database
* path.
*/
- public IStorageGroupMNode getStorageGroupNodeByPath(PartialPath path) throws MetadataException {
+ public IStorageGroupMNode getDatabaseNodeByPath(PartialPath path) throws MetadataException {
String[] nodes = path.getNodes();
if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
throw new IllegalPathException(path.getFullPath());
@@ -297,7 +296,7 @@ public class ConfigMTree {
*
* @param path a full path or a prefix path
*/
- public boolean isStorageGroupAlreadySet(PartialPath path) {
+ public boolean isDatabaseAlreadySet(PartialPath path) {
String[] nodeNames = path.getNodes();
IMNode cur = root;
if (!nodeNames[0].equals(root.getName())) {
@@ -321,7 +320,7 @@ public class ConfigMTree {
*
* @param path a full path or a prefix path
*/
- public void checkStorageGroupAlreadySet(PartialPath path) throws DatabaseAlreadySetException {
+ public void checkDatabaseAlreadySet(PartialPath path) throws DatabaseAlreadySetException {
String[] nodeNames = path.getNodes();
IMNode cur = root;
if (!nodeNames[0].equals(root.getName())) {
@@ -372,8 +371,8 @@ public class ConfigMTree {
public Pair<List<PartialPath>, Set<PartialPath>> getNodesListInGivenLevel(
PartialPath pathPattern, int nodeLevel, boolean isPrefixMatch) throws MetadataException {
List<PartialPath> result = new LinkedList<>();
- try (MNodeAboveSGCollector<?> collector =
- new MNodeAboveSGCollector<Void>(root, pathPattern, store, isPrefixMatch) {
+ try (MNodeAboveDBCollector<?> collector =
+ new MNodeAboveDBCollector<Void>(root, pathPattern, store, isPrefixMatch) {
@Override
protected Void collectMNode(IMNode node) {
result.add(getPartialPathFromRootToNode(node));
@@ -383,7 +382,7 @@ public class ConfigMTree {
collector.setTargetLevel(nodeLevel);
collector.traverse();
- return new Pair<>(result, collector.getInvolvedStorageGroupMNodes());
+ return new Pair<>(result, collector.getInvolvedDatabaseMNodes());
}
}
@@ -403,8 +402,8 @@ public class ConfigMTree {
public Pair<Set<TSchemaNode>, Set<PartialPath>> getChildNodePathInNextLevel(
PartialPath pathPattern) throws MetadataException {
Set<TSchemaNode> result = new TreeSet<>();
- try (MNodeAboveSGCollector<?> collector =
- new MNodeAboveSGCollector<Void>(
+ try (MNodeAboveDBCollector<?> collector =
+ new MNodeAboveDBCollector<Void>(
root, pathPattern.concatNode(ONE_LEVEL_PATH_WILDCARD), store, false) {
@Override
protected Void collectMNode(IMNode node) {
@@ -416,7 +415,7 @@ public class ConfigMTree {
}
}) {
collector.traverse();
- return new Pair<>(result, collector.getInvolvedStorageGroupMNodes());
+ return new Pair<>(result, collector.getInvolvedDatabaseMNodes());
} catch (IllegalPathException e) {
throw new IllegalPathException(pathPattern.getFullPath());
}
@@ -644,7 +643,7 @@ public class ConfigMTree {
InternalMNode internalMNode;
if (type == STORAGE_GROUP_MNODE_TYPE) {
- storageGroupMNode = deserializeStorageGroupMNode(inputStream);
+ storageGroupMNode = deserializeDatabaseMNode(inputStream);
name = storageGroupMNode.getName();
stack.push(new Pair<>(storageGroupMNode, true));
} else {
@@ -670,7 +669,7 @@ public class ConfigMTree {
name = internalMNode.getName();
break;
case STORAGE_GROUP_MNODE_TYPE:
- storageGroupMNode = deserializeStorageGroupMNode(inputStream);
+ storageGroupMNode = deserializeDatabaseMNode(inputStream);
childNum = 0;
while (!stack.isEmpty() && !stack.peek().right) {
storageGroupMNode.addChild(stack.pop().left);
@@ -692,8 +691,7 @@ public class ConfigMTree {
return internalMNode;
}
- private StorageGroupMNode deserializeStorageGroupMNode(InputStream inputStream)
- throws IOException {
+ private StorageGroupMNode deserializeDatabaseMNode(InputStream inputStream) throws IOException {
StorageGroupMNode storageGroupMNode =
new StorageGroupMNode(null, ReadWriteIOUtils.readString(inputStream));
storageGroupMNode.setSchemaTemplateId(ReadWriteIOUtils.readInt(inputStream));
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java
index 769f01162c..a3273f7252 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java
@@ -542,7 +542,7 @@ public class CachedMTreeStore implements IMTreeStore {
IStorageGroupMNode updatedStorageGroupMNode = cacheManager.collectUpdatedStorageGroupMNodes();
if (updatedStorageGroupMNode != null) {
try {
- file.updateStorageGroupNode(updatedStorageGroupMNode);
+ file.updateDatabaseNode(updatedStorageGroupMNode);
} catch (IOException e) {
logger.error(
"IOException occurred during updating StorageGroupMNode {}",
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java
index f44dce93bd..93bf6426a2 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/ISchemaFile.java
@@ -41,7 +41,7 @@ public interface ISchemaFile {
* @param sgNode node to be updated
* @return true if success
*/
- boolean updateStorageGroupNode(IStorageGroupMNode sgNode) throws IOException;
+ boolean updateDatabaseNode(IStorageGroupMNode sgNode) throws IOException;
/**
* Only database node along with its descendents could be flushed into schema file.
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
index 0b3f6bd8c0..618534e16f 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
@@ -66,7 +66,7 @@ public class MockSchemaFile implements ISchemaFile {
}
@Override
- public boolean updateStorageGroupNode(IStorageGroupMNode sgNode) throws IOException {
+ public boolean updateDatabaseNode(IStorageGroupMNode sgNode) throws IOException {
this.storageGroupMNode = cloneMNode(sgNode).getAsStorageGroupMNode();
return true;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
index 5d8445e367..212e81dc61 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
@@ -189,7 +189,7 @@ public class SchemaFile implements ISchemaFile {
}
@Override
- public boolean updateStorageGroupNode(IStorageGroupMNode sgNode) throws IOException {
+ public boolean updateDatabaseNode(IStorageGroupMNode sgNode) throws IOException {
this.dataTTL = sgNode.getDataTTL();
this.isEntity = sgNode.isEntity();
this.sgNodeTemplateIdWithState = sgNode.getSchemaTemplateIdWithState();
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveSGCollector.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveDBCollector.java
similarity index 79%
rename from server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveSGCollector.java
rename to server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveDBCollector.java
index 06ae88d87b..5a996ce885 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveSGCollector.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveDBCollector.java
@@ -26,11 +26,11 @@ import org.apache.iotdb.db.metadata.mtree.store.IMTreeStore;
import java.util.HashSet;
import java.util.Set;
-public abstract class MNodeAboveSGCollector<T> extends MNodeCollector<T> {
+public abstract class MNodeAboveDBCollector<T> extends MNodeCollector<T> {
- protected Set<PartialPath> involvedStorageGroupMNodes = new HashSet<>();
+ protected Set<PartialPath> involvedDatabaseMNodes = new HashSet<>();
- protected MNodeAboveSGCollector(
+ protected MNodeAboveDBCollector(
IMNode startNode, PartialPath path, IMTreeStore store, boolean isPrefixMatch)
throws MetadataException {
super(startNode, path, store, isPrefixMatch);
@@ -39,7 +39,7 @@ public abstract class MNodeAboveSGCollector<T> extends MNodeCollector<T> {
@Override
protected boolean shouldVisitSubtreeOfFullMatchedNode(IMNode node) {
if (node.isStorageGroup()) {
- involvedStorageGroupMNodes.add(getParentPartialPath().concatNode(node.getName()));
+ involvedDatabaseMNodes.add(getParentPartialPath().concatNode(node.getName()));
return false;
} else {
return super.shouldVisitSubtreeOfFullMatchedNode(node);
@@ -49,14 +49,14 @@ public abstract class MNodeAboveSGCollector<T> extends MNodeCollector<T> {
@Override
protected boolean shouldVisitSubtreeOfInternalMatchedNode(IMNode node) {
if (node.isStorageGroup()) {
- involvedStorageGroupMNodes.add(getParentPartialPath().concatNode(node.getName()));
+ involvedDatabaseMNodes.add(getParentPartialPath().concatNode(node.getName()));
return false;
} else {
return super.shouldVisitSubtreeOfInternalMatchedNode(node);
}
}
- public Set<PartialPath> getInvolvedStorageGroupMNodes() {
- return involvedStorageGroupMNodes;
+ public Set<PartialPath> getInvolvedDatabaseMNodes() {
+ return involvedDatabaseMNodes;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaFormatUtils.java b/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaFormatUtils.java
index c0bce78174..2e0826c980 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaFormatUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaFormatUtils.java
@@ -101,13 +101,12 @@ public class MetaFormatUtils {
}
}
- /** check whether the storageGroup name uses illegal characters */
- public static void checkStorageGroup(String storageGroup) throws IllegalPathException {
- if (!IoTDBConfig.STORAGE_GROUP_PATTERN.matcher(storageGroup).matches()) {
+ /** check whether the database name uses illegal characters */
+ public static void checkDatabase(String database) throws IllegalPathException {
+ if (!IoTDBConfig.STORAGE_GROUP_PATTERN.matcher(database).matches()) {
throw new IllegalPathException(
String.format(
- "The database name can only be characters, numbers and underscores. %s",
- storageGroup));
+ "The database name can only be characters, numbers and underscores. %s", database));
}
}
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 1d011aecbb..33bb1aec79 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
@@ -103,10 +103,10 @@ import org.apache.iotdb.db.mpp.plan.statement.internal.InternalCreateMultiTimeSe
import org.apache.iotdb.db.mpp.plan.statement.internal.InternalCreateTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.internal.SchemaFetchStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.AlterTimeSeriesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDevicesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountLevelTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountNodesStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateAlignedTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateMultiTimeSeriesStatement;
@@ -115,8 +115,8 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowChildNodesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowChildPathsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowClusterStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDevicesStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.ActivateTemplateStatement;
@@ -2191,7 +2191,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
for (PartialPath sgPath : sgSet) {
DatabaseSchemaStatement statement =
new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
- statement.setStorageGroupPath(sgPath);
+ statement.setDatabasePath(sgPath);
executeSetStorageGroupStatement(statement);
}
}
@@ -2380,11 +2380,11 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitShowStorageGroup(
- ShowStorageGroupStatement showStorageGroupStatement, MPPQueryContext context) {
+ ShowDatabaseStatement showDatabaseStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
- analysis.setStatement(showStorageGroupStatement);
+ analysis.setStatement(showDatabaseStatement);
analysis.setRespDatasetHeader(
- DatasetHeaderFactory.getShowStorageGroupHeader(showStorageGroupStatement.isDetailed()));
+ DatasetHeaderFactory.getShowStorageGroupHeader(showDatabaseStatement.isDetailed()));
return analysis;
}
@@ -2430,9 +2430,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
@Override
public Analysis visitCountStorageGroup(
- CountStorageGroupStatement countStorageGroupStatement, MPPQueryContext context) {
+ CountDatabaseStatement countDatabaseStatement, MPPQueryContext context) {
Analysis analysis = new Analysis();
- analysis.setStatement(countStorageGroupStatement);
+ analysis.setStatement(countDatabaseStatement);
analysis.setRespDatasetHeader(DatasetHeaderFactory.getCountStorageGroupHeader());
return analysis;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java
index 1a285e1d88..a0a0a8bf18 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.mpp.plan.execution.config;
-import org.apache.iotdb.db.mpp.plan.execution.config.metadata.CountStorageGroupTask;
+import org.apache.iotdb.db.mpp.plan.execution.config.metadata.CountDatabaseTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.CreateContinuousQueryTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.CreateFunctionTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.CreatePipePluginTask;
@@ -41,10 +41,10 @@ import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowConfigNodesTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowContinuousQueriesTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowDataNodesTask;
+import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowDatabaseTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowFunctionsTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowPipePluginsTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowRegionTask;
-import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowStorageGroupTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowTTLTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowTriggersTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowVariablesTask;
@@ -75,13 +75,13 @@ import org.apache.iotdb.db.mpp.plan.execution.config.sys.sync.ShowPipeSinkTask;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.db.mpp.plan.statement.StatementNode;
import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateFunctionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreatePipePluginStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DropContinuousQueryStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DropFunctionStatement;
@@ -96,10 +96,10 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowClusterStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowConfigNodesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowContinuousQueriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDataNodesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowFunctionsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowPipePluginsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowRegionStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTriggersStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowVariablesStatement;
@@ -155,20 +155,18 @@ public class ConfigTaskVisitor
@Override
public IConfigTask visitDeleteStorageGroup(
- DeleteStorageGroupStatement statement, TaskContext context) {
+ DeleteDatabaseStatement statement, TaskContext context) {
return new DeleteStorageGroupTask(statement);
}
@Override
- public IConfigTask visitShowStorageGroup(
- ShowStorageGroupStatement statement, TaskContext context) {
- return new ShowStorageGroupTask(statement);
+ public IConfigTask visitShowStorageGroup(ShowDatabaseStatement statement, TaskContext context) {
+ return new ShowDatabaseTask(statement);
}
@Override
- public IConfigTask visitCountStorageGroup(
- CountStorageGroupStatement statement, TaskContext context) {
- return new CountStorageGroupTask(statement);
+ public IConfigTask visitCountStorageGroup(CountDatabaseStatement statement, TaskContext context) {
+ return new CountDatabaseTask(statement);
}
@Override
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 48c4b5a4cb..720f4b519f 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
@@ -91,7 +91,7 @@ import org.apache.iotdb.db.metadata.template.ClusterTemplateManager;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.db.mpp.plan.analyze.Analyzer;
import org.apache.iotdb.db.mpp.plan.execution.config.ConfigTaskResult;
-import org.apache.iotdb.db.mpp.plan.execution.config.metadata.CountStorageGroupTask;
+import org.apache.iotdb.db.mpp.plan.execution.config.metadata.CountDatabaseTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.DatabaseSchemaTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.GetRegionIdTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.GetSeriesSlotListTask;
@@ -112,13 +112,13 @@ import org.apache.iotdb.db.mpp.plan.execution.config.metadata.template.ShowPathS
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.template.ShowSchemaTemplateTask;
import org.apache.iotdb.db.mpp.plan.execution.config.sys.pipe.ShowPipeTask;
import org.apache.iotdb.db.mpp.plan.execution.config.sys.sync.ShowPipeSinkTask;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateFunctionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreatePipePluginStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.GetRegionIdStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.GetSeriesSlotListStatement;
@@ -127,8 +127,8 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.MigrateRegionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.SetTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowClusterStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDataNodesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowRegionStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.DeactivateTemplateStatement;
@@ -214,17 +214,17 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
DatabaseSchemaStatement databaseSchemaStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
// Construct request using statement
- TDatabaseSchema storageGroupSchema =
- DatabaseSchemaTask.constructStorageGroupSchema(databaseSchemaStatement);
+ TDatabaseSchema databaseSchema =
+ DatabaseSchemaTask.constructDatabaseSchema(databaseSchemaStatement);
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
// Send request to some API server
- TSStatus tsStatus = configNodeClient.setDatabase(storageGroupSchema);
+ TSStatus tsStatus = configNodeClient.setDatabase(databaseSchema);
// Get response or throw exception
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
"Failed to execute create database {} in config node, status is {}.",
- databaseSchemaStatement.getStorageGroupPath(),
+ databaseSchemaStatement.getDatabasePath(),
tsStatus);
future.setException(new IoTDBException(tsStatus.message, tsStatus.code));
} else {
@@ -241,17 +241,17 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
DatabaseSchemaStatement databaseSchemaStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
// Construct request using statement
- TDatabaseSchema storageGroupSchema =
- DatabaseSchemaTask.constructStorageGroupSchema(databaseSchemaStatement);
+ TDatabaseSchema databaseSchema =
+ DatabaseSchemaTask.constructDatabaseSchema(databaseSchemaStatement);
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
// Send request to some API server
- TSStatus tsStatus = configNodeClient.alterDatabase(storageGroupSchema);
+ TSStatus tsStatus = configNodeClient.alterDatabase(databaseSchema);
// Get response or throw exception
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
"Failed to execute create database {} in config node, status is {}.",
- databaseSchemaStatement.getStorageGroupPath(),
+ databaseSchemaStatement.getDatabasePath(),
tsStatus);
future.setException(new IoTDBException(tsStatus.message, tsStatus.code));
} else {
@@ -264,18 +264,18 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
}
@Override
- public SettableFuture<ConfigTaskResult> showStorageGroup(
- ShowStorageGroupStatement showStorageGroupStatement) {
+ public SettableFuture<ConfigTaskResult> showDatabase(
+ ShowDatabaseStatement showDatabaseStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
// Construct request using statement
- List<String> storageGroupPathPattern =
- Arrays.asList(showStorageGroupStatement.getPathPattern().getNodes());
+ List<String> databasePathPattern =
+ Arrays.asList(showDatabaseStatement.getPathPattern().getNodes());
try (ConfigNodeClient client =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
// Send request to some API server
- TShowDatabaseResp resp = client.showDatabase(storageGroupPathPattern);
+ TShowDatabaseResp resp = client.showDatabase(databasePathPattern);
// build TSBlock
- showStorageGroupStatement.buildTSBlock(resp.getDatabaseInfoMap(), future);
+ showDatabaseStatement.buildTSBlock(resp.getDatabaseInfoMap(), future);
} catch (ClientManagerException | TException e) {
future.setException(e);
}
@@ -283,18 +283,18 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
}
@Override
- public SettableFuture<ConfigTaskResult> countStorageGroup(
- CountStorageGroupStatement countStorageGroupStatement) {
+ public SettableFuture<ConfigTaskResult> countDatabase(
+ CountDatabaseStatement countDatabaseStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
- int storageGroupNum;
- List<String> storageGroupPathPattern =
- Arrays.asList(countStorageGroupStatement.getPathPattern().getNodes());
+ int databaseNum;
+ List<String> databasePathPattern =
+ Arrays.asList(countDatabaseStatement.getPathPattern().getNodes());
try (ConfigNodeClient client =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
- TCountDatabaseResp resp = client.countMatchedDatabases(storageGroupPathPattern);
- storageGroupNum = resp.getCount();
+ TCountDatabaseResp resp = client.countMatchedDatabases(databasePathPattern);
+ databaseNum = resp.getCount();
// build TSBlock
- CountStorageGroupTask.buildTSBlock(storageGroupNum, future);
+ CountDatabaseTask.buildTSBlock(databaseNum, future);
} catch (ClientManagerException | TException e) {
future.setException(e);
}
@@ -302,17 +302,17 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
}
@Override
- public SettableFuture<ConfigTaskResult> deleteStorageGroup(
- DeleteStorageGroupStatement deleteStorageGroupStatement) {
+ public SettableFuture<ConfigTaskResult> deleteDatabase(
+ DeleteDatabaseStatement deleteDatabaseStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
- TDeleteDatabasesReq req = new TDeleteDatabasesReq(deleteStorageGroupStatement.getPrefixPath());
+ TDeleteDatabasesReq req = new TDeleteDatabasesReq(deleteDatabaseStatement.getPrefixPath());
try (ConfigNodeClient client =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
TSStatus tsStatus = client.deleteDatabases(req);
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
"Failed to execute delete database {} in config node, status is {}.",
- deleteStorageGroupStatement.getPrefixPath(),
+ deleteDatabaseStatement.getPrefixPath(),
tsStatus);
future.setException(new IoTDBException(tsStatus.getMessage(), tsStatus.getCode()));
} else {
@@ -828,9 +828,8 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
@Override
public SettableFuture<ConfigTaskResult> setTTL(SetTTLStatement setTTLStatement, String taskName) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
- List<String> storageGroupPathPattern =
- Arrays.asList(setTTLStatement.getStorageGroupPath().getNodes());
- TSetTTLReq setTTLReq = new TSetTTLReq(storageGroupPathPattern, setTTLStatement.getTTL());
+ List<String> databasePathPattern = Arrays.asList(setTTLStatement.getDatabasePath().getNodes());
+ TSetTTLReq setTTLReq = new TSetTTLReq(databasePathPattern, setTTLStatement.getTTL());
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
// Send request to some API server
@@ -840,7 +839,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
LOGGER.warn(
"Failed to execute {} {} in config node, status is {}.",
taskName,
- setTTLStatement.getStorageGroupPath(),
+ setTTLStatement.getDatabasePath(),
tsStatus);
future.setException(new IoTDBException(tsStatus.getMessage(), tsStatus.getCode()));
} else {
@@ -1069,23 +1068,23 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
@Override
public SettableFuture<ConfigTaskResult> showTTL(ShowTTLStatement showTTLStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
- List<PartialPath> storageGroupPaths = showTTLStatement.getPaths();
- Map<String, Long> storageGroupToTTL = new HashMap<>();
+ List<PartialPath> databasePaths = showTTLStatement.getPaths();
+ Map<String, Long> databaseToTTL = new HashMap<>();
try (ConfigNodeClient client =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
if (showTTLStatement.isAll()) {
List<String> allStorageGroupPathPattern = Arrays.asList("root", "**");
TDatabaseSchemaResp resp = client.getMatchedDatabaseSchemas(allStorageGroupPathPattern);
for (Map.Entry<String, TDatabaseSchema> entry : resp.getDatabaseSchemaMap().entrySet()) {
- storageGroupToTTL.put(entry.getKey(), entry.getValue().getTTL());
+ databaseToTTL.put(entry.getKey(), entry.getValue().getTTL());
}
} else {
- for (PartialPath storageGroupPath : storageGroupPaths) {
- List<String> storageGroupPathPattern = Arrays.asList(storageGroupPath.getNodes());
- TDatabaseSchemaResp resp = client.getMatchedDatabaseSchemas(storageGroupPathPattern);
+ for (PartialPath databasePath : databasePaths) {
+ List<String> databasePathPattern = Arrays.asList(databasePath.getNodes());
+ TDatabaseSchemaResp resp = client.getMatchedDatabaseSchemas(databasePathPattern);
for (Map.Entry<String, TDatabaseSchema> entry : resp.getDatabaseSchemaMap().entrySet()) {
- if (!storageGroupToTTL.containsKey(entry.getKey())) {
- storageGroupToTTL.put(entry.getKey(), entry.getValue().getTTL());
+ if (!databaseToTTL.containsKey(entry.getKey())) {
+ databaseToTTL.put(entry.getKey(), entry.getValue().getTTL());
}
}
}
@@ -1094,7 +1093,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
future.setException(e);
}
// build TSBlock
- ShowTTLTask.buildTSBlock(storageGroupToTTL, future);
+ ShowTTLTask.buildTSBlock(databaseToTTL, future);
return future;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/IConfigTaskExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/IConfigTaskExecutor.java
index 324d3902ec..f35fa0a84b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/IConfigTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/IConfigTaskExecutor.java
@@ -22,13 +22,13 @@ package org.apache.iotdb.db.mpp.plan.execution.config.executor;
import org.apache.iotdb.common.rpc.thrift.TFlushReq;
import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.db.mpp.plan.execution.config.ConfigTaskResult;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateFunctionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreatePipePluginStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.GetRegionIdStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.GetSeriesSlotListStatement;
@@ -37,8 +37,8 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.MigrateRegionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.SetTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowClusterStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDataNodesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowRegionStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.DeactivateTemplateStatement;
@@ -66,14 +66,11 @@ public interface IConfigTaskExecutor {
SettableFuture<ConfigTaskResult> alterDatabase(DatabaseSchemaStatement databaseSchemaStatement);
- SettableFuture<ConfigTaskResult> showStorageGroup(
- ShowStorageGroupStatement showStorageGroupStatement);
+ SettableFuture<ConfigTaskResult> showDatabase(ShowDatabaseStatement showDatabaseStatement);
- SettableFuture<ConfigTaskResult> countStorageGroup(
- CountStorageGroupStatement countStorageGroupStatement);
+ SettableFuture<ConfigTaskResult> countDatabase(CountDatabaseStatement countDatabaseStatement);
- SettableFuture<ConfigTaskResult> deleteStorageGroup(
- DeleteStorageGroupStatement deleteStorageGroupStatement);
+ SettableFuture<ConfigTaskResult> deleteDatabase(DeleteDatabaseStatement deleteDatabaseStatement);
SettableFuture<ConfigTaskResult> createFunction(CreateFunctionStatement createFunctionStatement);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/CountStorageGroupTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/CountDatabaseTask.java
similarity index 84%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/CountStorageGroupTask.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/CountDatabaseTask.java
index 9a9733a4ee..b188232626 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/CountStorageGroupTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/CountDatabaseTask.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
import org.apache.iotdb.db.mpp.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.mpp.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.mpp.plan.execution.config.executor.IConfigTaskExecutor;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
@@ -35,18 +35,18 @@ import com.google.common.util.concurrent.SettableFuture;
import java.util.Collections;
-public class CountStorageGroupTask implements IConfigTask {
+public class CountDatabaseTask implements IConfigTask {
- private final CountStorageGroupStatement countStorageGroupStatement;
+ private final CountDatabaseStatement countDatabaseStatement;
- public CountStorageGroupTask(CountStorageGroupStatement countStorageGroupStatement) {
- this.countStorageGroupStatement = countStorageGroupStatement;
+ public CountDatabaseTask(CountDatabaseStatement countDatabaseStatement) {
+ this.countDatabaseStatement = countDatabaseStatement;
}
@Override
public ListenableFuture<ConfigTaskResult> execute(IConfigTaskExecutor configTaskExecutor)
throws InterruptedException {
- return configTaskExecutor.countStorageGroup(countStorageGroupStatement);
+ return configTaskExecutor.countDatabase(countDatabaseStatement);
}
public static void buildTSBlock(int storageGroupNum, SettableFuture<ConfigTaskResult> future) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java
index ee431f4e34..10eb7b24bb 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java
@@ -49,32 +49,29 @@ public class DatabaseSchemaTask implements IConfigTask {
}
/** Construct DatabaseSchema according to statement */
- public static TDatabaseSchema constructStorageGroupSchema(
+ public static TDatabaseSchema constructDatabaseSchema(
DatabaseSchemaStatement databaseSchemaStatement) {
- TDatabaseSchema storageGroupSchema = new TDatabaseSchema();
- storageGroupSchema.setName(databaseSchemaStatement.getStorageGroupPath().getFullPath());
+ TDatabaseSchema databaseSchema = new TDatabaseSchema();
+ databaseSchema.setName(databaseSchemaStatement.getDatabasePath().getFullPath());
if (databaseSchemaStatement.getTTL() != null) {
- storageGroupSchema.setTTL(databaseSchemaStatement.getTTL());
+ databaseSchema.setTTL(databaseSchemaStatement.getTTL());
}
if (databaseSchemaStatement.getSchemaReplicationFactor() != null) {
- storageGroupSchema.setSchemaReplicationFactor(
+ databaseSchema.setSchemaReplicationFactor(
databaseSchemaStatement.getSchemaReplicationFactor());
}
if (databaseSchemaStatement.getDataReplicationFactor() != null) {
- storageGroupSchema.setDataReplicationFactor(
- databaseSchemaStatement.getDataReplicationFactor());
+ databaseSchema.setDataReplicationFactor(databaseSchemaStatement.getDataReplicationFactor());
}
if (databaseSchemaStatement.getTimePartitionInterval() != null) {
- storageGroupSchema.setTimePartitionInterval(
- databaseSchemaStatement.getTimePartitionInterval());
+ databaseSchema.setTimePartitionInterval(databaseSchemaStatement.getTimePartitionInterval());
}
if (databaseSchemaStatement.getSchemaRegionGroupNum() != null) {
- storageGroupSchema.setMinSchemaRegionGroupNum(
- databaseSchemaStatement.getSchemaRegionGroupNum());
+ databaseSchema.setMinSchemaRegionGroupNum(databaseSchemaStatement.getSchemaRegionGroupNum());
}
if (databaseSchemaStatement.getDataRegionGroupNum() != null) {
- storageGroupSchema.setMinDataRegionGroupNum(databaseSchemaStatement.getDataRegionGroupNum());
+ databaseSchema.setMinDataRegionGroupNum(databaseSchemaStatement.getDataRegionGroupNum());
}
- return storageGroupSchema;
+ return databaseSchema;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DeleteStorageGroupTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DeleteStorageGroupTask.java
index ef24acd871..7795ea44b6 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DeleteStorageGroupTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DeleteStorageGroupTask.java
@@ -22,22 +22,22 @@ package org.apache.iotdb.db.mpp.plan.execution.config.metadata;
import org.apache.iotdb.db.mpp.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.mpp.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.mpp.plan.execution.config.executor.IConfigTaskExecutor;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import com.google.common.util.concurrent.ListenableFuture;
public class DeleteStorageGroupTask implements IConfigTask {
- private final DeleteStorageGroupStatement deleteStorageGroupStatement;
+ private final DeleteDatabaseStatement deleteDatabaseStatement;
- public DeleteStorageGroupTask(DeleteStorageGroupStatement deleteStorageGroupStatement) {
- this.deleteStorageGroupStatement = deleteStorageGroupStatement;
+ public DeleteStorageGroupTask(DeleteDatabaseStatement deleteDatabaseStatement) {
+ this.deleteDatabaseStatement = deleteDatabaseStatement;
}
@Override
public ListenableFuture<ConfigTaskResult> execute(IConfigTaskExecutor configTaskExecutor) {
// If the action is executed successfully, return the Future.
// If your operation is async, you can return the corresponding future directly.
- return configTaskExecutor.deleteStorageGroup(deleteStorageGroupStatement);
+ return configTaskExecutor.deleteDatabase(deleteDatabaseStatement);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowStorageGroupTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowDatabaseTask.java
similarity index 75%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowStorageGroupTask.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowDatabaseTask.java
index 0cb0d4ddc4..aad9e99078 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowStorageGroupTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowDatabaseTask.java
@@ -22,21 +22,21 @@ package org.apache.iotdb.db.mpp.plan.execution.config.metadata;
import org.apache.iotdb.db.mpp.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.mpp.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.mpp.plan.execution.config.executor.IConfigTaskExecutor;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDatabaseStatement;
import com.google.common.util.concurrent.ListenableFuture;
-public class ShowStorageGroupTask implements IConfigTask {
+public class ShowDatabaseTask implements IConfigTask {
- private final ShowStorageGroupStatement showStorageGroupStatement;
+ private final ShowDatabaseStatement showDatabaseStatement;
- public ShowStorageGroupTask(ShowStorageGroupStatement showStorageGroupStatement) {
- this.showStorageGroupStatement = showStorageGroupStatement;
+ public ShowDatabaseTask(ShowDatabaseStatement showDatabaseStatement) {
+ this.showDatabaseStatement = showDatabaseStatement;
}
@Override
public ListenableFuture<ConfigTaskResult> execute(IConfigTaskExecutor configTaskExecutor)
throws InterruptedException {
- return configTaskExecutor.showStorageGroup(showStorageGroupStatement);
+ return configTaskExecutor.showDatabase(showDatabaseStatement);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
index ced3aac8ae..8cddc33597 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
@@ -98,10 +98,10 @@ import org.apache.iotdb.db.mpp.plan.statement.literal.Literal;
import org.apache.iotdb.db.mpp.plan.statement.literal.LongLiteral;
import org.apache.iotdb.db.mpp.plan.statement.literal.StringLiteral;
import org.apache.iotdb.db.mpp.plan.statement.metadata.AlterTimeSeriesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDevicesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountLevelTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountNodesStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateAlignedTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
@@ -110,7 +110,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.CreatePipePluginStatement
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DropContinuousQueryStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DropFunctionStatement;
@@ -127,11 +127,11 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowClusterStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowConfigNodesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowContinuousQueriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDataNodesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDevicesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowFunctionsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowPipePluginsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowRegionStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTriggersStatement;
@@ -606,20 +606,20 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
@Override
public Statement visitShowStorageGroup(IoTDBSqlParser.ShowStorageGroupContext ctx) {
- ShowStorageGroupStatement showStorageGroupStatement;
+ ShowDatabaseStatement showDatabaseStatement;
// Parse prefixPath
if (ctx.prefixPath() != null) {
- showStorageGroupStatement = new ShowStorageGroupStatement(parsePrefixPath(ctx.prefixPath()));
+ showDatabaseStatement = new ShowDatabaseStatement(parsePrefixPath(ctx.prefixPath()));
} else {
- showStorageGroupStatement =
- new ShowStorageGroupStatement(new PartialPath(SqlConstant.getSingleRootArray()));
+ showDatabaseStatement =
+ new ShowDatabaseStatement(new PartialPath(SqlConstant.getSingleRootArray()));
}
// Is detailed
- showStorageGroupStatement.setDetailed(ctx.DETAILS() != null);
+ showDatabaseStatement.setDetailed(ctx.DETAILS() != null);
- return showStorageGroupStatement;
+ return showDatabaseStatement;
}
// Show Devices ========================================================================
@@ -705,7 +705,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
} else {
path = new PartialPath(SqlConstant.getSingleRootArray());
}
- return new CountStorageGroupStatement(path);
+ return new CountDatabaseStatement(path);
}
// Show version
@@ -2027,7 +2027,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
DatabaseSchemaStatement databaseSchemaStatement =
new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
PartialPath path = parsePrefixPath(ctx.prefixPath());
- databaseSchemaStatement.setStorageGroupPath(path);
+ databaseSchemaStatement.setDatabasePath(path);
if (ctx.storageGroupAttributesClause() != null) {
parseStorageGroupAttributesClause(
databaseSchemaStatement, ctx.storageGroupAttributesClause());
@@ -2040,7 +2040,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
DatabaseSchemaStatement databaseSchemaStatement =
new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.ALTER);
PartialPath path = parsePrefixPath(ctx.prefixPath());
- databaseSchemaStatement.setStorageGroupPath(path);
+ databaseSchemaStatement.setDatabasePath(path);
parseStorageGroupAttributesClause(databaseSchemaStatement, ctx.storageGroupAttributesClause());
return databaseSchemaStatement;
}
@@ -2077,7 +2077,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
SetTTLStatement setTTLStatement = new SetTTLStatement();
PartialPath path = parsePrefixPath(ctx.prefixPath());
long ttl = Long.parseLong(ctx.INTEGER_LITERAL().getText());
- setTTLStatement.setStorageGroupPath(path);
+ setTTLStatement.setDatabasePath(path);
setTTLStatement.setTTL(ttl);
return setTTLStatement;
}
@@ -2086,7 +2086,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
public Statement visitUnsetTTL(IoTDBSqlParser.UnsetTTLContext ctx) {
UnSetTTLStatement unSetTTLStatement = new UnSetTTLStatement();
PartialPath partialPath = parsePrefixPath(ctx.prefixPath());
- unSetTTLStatement.setStorageGroupPath(partialPath);
+ unSetTTLStatement.setDatabasePath(partialPath);
return unSetTTLStatement;
}
@@ -2123,14 +2123,14 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
@Override
public Statement visitDeleteStorageGroup(IoTDBSqlParser.DeleteStorageGroupContext ctx) {
- DeleteStorageGroupStatement deleteStorageGroupStatement = new DeleteStorageGroupStatement();
+ DeleteDatabaseStatement deleteDatabaseStatement = new DeleteDatabaseStatement();
List<IoTDBSqlParser.PrefixPathContext> prefixPathContexts = ctx.prefixPath();
List<String> paths = new ArrayList<>();
for (IoTDBSqlParser.PrefixPathContext prefixPathContext : prefixPathContexts) {
paths.add(parsePrefixPath(prefixPathContext).getFullPath());
}
- deleteStorageGroupStatement.setPrefixPath(paths);
- return deleteStorageGroupStatement;
+ deleteDatabaseStatement.setPrefixPath(paths);
+ return deleteDatabaseStatement;
}
// Explain ========================================================================
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java
index e465b154ec..ceaaff0895 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java
@@ -52,7 +52,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateAlignedTimeSeriesSt
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateMultiTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.DropSchemaTemplateStatement;
@@ -440,13 +440,13 @@ public class StatementGenerator {
return insertStatement;
}
- public static DatabaseSchemaStatement createStatement(String storageGroup)
+ public static DatabaseSchemaStatement createStatement(String database)
throws IllegalPathException {
long startTime = System.nanoTime();
// construct create database statement
DatabaseSchemaStatement statement =
new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
- statement.setStorageGroupPath(parseStorageGroupRawString(storageGroup));
+ statement.setDatabasePath(parseDatabaseRawString(database));
PerformanceOverviewMetricsManager.recordParseCost(System.nanoTime() - startTime);
return statement;
}
@@ -530,14 +530,14 @@ public class StatementGenerator {
return statement;
}
- public static DeleteStorageGroupStatement createStatement(List<String> storageGroups)
+ public static DeleteDatabaseStatement createStatement(List<String> databases)
throws IllegalPathException {
final long startTime = System.nanoTime();
- DeleteStorageGroupStatement statement = new DeleteStorageGroupStatement();
- for (String path : storageGroups) {
- parseStorageGroupRawString(path);
+ DeleteDatabaseStatement statement = new DeleteDatabaseStatement();
+ for (String path : databases) {
+ parseDatabaseRawString(path);
}
- statement.setPrefixPath(storageGroups);
+ statement.setPrefixPath(databases);
PerformanceOverviewMetricsManager.recordParseCost(System.nanoTime() - startTime);
return statement;
}
@@ -779,13 +779,12 @@ public class StatementGenerator {
insertRowStatement.setMeasurements(newMeasurements.toArray(new String[0]));
}
- private static PartialPath parseStorageGroupRawString(String storageGroup)
- throws IllegalPathException {
- PartialPath storageGroupPath = new PartialPath(storageGroup);
- if (storageGroupPath.getNodeLength() < 2) {
- throw new IllegalPathException(storageGroup);
+ private static PartialPath parseDatabaseRawString(String database) throws IllegalPathException {
+ PartialPath databasePath = new PartialPath(database);
+ if (databasePath.getNodeLength() < 2) {
+ throw new IllegalPathException(database);
}
- MetaFormatUtils.checkStorageGroup(storageGroup);
- return storageGroupPath;
+ MetaFormatUtils.checkDatabase(database);
+ return databasePath;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
index bc08640ee0..34e2777ec7 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
@@ -33,10 +33,10 @@ import org.apache.iotdb.db.mpp.plan.statement.internal.InternalCreateMultiTimeSe
import org.apache.iotdb.db.mpp.plan.statement.internal.InternalCreateTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.internal.SchemaFetchStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.AlterTimeSeriesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountDevicesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountLevelTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountNodesStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.CountStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CountTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateAlignedTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateContinuousQueryStatement;
@@ -46,7 +46,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.CreatePipePluginStatement
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTriggerStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DropContinuousQueryStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DropFunctionStatement;
@@ -63,11 +63,11 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowClusterStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowConfigNodesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowContinuousQueriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDataNodesStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowDevicesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowFunctionsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowPipePluginsStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowRegionStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTriggersStatement;
@@ -157,9 +157,8 @@ public abstract class StatementVisitor<R, C> {
return visitStatement(deleteTimeSeriesStatement, context);
}
- public R visitDeleteStorageGroup(
- DeleteStorageGroupStatement deleteStorageGroupStatement, C context) {
- return visitStatement(deleteStorageGroupStatement, context);
+ public R visitDeleteStorageGroup(DeleteDatabaseStatement deleteDatabaseStatement, C context) {
+ return visitStatement(deleteDatabaseStatement, context);
}
public R visitSetDatabase(DatabaseSchemaStatement databaseSchemaStatement, C context) {
@@ -255,8 +254,8 @@ public abstract class StatementVisitor<R, C> {
return visitStatement(authorStatement, context);
}
- public R visitShowStorageGroup(ShowStorageGroupStatement showStorageGroupStatement, C context) {
- return visitStatement(showStorageGroupStatement, context);
+ public R visitShowStorageGroup(ShowDatabaseStatement showDatabaseStatement, C context) {
+ return visitStatement(showDatabaseStatement, context);
}
public R visitShowTimeSeries(ShowTimeSeriesStatement showTimeSeriesStatement, C context) {
@@ -267,9 +266,8 @@ public abstract class StatementVisitor<R, C> {
return visitStatement(showDevicesStatement, context);
}
- public R visitCountStorageGroup(
- CountStorageGroupStatement countStorageGroupStatement, C context) {
- return visitStatement(countStorageGroupStatement, context);
+ public R visitCountStorageGroup(CountDatabaseStatement countDatabaseStatement, C context) {
+ return visitStatement(countDatabaseStatement, context);
}
public R visitCountDevices(CountDevicesStatement countStatement, C context) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CountStorageGroupStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CountDatabaseStatement.java
similarity index 89%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CountStorageGroupStatement.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CountDatabaseStatement.java
index fa95066bf2..7ddc12a02f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CountStorageGroupStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CountDatabaseStatement.java
@@ -24,9 +24,9 @@ import org.apache.iotdb.db.mpp.plan.analyze.QueryType;
import org.apache.iotdb.db.mpp.plan.statement.IConfigStatement;
import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
-public class CountStorageGroupStatement extends CountStatement implements IConfigStatement {
+public class CountDatabaseStatement extends CountStatement implements IConfigStatement {
- public CountStorageGroupStatement(PartialPath partialPath) {
+ public CountDatabaseStatement(PartialPath partialPath) {
super(partialPath);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java
index 40ad82753c..930c2956be 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java
@@ -33,7 +33,7 @@ public class DatabaseSchemaStatement extends Statement implements IConfigStateme
private final DatabaseSchemaStatementType subType;
- private PartialPath storageGroupPath;
+ private PartialPath databasePath;
private Long TTL = null;
private Integer schemaReplicationFactor = null;
private Integer dataReplicationFactor = null;
@@ -51,12 +51,12 @@ public class DatabaseSchemaStatement extends Statement implements IConfigStateme
return subType;
}
- public PartialPath getStorageGroupPath() {
- return storageGroupPath;
+ public PartialPath getDatabasePath() {
+ return databasePath;
}
- public void setStorageGroupPath(PartialPath storageGroupPath) {
- this.storageGroupPath = storageGroupPath;
+ public void setDatabasePath(PartialPath databasePath) {
+ this.databasePath = databasePath;
}
public Long getTTL() {
@@ -125,16 +125,14 @@ public class DatabaseSchemaStatement extends Statement implements IConfigStateme
@Override
public List<PartialPath> getPaths() {
- return storageGroupPath != null
- ? Collections.singletonList(storageGroupPath)
- : Collections.emptyList();
+ return databasePath != null ? Collections.singletonList(databasePath) : Collections.emptyList();
}
@Override
public String toString() {
return "SetStorageGroupStatement{"
+ "storageGroupPath="
- + storageGroupPath
+ + databasePath
+ ", ttl="
+ TTL
+ ", schemaReplicationFactor="
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DeleteStorageGroupStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DeleteDatabaseStatement.java
similarity index 93%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DeleteStorageGroupStatement.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DeleteDatabaseStatement.java
index 6b779bacdc..7e21be319e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DeleteStorageGroupStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DeleteDatabaseStatement.java
@@ -33,13 +33,13 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
-public class DeleteStorageGroupStatement extends Statement implements IConfigStatement {
+public class DeleteDatabaseStatement extends Statement implements IConfigStatement {
- private static final Logger LOGGER = LoggerFactory.getLogger(DeleteStorageGroupStatement.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DeleteDatabaseStatement.class);
private List<String> prefixPathList;
- public DeleteStorageGroupStatement() {
+ public DeleteDatabaseStatement() {
super();
statementType = StatementType.DELETE_STORAGE_GROUP;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/SetTTLStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/SetTTLStatement.java
index 0c16f9a1e1..6e1ce19747 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/SetTTLStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/SetTTLStatement.java
@@ -30,7 +30,7 @@ import java.util.Collections;
import java.util.List;
public class SetTTLStatement extends Statement implements IConfigStatement {
- protected PartialPath storageGroupPath;
+ protected PartialPath databasePath;
protected long ttl;
public SetTTLStatement() {
@@ -38,8 +38,8 @@ public class SetTTLStatement extends Statement implements IConfigStatement {
statementType = StatementType.TTL;
}
- public PartialPath getStorageGroupPath() {
- return storageGroupPath;
+ public PartialPath getDatabasePath() {
+ return databasePath;
}
public long getTTL() {
@@ -51,8 +51,8 @@ public class SetTTLStatement extends Statement implements IConfigStatement {
return visitor.visitSetTTL(this, context);
}
- public void setStorageGroupPath(PartialPath storageGroupPath) {
- this.storageGroupPath = storageGroupPath;
+ public void setDatabasePath(PartialPath databasePath) {
+ this.databasePath = databasePath;
}
public void setTTL(long ttl) {
@@ -66,8 +66,6 @@ public class SetTTLStatement extends Statement implements IConfigStatement {
@Override
public List<PartialPath> getPaths() {
- return storageGroupPath != null
- ? Collections.singletonList(storageGroupPath)
- : Collections.emptyList();
+ return databasePath != null ? Collections.singletonList(databasePath) : Collections.emptyList();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowStorageGroupStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowDatabaseStatement.java
similarity index 96%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowStorageGroupStatement.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowDatabaseStatement.java
index e5e98ab8d8..0b59b8f6c1 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowStorageGroupStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowDatabaseStatement.java
@@ -48,12 +48,12 @@ import java.util.stream.Collectors;
*
* <p>SHOW DATABASES prefixPath?
*/
-public class ShowStorageGroupStatement extends ShowStatement implements IConfigStatement {
+public class ShowDatabaseStatement extends ShowStatement implements IConfigStatement {
private final PartialPath pathPattern;
private boolean isDetailed;
- public ShowStorageGroupStatement(PartialPath pathPattern) {
+ public ShowDatabaseStatement(PartialPath pathPattern) {
super();
this.pathPattern = pathPattern;
this.isDetailed = false;
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 5423acac60..8d7b212435 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
@@ -55,7 +55,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateAlignedTimeSeriesSt
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateMultiTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.CreateTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DatabaseSchemaStatement;
-import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteStorageGroupStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteDatabaseStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.DeleteTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.DropSchemaTemplateStatement;
@@ -880,7 +880,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
}
// Step 1: transfer from DeleteStorageGroupsReq to Statement
- DeleteStorageGroupStatement statement = StatementGenerator.createStatement(storageGroups);
+ DeleteDatabaseStatement statement = StatementGenerator.createStatement(storageGroups);
if (enableAuditLog) {
AuditLogger.log(String.format("delete databases: %s", storageGroups), statement);
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 79a45de2ab..1fa573ef96 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
@@ -424,7 +424,7 @@ public class ReceiverManager {
try {
DatabaseSchemaStatement statement =
new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
- statement.setStorageGroupPath(new PartialPath(database));
+ statement.setDatabasePath(new PartialPath(database));
long queryId = SessionManager.getInstance().requestQueryId();
ExecutionResult result =
Coordinator.getInstance()
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
index a513ec6e3d..3c671aafc2 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
@@ -334,13 +334,13 @@ public class TTLTest {
(SetTTLStatement)
StatementGenerator.createStatement(
"SET TTL TO " + sg1 + " 10000", ZoneId.systemDefault());
- assertEquals(sg1, statement1.getStorageGroupPath().getFullPath());
+ assertEquals(sg1, statement1.getDatabasePath().getFullPath());
assertEquals(10000, statement1.getTTL());
UnSetTTLStatement statement2 =
(UnSetTTLStatement)
StatementGenerator.createStatement("UNSET TTL TO " + sg2, ZoneId.systemDefault());
- assertEquals(sg2, statement2.getStorageGroupPath().getFullPath());
+ assertEquals(sg2, statement2.getDatabasePath().getFullPath());
assertEquals(Long.MAX_VALUE, statement2.getTTL());
}
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/ConfigMTreeTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/ConfigMTreeTest.java
index 53bb7e3432..686025361b 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/ConfigMTreeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/ConfigMTreeTest.java
@@ -89,17 +89,17 @@ public class ConfigMTreeTest {
public void testAddAndPathExist() throws MetadataException {
String path1 = "root";
root.setStorageGroup(new PartialPath("root.laptop"));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath(path1)));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath("root.laptop")));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d1")));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath(path1)));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath("root.laptop")));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d1")));
}
@Test
public void testSetStorageGroup() throws IllegalPathException {
try {
root.setStorageGroup(new PartialPath("root.laptop.d1"));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d1")));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d1.s1")));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d1")));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d1.s1")));
} catch (MetadataException e) {
e.printStackTrace();
fail(e.getMessage());
@@ -117,14 +117,14 @@ public class ConfigMTreeTest {
}
try {
- root.deleteStorageGroup(new PartialPath("root.laptop.d1"));
+ root.deleteDatabase(new PartialPath("root.laptop.d1"));
} catch (MetadataException e) {
e.printStackTrace();
fail(e.getMessage());
}
- assertFalse(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d1")));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath("root.laptop")));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d2")));
+ assertFalse(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d1")));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath("root.laptop")));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d2")));
}
@Test
@@ -136,12 +136,12 @@ public class ConfigMTreeTest {
List<PartialPath> list = new ArrayList<>();
list.add(new PartialPath("root.laptop.d1"));
- assertEquals(list, root.getBelongedStorageGroups(new PartialPath("root.laptop.d1.s1")));
- assertEquals(list, root.getBelongedStorageGroups(new PartialPath("root.laptop.d1")));
+ assertEquals(list, root.getBelongedDatabases(new PartialPath("root.laptop.d1.s1")));
+ assertEquals(list, root.getBelongedDatabases(new PartialPath("root.laptop.d1")));
list.add(new PartialPath("root.laptop.d2"));
- assertEquals(list, root.getBelongedStorageGroups(new PartialPath("root.laptop.**")));
- assertEquals(list, root.getBelongedStorageGroups(new PartialPath("root.**")));
+ assertEquals(list, root.getBelongedDatabases(new PartialPath("root.laptop.**")));
+ assertEquals(list, root.getBelongedDatabases(new PartialPath("root.**")));
} catch (MetadataException e) {
e.printStackTrace();
fail(e.getMessage());
@@ -151,26 +151,25 @@ public class ConfigMTreeTest {
@Test
public void testCheckStorageExistOfPath() {
try {
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root")).isEmpty());
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root.vehicle")).isEmpty());
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root.vehicle.device0")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root.vehicle")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root.vehicle.device0")).isEmpty());
assertTrue(
- root.getBelongedStorageGroups(new PartialPath("root.vehicle.device0.sensor")).isEmpty());
+ root.getBelongedDatabases(new PartialPath("root.vehicle.device0.sensor")).isEmpty());
root.setStorageGroup(new PartialPath("root.vehicle"));
- assertFalse(root.getBelongedStorageGroups(new PartialPath("root.vehicle")).isEmpty());
- assertFalse(root.getBelongedStorageGroups(new PartialPath("root.vehicle.device0")).isEmpty());
+ assertFalse(root.getBelongedDatabases(new PartialPath("root.vehicle")).isEmpty());
+ assertFalse(root.getBelongedDatabases(new PartialPath("root.vehicle.device0")).isEmpty());
assertFalse(
- root.getBelongedStorageGroups(new PartialPath("root.vehicle.device0.sensor")).isEmpty());
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root.vehicle1")).isEmpty());
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root.vehicle1.device0")).isEmpty());
+ root.getBelongedDatabases(new PartialPath("root.vehicle.device0.sensor")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root.vehicle1")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root.vehicle1.device0")).isEmpty());
root.setStorageGroup(new PartialPath("root.vehicle1.device0"));
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root.vehicle1.device1")).isEmpty());
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root.vehicle1.device2")).isEmpty());
- assertTrue(root.getBelongedStorageGroups(new PartialPath("root.vehicle1.device3")).isEmpty());
- assertFalse(
- root.getBelongedStorageGroups(new PartialPath("root.vehicle1.device0")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root.vehicle1.device1")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root.vehicle1.device2")).isEmpty());
+ assertTrue(root.getBelongedDatabases(new PartialPath("root.vehicle1.device3")).isEmpty());
+ assertFalse(root.getBelongedDatabases(new PartialPath("root.vehicle1.device0")).isEmpty());
} catch (MetadataException e) {
e.printStackTrace();
fail(e.getMessage());
@@ -196,14 +195,14 @@ public class ConfigMTreeTest {
root.setStorageGroup(new PartialPath("root.sg3"));
root.setStorageGroup(new PartialPath("root.a.b.sg3"));
- Assert.assertEquals(7, root.getStorageGroupNum(new PartialPath("root.**"), false));
- Assert.assertEquals(3, root.getStorageGroupNum(new PartialPath("root.*"), false));
- Assert.assertEquals(2, root.getStorageGroupNum(new PartialPath("root.*.*"), false));
- Assert.assertEquals(2, root.getStorageGroupNum(new PartialPath("root.*.*.*"), false));
- Assert.assertEquals(1, root.getStorageGroupNum(new PartialPath("root.*.sg1"), false));
- Assert.assertEquals(2, root.getStorageGroupNum(new PartialPath("root.**.sg1"), false));
- Assert.assertEquals(1, root.getStorageGroupNum(new PartialPath("root.sg3"), false));
- Assert.assertEquals(2, root.getStorageGroupNum(new PartialPath("root.*.b.*"), false));
+ Assert.assertEquals(7, root.getDatabaseNum(new PartialPath("root.**"), false));
+ Assert.assertEquals(3, root.getDatabaseNum(new PartialPath("root.*"), false));
+ Assert.assertEquals(2, root.getDatabaseNum(new PartialPath("root.*.*"), false));
+ Assert.assertEquals(2, root.getDatabaseNum(new PartialPath("root.*.*.*"), false));
+ Assert.assertEquals(1, root.getDatabaseNum(new PartialPath("root.*.sg1"), false));
+ Assert.assertEquals(2, root.getDatabaseNum(new PartialPath("root.**.sg1"), false));
+ Assert.assertEquals(1, root.getDatabaseNum(new PartialPath("root.sg3"), false));
+ Assert.assertEquals(2, root.getDatabaseNum(new PartialPath("root.*.b.*"), false));
}
@Test
@@ -255,8 +254,7 @@ public class ConfigMTreeTest {
};
for (int i = 0; i < pathList.length; i++) {
root.setStorageGroup(pathList[i]);
- IStorageGroupMNode storageGroupMNode =
- root.getStorageGroupNodeByStorageGroupPath(pathList[i]);
+ IStorageGroupMNode storageGroupMNode = root.getDatabaseNodeByDatabasePath(pathList[i]);
storageGroupMNode.setDataTTL(i);
storageGroupMNode.setDataReplicationFactor(i);
storageGroupMNode.setSchemaReplicationFactor(i);
@@ -273,7 +271,7 @@ public class ConfigMTreeTest {
for (int i = 0; i < pathList.length; i++) {
TDatabaseSchema storageGroupSchema =
- newTree.getStorageGroupNodeByStorageGroupPath(pathList[i]).getStorageGroupSchema();
+ newTree.getDatabaseNodeByDatabasePath(pathList[i]).getStorageGroupSchema();
Assert.assertEquals(i, storageGroupSchema.getTTL());
Assert.assertEquals(i, storageGroupSchema.getSchemaReplicationFactor());
Assert.assertEquals(i, storageGroupSchema.getDataReplicationFactor());
@@ -283,11 +281,11 @@ public class ConfigMTreeTest {
}
Assert.assertEquals(
- 3, newTree.getMatchedStorageGroups(new PartialPath("root.**.sg"), false).size());
+ 3, newTree.getMatchedDatabases(new PartialPath("root.**.sg"), false).size());
Assert.assertEquals(
- 2, newTree.getMatchedStorageGroups(new PartialPath("root.**.b.sg"), false).size());
+ 2, newTree.getMatchedDatabases(new PartialPath("root.**.b.sg"), false).size());
Assert.assertEquals(
- 1, newTree.getMatchedStorageGroups(new PartialPath("root.*.*.sg"), false).size());
+ 1, newTree.getMatchedDatabases(new PartialPath("root.*.*.sg"), false).size());
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/MTreeBelowSGTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/MTreeBelowSGTest.java
index 7d2fb985e6..8b22cf580a 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/MTreeBelowSGTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/MTreeBelowSGTest.java
@@ -145,7 +145,7 @@ public abstract class MTreeBelowSGTest {
public void testSetStorageGroup() throws MetadataException {
try {
storageGroup = getStorageGroup(new PartialPath("root.laptop.d1"));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d1")));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d1")));
} catch (MetadataException e) {
e.printStackTrace();
@@ -185,14 +185,14 @@ public abstract class MTreeBelowSGTest {
}
try {
- root.deleteStorageGroup(new PartialPath("root.laptop.d1"));
+ root.deleteDatabase(new PartialPath("root.laptop.d1"));
} catch (MetadataException e) {
e.printStackTrace();
fail(e.getMessage());
}
- assertFalse(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d1.s1")));
- assertFalse(root.isStorageGroupAlreadySet(new PartialPath("root.laptop.d1")));
- assertFalse(root.isStorageGroupAlreadySet(new PartialPath("root.laptop")));
+ assertFalse(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d1.s1")));
+ assertFalse(root.isDatabaseAlreadySet(new PartialPath("root.laptop.d1")));
+ assertFalse(root.isDatabaseAlreadySet(new PartialPath("root.laptop")));
}
@Test
@@ -200,7 +200,7 @@ public abstract class MTreeBelowSGTest {
String path1 = "root";
String sgPath1 = "root.vehicle";
storageGroup = getStorageGroup(new PartialPath(sgPath1));
- assertTrue(root.isStorageGroupAlreadySet(new PartialPath(path1)));
+ assertTrue(root.isDatabaseAlreadySet(new PartialPath(path1)));
try {
storageGroup.createTimeseries(
new PartialPath("root.vehicle.d1.s1"),
@@ -221,7 +221,7 @@ public abstract class MTreeBelowSGTest {
}
assertEquals(
- root.getBelongedStorageGroups(new PartialPath("root.vehicle.d1.s1")),
+ root.getBelongedDatabases(new PartialPath("root.vehicle.d1.s1")),
Collections.singletonList(new PartialPath(sgPath1)));
}
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
index 88d083d528..b96a3120ce 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
@@ -72,7 +72,7 @@ public class SchemaFileLogTest {
SchemaFile sf =
(SchemaFile) SchemaFile.initSchemaFile("root.test.vRoot1", TEST_SCHEMA_REGION_ID);
IStorageGroupMNode newSGNode = new StorageGroupEntityMNode(null, "newSG", 10000L);
- sf.updateStorageGroupNode(newSGNode);
+ sf.updateDatabaseNode(newSGNode);
IMNode root = virtualTriangleMTree(5, "root.test");
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
index bcb6ea4c0b..d739b567de 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
@@ -85,7 +85,7 @@ public class SchemaFileTest {
public void essentialTestSchemaFile() throws IOException, MetadataException {
ISchemaFile sf = SchemaFile.initSchemaFile("root.test.vRoot1", TEST_SCHEMA_REGION_ID);
IStorageGroupMNode newSGNode = new StorageGroupEntityMNode(null, "newSG", 10000L);
- sf.updateStorageGroupNode(newSGNode);
+ sf.updateDatabaseNode(newSGNode);
IMNode root = virtualTriangleMTree(5, "root.test");
IMNode int0 = root.getChild("int0");
@@ -159,7 +159,7 @@ public class SchemaFileTest {
public void testVerticalTree() throws MetadataException, IOException {
ISchemaFile sf = SchemaFile.initSchemaFile("root.sgvt.vt", TEST_SCHEMA_REGION_ID);
IStorageGroupMNode sgNode = new StorageGroupEntityMNode(null, "sg", 11_111L);
- sf.updateStorageGroupNode(sgNode);
+ sf.updateDatabaseNode(sgNode);
IMNode root = getVerticalTree(100, "VT");
Iterator<IMNode> ite = getTreeBFT(root);