You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2023/02/09 01:38:25 UTC
[iotdb] branch Rename-TStorageGroupSchema-to-TDatabaseSchema created (now 9b5315b10e)
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a change to branch Rename-TStorageGroupSchema-to-TDatabaseSchema
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 9b5315b10e Rename variables
This branch includes the following new commits:
new 9b5315b10e Rename variables
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: Rename variables
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch Rename-TStorageGroupSchema-to-TDatabaseSchema
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9b5315b10e576a4c9ad46709fcdb352b3124acbc
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Feb 9 09:38:14 2023 +0800
Rename variables
---
.../write/storagegroup/DatabaseSchemaPlan.java | 10 +++---
.../consensus/response/StorageGroupSchemaResp.java | 14 ++++----
.../confignode/manager/ClusterSchemaManager.java | 37 +++++++++++-----------
.../iotdb/confignode/manager/ConfigManager.java | 12 +++----
.../apache/iotdb/confignode/manager/IManager.java | 4 +--
.../iotdb/confignode/manager/ProcedureManager.java | 6 ++--
.../persistence/executor/ConfigPlanExecutor.java | 4 +--
.../persistence/schema/ClusterSchemaInfo.java | 27 ++++++++--------
.../impl/schema/DeleteStorageGroupProcedure.java | 10 +++---
.../thrift/ConfigNodeRPCServiceProcessor.java | 15 ++++-----
.../request/ConfigPhysicalPlanSerDeTest.java | 14 ++++----
.../persistence/ClusterSchemaInfoTest.java | 28 ++++++++--------
.../confignode/persistence/PartitionInfoTest.java | 6 ++--
.../impl/DeleteStorageGroupProcedureTest.java | 4 +--
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 4 +--
.../it/cluster/IoTDBClusterRestartIT.java | 4 +--
.../it/database/IoTDBDatabaseSetAndDeleteIT.java | 23 +++++++-------
.../load/IoTDBClusterRegionLeaderBalancingIT.java | 6 ++--
.../it/load/IoTDBConfigNodeSwitchLeaderIT.java | 6 ++--
.../partition/IoTDBAutoRegionGroupExtensionIT.java | 4 +--
.../IoTDBCustomRegionGroupExtensionIT.java | 4 +--
.../it/partition/IoTDBPartitionCreationIT.java | 4 +--
.../it/partition/IoTDBPartitionDurableIT.java | 4 +--
.../it/partition/IoTDBPartitionGetterIT.java | 8 ++---
.../partition/IoTDBPartitionInheritPolicyIT.java | 4 +--
.../commons/utils/ThriftConfigNodeSerDeUtils.java | 14 ++++----
.../utils/ThriftConfigNodeSerDeUtilsTest.java | 6 ++--
.../rocksdb/mnode/RStorageGroupMNode.java | 6 ++--
.../apache/iotdb/db/client/ConfigNodeClient.java | 20 ++++++------
.../db/metadata/mnode/IStorageGroupMNode.java | 6 ++--
.../db/metadata/mnode/StorageGroupEntityMNode.java | 6 ++--
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 10 +++---
.../db/mpp/plan/analyze/cache/PartitionCache.java | 8 ++---
.../config/executor/ClusterConfigTaskExecutor.java | 22 ++++++-------
.../config/metadata/DatabaseSchemaTask.java | 6 ++--
.../metadata/ShowStorageGroupStatement.java | 8 ++---
.../iotdb/db/metadata/mtree/ConfigMTreeTest.java | 4 +--
.../src/main/thrift/confignode.thrift | 30 +++++++++---------
38 files changed, 200 insertions(+), 208 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/DatabaseSchemaPlan.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/DatabaseSchemaPlan.java
index 039cf5c2a1..1a0e6d749e 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/DatabaseSchemaPlan.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/storagegroup/DatabaseSchemaPlan.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.confignode.consensus.request.write.storagegroup;
import org.apache.iotdb.commons.utils.ThriftConfigNodeSerDeUtils;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -31,19 +31,19 @@ import java.util.Objects;
public class DatabaseSchemaPlan extends ConfigPhysicalPlan {
- private TStorageGroupSchema schema;
+ private TDatabaseSchema schema;
public DatabaseSchemaPlan(ConfigPhysicalPlanType planType) {
super(planType);
- this.schema = new TStorageGroupSchema();
+ this.schema = new TDatabaseSchema();
}
- public DatabaseSchemaPlan(ConfigPhysicalPlanType planType, TStorageGroupSchema schema) {
+ public DatabaseSchemaPlan(ConfigPhysicalPlanType planType, TDatabaseSchema schema) {
this(planType);
this.schema = schema;
}
- public TStorageGroupSchema getSchema() {
+ public TDatabaseSchema getSchema() {
return schema;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java
index d7b017fea6..f32d33dbf4 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/StorageGroupSchemaResp.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.confignode.consensus.response;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchemaResp;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -31,7 +31,7 @@ public class StorageGroupSchemaResp implements DataSet {
private TSStatus status;
// Map<StorageGroupName, TStorageGroupSchema>
- private Map<String, TStorageGroupSchema> schemaMap;
+ private Map<String, TDatabaseSchema> schemaMap;
public StorageGroupSchemaResp() {
// empty constructor
@@ -45,12 +45,12 @@ public class StorageGroupSchemaResp implements DataSet {
this.status = status;
}
- public void setSchemaMap(Map<String, TStorageGroupSchema> schemaMap) {
+ public void setSchemaMap(Map<String, TDatabaseSchema> schemaMap) {
this.schemaMap = schemaMap;
}
- public TStorageGroupSchemaResp convertToRPCStorageGroupSchemaResp() {
- TStorageGroupSchemaResp resp = new TStorageGroupSchemaResp();
+ public TDatabaseSchemaResp convertToRPCStorageGroupSchemaResp() {
+ TDatabaseSchemaResp resp = new TDatabaseSchemaResp();
resp.setStatus(status);
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
resp.setStorageGroupSchemaMap(schemaMap);
@@ -58,7 +58,7 @@ public class StorageGroupSchemaResp implements DataSet {
return resp;
}
- public Map<String, TStorageGroupSchema> getSchemaMap() {
+ public Map<String, TDatabaseSchema> getSchemaMap() {
return schemaMap;
}
}
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 209afa3c9c..83d398c49e 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
@@ -64,12 +64,12 @@ import org.apache.iotdb.confignode.manager.node.NodeManager;
import org.apache.iotdb.confignode.manager.observer.NodeStatisticsEvent;
import org.apache.iotdb.confignode.manager.partition.PartitionManager;
import org.apache.iotdb.confignode.persistence.schema.ClusterSchemaInfo;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseInfo;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TGetAllTemplatesResp;
import org.apache.iotdb.confignode.rpc.thrift.TGetPathsSetTemplatesResp;
import org.apache.iotdb.confignode.rpc.thrift.TGetTemplateResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupInfo;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.db.metadata.template.TemplateInternalRPCUpdateType;
@@ -152,7 +152,7 @@ public class ClusterSchemaManager {
public TSStatus alterDatabase(DatabaseSchemaPlan databaseSchemaPlan) {
TSStatus result;
boolean isDatabaseExisted;
- TStorageGroupSchema storageGroupSchema = databaseSchemaPlan.getSchema();
+ TDatabaseSchema storageGroupSchema = databaseSchemaPlan.getSchema();
try {
isDatabaseExisted = clusterSchemaInfo.isDatabaseExisted(storageGroupSchema.getName());
@@ -235,19 +235,19 @@ public class ClusterSchemaManager {
}
/** Only used in cluster tool show StorageGroup */
- public TShowStorageGroupResp showStorageGroup(GetStorageGroupPlan getStorageGroupPlan) {
+ public TShowDatabaseResp showStorageGroup(GetStorageGroupPlan getStorageGroupPlan) {
StorageGroupSchemaResp storageGroupSchemaResp =
(StorageGroupSchemaResp) getMatchedStorageGroupSchema(getStorageGroupPlan);
if (storageGroupSchemaResp.getStatus().getCode()
!= TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
// Return immediately if some StorageGroups doesn't exist
- return new TShowStorageGroupResp().setStatus(storageGroupSchemaResp.getStatus());
+ return new TShowDatabaseResp().setStatus(storageGroupSchemaResp.getStatus());
}
- Map<String, TStorageGroupInfo> infoMap = new ConcurrentHashMap<>();
- for (TStorageGroupSchema storageGroupSchema : storageGroupSchemaResp.getSchemaMap().values()) {
+ Map<String, TDatabaseInfo> infoMap = new ConcurrentHashMap<>();
+ for (TDatabaseSchema storageGroupSchema : storageGroupSchemaResp.getSchemaMap().values()) {
String database = storageGroupSchema.getName();
- TStorageGroupInfo storageGroupInfo = new TStorageGroupInfo();
+ TDatabaseInfo storageGroupInfo = new TDatabaseInfo();
storageGroupInfo.setName(database);
storageGroupInfo.setTTL(storageGroupSchema.getTTL());
storageGroupInfo.setSchemaReplicationFactor(storageGroupSchema.getSchemaReplicationFactor());
@@ -269,7 +269,7 @@ public class ClusterSchemaManager {
getMaxRegionGroupNum(database, TConsensusGroupType.DataRegion));
} catch (DatabaseNotExistsException e) {
// Return immediately if some StorageGroups doesn't exist
- return new TShowStorageGroupResp()
+ return new TShowDatabaseResp()
.setStatus(
new TSStatus(TSStatusCode.DATABASE_NOT_EXIST.getStatusCode())
.setMessage(e.getMessage()));
@@ -278,7 +278,7 @@ public class ClusterSchemaManager {
infoMap.put(database, storageGroupInfo);
}
- return new TShowStorageGroupResp().setStorageGroupInfoMap(infoMap).setStatus(StatusUtils.OK);
+ return new TShowDatabaseResp().setStorageGroupInfoMap(infoMap).setStatus(StatusUtils.OK);
}
public Map<String, Long> getAllTTLInfo() {
@@ -291,7 +291,7 @@ public class ClusterSchemaManager {
// Return immediately if some StorageGroups doesn't exist
return infoMap;
}
- for (TStorageGroupSchema storageGroupSchema : storageGroupSchemaResp.getSchemaMap().values()) {
+ for (TDatabaseSchema storageGroupSchema : storageGroupSchemaResp.getSchemaMap().values()) {
infoMap.put(storageGroupSchema.getName(), storageGroupSchema.getTTL());
}
return infoMap;
@@ -306,7 +306,7 @@ public class ClusterSchemaManager {
*/
public TSStatus setTTL(SetTTLPlan setTTLPlan) {
- Map<String, TStorageGroupSchema> storageSchemaMap =
+ Map<String, TDatabaseSchema> storageSchemaMap =
clusterSchemaInfo.getMatchedStorageGroupSchemasByOneName(
setTTLPlan.getStorageGroupPathPattern());
@@ -375,7 +375,7 @@ public class ClusterSchemaManager {
*/
public synchronized void adjustMaxRegionGroupNum() {
// Get all StorageGroupSchemas
- Map<String, TStorageGroupSchema> storageGroupSchemaMap =
+ Map<String, TDatabaseSchema> storageGroupSchemaMap =
getMatchedDatabaseSchemasByName(getDatabaseNames());
if (storageGroupSchemaMap.size() == 0) {
// Skip when there are no StorageGroups
@@ -387,7 +387,7 @@ public class ClusterSchemaManager {
int storageGroupNum = storageGroupSchemaMap.size();
AdjustMaxRegionGroupNumPlan adjustMaxRegionGroupNumPlan = new AdjustMaxRegionGroupNumPlan();
- for (TStorageGroupSchema storageGroupSchema : storageGroupSchemaMap.values()) {
+ for (TDatabaseSchema storageGroupSchema : storageGroupSchemaMap.values()) {
try {
// Adjust maxSchemaRegionGroupNum for each StorageGroup.
// All StorageGroups share the DataNodes equally.
@@ -480,7 +480,7 @@ public class ClusterSchemaManager {
* @return The specific DatabaseSchema
* @throws DatabaseNotExistsException When the specific Database doesn't exist
*/
- public TStorageGroupSchema getDatabaseSchemaByName(String database)
+ public TDatabaseSchema getDatabaseSchemaByName(String database)
throws DatabaseNotExistsException {
return clusterSchemaInfo.getMatchedDatabaseSchemaByName(database);
}
@@ -491,8 +491,7 @@ public class ClusterSchemaManager {
* @param rawPathList List<DatabaseName>
* @return the matched DatabaseSchemas
*/
- public Map<String, TStorageGroupSchema> getMatchedDatabaseSchemasByName(
- List<String> rawPathList) {
+ public Map<String, TDatabaseSchema> getMatchedDatabaseSchemasByName(List<String> rawPathList) {
return clusterSchemaInfo.getMatchedDatabaseSchemasByName(rawPathList);
}
@@ -506,7 +505,7 @@ public class ClusterSchemaManager {
*/
public int getReplicationFactor(String database, TConsensusGroupType consensusGroupType)
throws DatabaseNotExistsException {
- TStorageGroupSchema storageGroupSchema = getDatabaseSchemaByName(database);
+ TDatabaseSchema storageGroupSchema = getDatabaseSchemaByName(database);
return TConsensusGroupType.SchemaRegion.equals(consensusGroupType)
? storageGroupSchema.getSchemaReplicationFactor()
: storageGroupSchema.getDataReplicationFactor();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index e8dfac289a..2bb0c087a4 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -108,6 +108,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRegisterReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRestartReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRestartResp;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TDeactivateSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteTimeSeriesReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropCQReq;
@@ -141,11 +142,10 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
import org.apache.iotdb.consensus.common.DataSet;
@@ -534,14 +534,14 @@ public class ConfigManager implements IManager {
TSStatus status = confirmLeader();
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
// remove wild
- Map<String, TStorageGroupSchema> deleteStorageSchemaMap =
+ Map<String, TDatabaseSchema> deleteStorageSchemaMap =
getClusterSchemaManager().getMatchedDatabaseSchemasByName(deletedPaths);
if (deleteStorageSchemaMap.isEmpty()) {
return RpcUtils.getStatus(
TSStatusCode.PATH_NOT_EXIST.getStatusCode(),
String.format("Path %s does not exist", Arrays.toString(deletedPaths.toArray())));
}
- ArrayList<TStorageGroupSchema> parsedDeleteStorageGroups =
+ ArrayList<TDatabaseSchema> parsedDeleteStorageGroups =
new ArrayList<>(deleteStorageSchemaMap.values());
return procedureManager.deleteStorageGroups(parsedDeleteStorageGroups);
} else {
@@ -1304,12 +1304,12 @@ public class ConfigManager implements IManager {
}
@Override
- public TShowStorageGroupResp showStorageGroup(GetStorageGroupPlan getStorageGroupPlan) {
+ public TShowDatabaseResp showStorageGroup(GetStorageGroupPlan getStorageGroupPlan) {
TSStatus status = confirmLeader();
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return getClusterSchemaManager().showStorageGroup(getStorageGroupPlan);
} else {
- return new TShowStorageGroupResp().setStatus(status);
+ return new TShowDatabaseResp().setStatus(status);
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
index 2004847152..743af47af3 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
@@ -92,9 +92,9 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
import org.apache.iotdb.consensus.common.DataSet;
@@ -446,7 +446,7 @@ public interface IManager {
* @param getStorageGroupPlan GetStorageGroupPlan, including path patterns about StorageGroups
* @return TShowStorageGroupResp
*/
- TShowStorageGroupResp showStorageGroup(GetStorageGroupPlan getStorageGroupPlan);
+ TShowDatabaseResp showStorageGroup(GetStorageGroupPlan getStorageGroupPlan);
/**
* create schema template
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
index c7f0e6c4c0..71edebcfe9 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
@@ -70,10 +70,10 @@ import org.apache.iotdb.confignode.procedure.store.ProcedureType;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRegisterReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteTimeSeriesReq;
import org.apache.iotdb.confignode.rpc.thrift.TMigrateRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TRegionMigrateResultReportReq;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -147,9 +147,9 @@ public class ProcedureManager {
}
}
- public TSStatus deleteStorageGroups(ArrayList<TStorageGroupSchema> deleteSgSchemaList) {
+ public TSStatus deleteStorageGroups(ArrayList<TDatabaseSchema> deleteSgSchemaList) {
List<Long> procedureIds = new ArrayList<>();
- for (TStorageGroupSchema storageGroupSchema : deleteSgSchemaList) {
+ for (TDatabaseSchema storageGroupSchema : deleteSgSchemaList) {
DeleteStorageGroupProcedure deleteStorageGroupProcedure =
new DeleteStorageGroupProcedure(storageGroupSchema);
long procedureId = this.executor.submitProcedure(deleteStorageGroupProcedure);
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
index 232224b8c5..f7b41b2a80 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java
@@ -100,8 +100,8 @@ import org.apache.iotdb.confignode.persistence.node.NodeInfo;
import org.apache.iotdb.confignode.persistence.partition.PartitionInfo;
import org.apache.iotdb.confignode.persistence.schema.ClusterSchemaInfo;
import org.apache.iotdb.confignode.persistence.sync.ClusterSyncInfo;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.db.metadata.mnode.MNodeType;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -491,7 +491,7 @@ public class ConfigPlanExecutor {
final List<String> storageGroups = showRegionReq.getStorageGroups();
final List<String> matchedStorageGroups =
clusterSchemaInfo.getMatchedDatabaseSchemasByName(storageGroups).values().stream()
- .map(TStorageGroupSchema::getName)
+ .map(TDatabaseSchema::getName)
.collect(Collectors.toList());
if (!matchedStorageGroups.isEmpty()) {
showRegionReq.setStorageGroups(matchedStorageGroups);
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 6f74aae67f..f6c800093e 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
@@ -53,7 +53,7 @@ import org.apache.iotdb.confignode.consensus.response.StorageGroupSchemaResp;
import org.apache.iotdb.confignode.consensus.response.TemplateInfoResp;
import org.apache.iotdb.confignode.consensus.response.TemplateSetInfoResp;
import org.apache.iotdb.confignode.exception.DatabaseNotExistsException;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.metadata.mtree.ConfigMTree;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.db.metadata.template.TemplateInternalRPCUtil;
@@ -128,7 +128,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
storageGroupReadWriteLock.writeLock().lock();
try {
// Set StorageGroup
- TStorageGroupSchema storageGroupSchema = plan.getSchema();
+ TDatabaseSchema storageGroupSchema = plan.getSchema();
PartialPath partialPathName = new PartialPath(storageGroupSchema.getName());
mTree.setStorageGroup(partialPathName);
@@ -157,10 +157,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
TSStatus result = new TSStatus();
storageGroupReadWriteLock.writeLock().lock();
try {
- TStorageGroupSchema alterSchema = plan.getSchema();
+ TDatabaseSchema alterSchema = plan.getSchema();
PartialPath partialPathName = new PartialPath(alterSchema.getName());
- TStorageGroupSchema currentSchema =
+ TDatabaseSchema currentSchema =
mTree.getStorageGroupNodeByStorageGroupPath(partialPathName).getStorageGroupSchema();
// TODO: Support alter other fields
if (alterSchema.isSetMinSchemaRegionGroupNum()) {
@@ -258,7 +258,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
StorageGroupSchemaResp result = new StorageGroupSchemaResp();
storageGroupReadWriteLock.readLock().lock();
try {
- Map<String, TStorageGroupSchema> schemaMap = new HashMap<>();
+ Map<String, TDatabaseSchema> schemaMap = new HashMap<>();
PartialPath patternPath = new PartialPath(plan.getStorageGroupPattern());
List<PartialPath> matchedPaths = mTree.getMatchedStorageGroups(patternPath, false);
for (PartialPath path : matchedPaths) {
@@ -388,7 +388,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
for (Map.Entry<String, Pair<Integer, Integer>> entry :
plan.getMaxRegionGroupNumMap().entrySet()) {
PartialPath path = new PartialPath(entry.getKey());
- TStorageGroupSchema storageGroupSchema =
+ TDatabaseSchema storageGroupSchema =
mTree.getStorageGroupNodeByStorageGroupPath(path).getStorageGroupSchema();
storageGroupSchema.setMaxSchemaRegionGroupNum(entry.getValue().getLeft());
storageGroupSchema.setMaxDataRegionGroupNum(entry.getValue().getRight());
@@ -463,7 +463,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
* @return The specific StorageGroupSchema
* @throws DatabaseNotExistsException When the specific StorageGroup doesn't exist
*/
- public TStorageGroupSchema getMatchedDatabaseSchemaByName(String storageGroup)
+ public TDatabaseSchema getMatchedDatabaseSchemaByName(String storageGroup)
throws DatabaseNotExistsException {
storageGroupReadWriteLock.readLock().lock();
try {
@@ -483,9 +483,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
* @param rawPathList StorageGroups' path patterns or full paths
* @return All StorageGroupSchemas that matches to the specific StorageGroup patterns
*/
- public Map<String, TStorageGroupSchema> getMatchedDatabaseSchemasByName(
- List<String> rawPathList) {
- Map<String, TStorageGroupSchema> schemaMap = new HashMap<>();
+ public Map<String, TDatabaseSchema> getMatchedDatabaseSchemasByName(List<String> rawPathList) {
+ Map<String, TDatabaseSchema> schemaMap = new HashMap<>();
storageGroupReadWriteLock.readLock().lock();
try {
for (String rawPath : rawPathList) {
@@ -515,7 +514,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
storageGroupReadWriteLock.readLock().lock();
try {
PartialPath path = new PartialPath(database);
- TStorageGroupSchema storageGroupSchema =
+ TDatabaseSchema storageGroupSchema =
mTree.getStorageGroupNodeByStorageGroupPath(path).getStorageGroupSchema();
switch (consensusGroupType) {
case SchemaRegion:
@@ -543,7 +542,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
storageGroupReadWriteLock.readLock().lock();
try {
PartialPath path = new PartialPath(database);
- TStorageGroupSchema storageGroupSchema =
+ TDatabaseSchema storageGroupSchema =
mTree.getStorageGroupNodeByStorageGroupPath(path).getStorageGroupSchema();
switch (consensusGroupType) {
case SchemaRegion:
@@ -870,9 +869,9 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
}
}
- public Map<String, TStorageGroupSchema> getMatchedStorageGroupSchemasByOneName(
+ public Map<String, TDatabaseSchema> getMatchedStorageGroupSchemasByOneName(
String[] storageGroupPathPattern) {
- Map<String, TStorageGroupSchema> schemaMap = new HashMap<>();
+ Map<String, TDatabaseSchema> schemaMap = new HashMap<>();
storageGroupReadWriteLock.readLock().lock();
try {
PartialPath patternPath = new PartialPath(storageGroupPathPattern);
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteStorageGroupProcedure.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteStorageGroupProcedure.java
index 759843be8a..0e3d95f657 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteStorageGroupProcedure.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteStorageGroupProcedure.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException;
import org.apache.iotdb.confignode.procedure.impl.statemachine.StateMachineProcedure;
import org.apache.iotdb.confignode.procedure.state.schema.DeleteStorageGroupState;
import org.apache.iotdb.confignode.procedure.store.ProcedureType;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.thrift.TException;
@@ -50,22 +50,22 @@ public class DeleteStorageGroupProcedure
private static final Logger LOG = LoggerFactory.getLogger(DeleteStorageGroupProcedure.class);
private static final int RETRY_THRESHOLD = 5;
- private TStorageGroupSchema deleteSgSchema;
+ private TDatabaseSchema deleteSgSchema;
public DeleteStorageGroupProcedure() {
super();
}
- public DeleteStorageGroupProcedure(TStorageGroupSchema deleteSgSchema) {
+ public DeleteStorageGroupProcedure(TDatabaseSchema deleteSgSchema) {
super();
this.deleteSgSchema = deleteSgSchema;
}
- public TStorageGroupSchema getDeleteSgSchema() {
+ public TDatabaseSchema getDeleteSgSchema() {
return deleteSgSchema;
}
- public void setDeleteSgSchema(TStorageGroupSchema deleteSgSchema) {
+ public void setDeleteSgSchema(TDatabaseSchema deleteSgSchema) {
this.deleteSgSchema = deleteSgSchema;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 44dbe630c3..1852240af9 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -89,6 +89,8 @@ import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRestartResp;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeUpdateReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TDeactivateSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupsReq;
@@ -136,18 +138,16 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowModelReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowModelResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TSystemConfigurationResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TUpdateModelInfoReq;
@@ -274,7 +274,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
}
@Override
- public TSStatus setDatabase(TStorageGroupSchema databaseSchema) {
+ public TSStatus setDatabase(TDatabaseSchema databaseSchema) {
TSStatus errorResp = null;
// Set default configurations if necessary
@@ -352,7 +352,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
}
@Override
- public TSStatus alterDatabase(TStorageGroupSchema databaseSchema) {
+ public TSStatus alterDatabase(TDatabaseSchema databaseSchema) {
TSStatus errorResp = null;
// TODO: Support alter the following fields
@@ -444,8 +444,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
}
@Override
- public TStorageGroupSchemaResp getMatchedStorageGroupSchemas(
- List<String> storageGroupPathPattern) {
+ public TDatabaseSchemaResp getMatchedStorageGroupSchemas(List<String> storageGroupPathPattern) {
StorageGroupSchemaResp storageGroupSchemaResp =
(StorageGroupSchemaResp)
configManager.getMatchedStorageGroupSchemas(
@@ -775,7 +774,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
}
@Override
- public TShowStorageGroupResp showStorageGroup(List<String> storageGroupPathPattern) {
+ public TShowDatabaseResp showStorageGroup(List<String> storageGroupPathPattern) {
return configManager.showStorageGroup(new GetStorageGroupPlan(storageGroupPathPattern));
}
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
index be70040b22..82b7a13d9d 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
@@ -109,9 +109,9 @@ import org.apache.iotdb.confignode.procedure.Procedure;
import org.apache.iotdb.confignode.procedure.impl.schema.DeleteStorageGroupProcedure;
import org.apache.iotdb.confignode.procedure.impl.statemachine.CreateRegionGroupsProcedure;
import org.apache.iotdb.confignode.rpc.thrift.TCreateCQReq;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TPipeSinkInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.confignode.rpc.thrift.TTriggerState;
import org.apache.iotdb.db.metadata.template.Template;
@@ -193,7 +193,7 @@ public class ConfigPhysicalPlanSerDeTest {
DatabaseSchemaPlan req0 =
new DatabaseSchemaPlan(
ConfigPhysicalPlanType.CreateDatabase,
- new TStorageGroupSchema()
+ new TDatabaseSchema()
.setName("sg")
.setTTL(Long.MAX_VALUE)
.setSchemaReplicationFactor(3)
@@ -209,7 +209,7 @@ public class ConfigPhysicalPlanSerDeTest {
DatabaseSchemaPlan req0 =
new DatabaseSchemaPlan(
ConfigPhysicalPlanType.AlterDatabase,
- new TStorageGroupSchema()
+ new TDatabaseSchema()
.setName("sg")
.setTTL(Long.MAX_VALUE)
.setSchemaReplicationFactor(3)
@@ -752,7 +752,7 @@ public class ConfigPhysicalPlanSerDeTest {
public void updateProcedureTest() throws IOException {
// test procedure equals DeleteStorageGroupProcedure
DeleteStorageGroupProcedure deleteStorageGroupProcedure = new DeleteStorageGroupProcedure();
- deleteStorageGroupProcedure.setDeleteSgSchema(new TStorageGroupSchema("root.sg"));
+ deleteStorageGroupProcedure.setDeleteSgSchema(new TDatabaseSchema("root.sg"));
UpdateProcedurePlan updateProcedurePlan0 = new UpdateProcedurePlan();
updateProcedurePlan0.setProcedure(deleteStorageGroupProcedure);
UpdateProcedurePlan updateProcedurePlan1 =
@@ -797,9 +797,9 @@ public class ConfigPhysicalPlanSerDeTest {
public void UpdateProcedurePlanTest() throws IOException {
UpdateProcedurePlan req0 = new UpdateProcedurePlan();
DeleteStorageGroupProcedure deleteStorageGroupProcedure = new DeleteStorageGroupProcedure();
- TStorageGroupSchema tStorageGroupSchema = new TStorageGroupSchema();
- tStorageGroupSchema.setName("root.sg");
- deleteStorageGroupProcedure.setDeleteSgSchema(tStorageGroupSchema);
+ TDatabaseSchema tDatabaseSchema = new TDatabaseSchema();
+ tDatabaseSchema.setName("root.sg");
+ deleteStorageGroupProcedure.setDeleteSgSchema(tDatabaseSchema);
req0.setProcedure(deleteStorageGroupProcedure);
UpdateProcedurePlan req1 =
(UpdateProcedurePlan) ConfigPhysicalPlan.Factory.create(req0.serializeToByteBuffer());
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ClusterSchemaInfoTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ClusterSchemaInfoTest.java
index bf706ff942..8869d4646b 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ClusterSchemaInfoTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ClusterSchemaInfoTest.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.confignode.consensus.request.write.storagegroup.Database
import org.apache.iotdb.confignode.consensus.request.write.template.CreateSchemaTemplatePlan;
import org.apache.iotdb.confignode.consensus.request.write.template.SetSchemaTemplatePlan;
import org.apache.iotdb.confignode.persistence.schema.ClusterSchemaInfo;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -81,18 +81,18 @@ public class ClusterSchemaInfoTest {
storageGroupPathList.add("root.a.b.sg");
storageGroupPathList.add("root.a.a.a.b.sg");
- Map<String, TStorageGroupSchema> testMap = new TreeMap<>();
+ Map<String, TDatabaseSchema> testMap = new TreeMap<>();
int i = 0;
for (String path : storageGroupPathList) {
- TStorageGroupSchema tStorageGroupSchema = new TStorageGroupSchema();
- tStorageGroupSchema.setName(path);
- tStorageGroupSchema.setTTL(i);
- tStorageGroupSchema.setDataReplicationFactor(i);
- tStorageGroupSchema.setSchemaReplicationFactor(i);
- tStorageGroupSchema.setTimePartitionInterval(i);
- testMap.put(path, tStorageGroupSchema);
+ TDatabaseSchema tDatabaseSchema = new TDatabaseSchema();
+ tDatabaseSchema.setName(path);
+ tDatabaseSchema.setTTL(i);
+ tDatabaseSchema.setDataReplicationFactor(i);
+ tDatabaseSchema.setSchemaReplicationFactor(i);
+ tDatabaseSchema.setTimePartitionInterval(i);
+ testMap.put(path, tDatabaseSchema);
clusterSchemaInfo.createDatabase(
- new DatabaseSchemaPlan(ConfigPhysicalPlanType.CreateDatabase, tStorageGroupSchema));
+ new DatabaseSchemaPlan(ConfigPhysicalPlanType.CreateDatabase, tDatabaseSchema));
i++;
}
clusterSchemaInfo.processTakeSnapshot(snapshotDir);
@@ -103,7 +103,7 @@ public class ClusterSchemaInfoTest {
GetStorageGroupPlan getStorageGroupReq =
new GetStorageGroupPlan(Arrays.asList(PathUtils.splitPathToDetachedNodes("root.**")));
- Map<String, TStorageGroupSchema> reloadResult =
+ Map<String, TDatabaseSchema> reloadResult =
clusterSchemaInfo.getMatchedStorageGroupSchemas(getStorageGroupReq).getSchemaMap();
Assert.assertEquals(testMap, reloadResult);
}
@@ -118,13 +118,13 @@ public class ClusterSchemaInfoTest {
clusterSchemaInfo.createDatabase(
new DatabaseSchemaPlan(
- ConfigPhysicalPlanType.CreateDatabase, new TStorageGroupSchema("root.test1")));
+ ConfigPhysicalPlanType.CreateDatabase, new TDatabaseSchema("root.test1")));
clusterSchemaInfo.createDatabase(
new DatabaseSchemaPlan(
- ConfigPhysicalPlanType.CreateDatabase, new TStorageGroupSchema("root.test2")));
+ ConfigPhysicalPlanType.CreateDatabase, new TDatabaseSchema("root.test2")));
clusterSchemaInfo.createDatabase(
new DatabaseSchemaPlan(
- ConfigPhysicalPlanType.CreateDatabase, new TStorageGroupSchema("root.test3")));
+ ConfigPhysicalPlanType.CreateDatabase, new TDatabaseSchema("root.test3")));
clusterSchemaInfo.setSchemaTemplate(
new SetSchemaTemplatePlan(templateName, "root.test1.template"));
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java
index 2ed59e9122..4acc8d8fc8 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java
@@ -40,8 +40,8 @@ import org.apache.iotdb.confignode.consensus.response.RegionInfoListResp;
import org.apache.iotdb.confignode.persistence.partition.PartitionInfo;
import org.apache.iotdb.confignode.persistence.partition.maintainer.RegionCreateTask;
import org.apache.iotdb.confignode.persistence.partition.maintainer.RegionDeleteTask;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.commons.io.FileUtils;
import org.apache.thrift.TException;
@@ -104,7 +104,7 @@ public class PartitionInfoTest {
// Set StorageGroup
partitionInfo.createDatabase(
new DatabaseSchemaPlan(
- ConfigPhysicalPlanType.CreateDatabase, new TStorageGroupSchema("root.test")));
+ ConfigPhysicalPlanType.CreateDatabase, new TDatabaseSchema("root.test")));
// Create a SchemaRegion
CreateRegionGroupsPlan createRegionGroupsReq = new CreateRegionGroupsPlan();
@@ -159,7 +159,7 @@ public class PartitionInfoTest {
// Set StorageGroup
partitionInfo.createDatabase(
new DatabaseSchemaPlan(
- ConfigPhysicalPlanType.CreateDatabase, new TStorageGroupSchema("root.test" + i)));
+ ConfigPhysicalPlanType.CreateDatabase, new TDatabaseSchema("root.test" + i)));
// Create a SchemaRegion
CreateRegionGroupsPlan createRegionGroupsPlan = new CreateRegionGroupsPlan();
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/DeleteStorageGroupProcedureTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/DeleteStorageGroupProcedureTest.java
index 199e6202e6..612ac01c60 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/DeleteStorageGroupProcedureTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/DeleteStorageGroupProcedureTest.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.confignode.procedure.impl;
import org.apache.iotdb.confignode.procedure.impl.schema.DeleteStorageGroupProcedure;
import org.apache.iotdb.confignode.procedure.store.ProcedureFactory;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.junit.Test;
@@ -40,7 +40,7 @@ public class DeleteStorageGroupProcedureTest {
PublicBAOS byteArrayOutputStream = new PublicBAOS();
DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream);
DeleteStorageGroupProcedure p1 =
- new DeleteStorageGroupProcedure(new TStorageGroupSchema("root.sg"));
+ new DeleteStorageGroupProcedure(new TDatabaseSchema("root.sg"));
try {
p1.serialize(outputStream);
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java
index a6682e3fae..7794905637 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java
@@ -35,12 +35,12 @@ import org.apache.iotdb.confignode.rpc.thrift.TCreateFunctionReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateTriggerReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TGetTriggerTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TGetUDFTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -115,7 +115,7 @@ public class IoTDBConfigNodeSnapshotIT {
for (int i = 0; i < storageGroupNum; i++) {
String storageGroup = sg + i;
- TStorageGroupSchema storageGroupSchema = new TStorageGroupSchema(storageGroup);
+ TDatabaseSchema storageGroupSchema = new TDatabaseSchema(storageGroup);
TSStatus status = client.setDatabase(storageGroupSchema);
assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterRestartIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterRestartIT.java
index 6b8f796c7c..fd6e275c68 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterRestartIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterRestartIT.java
@@ -24,10 +24,10 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.env.cluster.AbstractEnv;
@@ -182,7 +182,7 @@ public class IoTDBClusterRestartIT {
Map<String, Map<TSeriesPartitionSlot, TConsensusGroupId>> schemaPartitionTable;
// Set StorageGroups
- status = client.setDatabase((new TStorageGroupSchema(sg0)));
+ status = client.setDatabase((new TDatabaseSchema(sg0)));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
// Test getSchemaPartition, the result should be empty
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/database/IoTDBDatabaseSetAndDeleteIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/database/IoTDBDatabaseSetAndDeleteIT.java
index 654edcf0f4..12b73af4a7 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/database/IoTDBDatabaseSetAndDeleteIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/database/IoTDBDatabaseSetAndDeleteIT.java
@@ -24,12 +24,12 @@ import org.apache.iotdb.common.rpc.thrift.TSetTTLReq;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.confignode.rpc.thrift.TCountStorageGroupResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupsReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetDataReplicationFactorReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetSchemaReplicationFactorReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetTimePartitionIntervalReq;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
@@ -71,13 +71,13 @@ public class IoTDBDatabaseSetAndDeleteIT {
try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
// set Database0 by default values
- TStorageGroupSchema storageGroupSchema0 = new TStorageGroupSchema(sg0);
+ TDatabaseSchema storageGroupSchema0 = new TDatabaseSchema(sg0);
status = client.setDatabase(storageGroupSchema0);
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
// set Database1 by specific values
- TStorageGroupSchema storageGroupSchema1 =
- new TStorageGroupSchema(sg1)
+ TDatabaseSchema storageGroupSchema1 =
+ new TDatabaseSchema(sg1)
.setTTL(1024L)
.setSchemaReplicationFactor(5)
.setDataReplicationFactor(5)
@@ -99,13 +99,13 @@ public class IoTDBDatabaseSetAndDeleteIT {
Assert.assertEquals(1, countResp.getCount());
// test query all DatabaseSchemas
- TStorageGroupSchemaResp getResp =
+ TDatabaseSchemaResp getResp =
client.getMatchedStorageGroupSchemas(Arrays.asList("root", "**"));
Assert.assertEquals(
TSStatusCode.SUCCESS_STATUS.getStatusCode(), getResp.getStatus().getCode());
- Map<String, TStorageGroupSchema> schemaMap = getResp.getStorageGroupSchemaMap();
+ Map<String, TDatabaseSchema> schemaMap = getResp.getStorageGroupSchemaMap();
Assert.assertEquals(2, schemaMap.size());
- TStorageGroupSchema storageGroupSchema = schemaMap.get(sg0);
+ TDatabaseSchema storageGroupSchema = schemaMap.get(sg0);
Assert.assertNotNull(storageGroupSchema);
Assert.assertEquals(sg0, storageGroupSchema.getName());
Assert.assertEquals(Long.MAX_VALUE, storageGroupSchema.getTTL());
@@ -159,20 +159,19 @@ public class IoTDBDatabaseSetAndDeleteIT {
try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
- TStorageGroupSchema storageGroupSchema0 = new TStorageGroupSchema(sg0);
+ TDatabaseSchema storageGroupSchema0 = new TDatabaseSchema(sg0);
// set StorageGroup0 by default values
status = client.setDatabase(storageGroupSchema0);
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
// set StorageGroup1 by specific values
- TStorageGroupSchema storageGroupSchema1 = new TStorageGroupSchema(sg1);
+ TDatabaseSchema storageGroupSchema1 = new TDatabaseSchema(sg1);
status = client.setDatabase(storageGroupSchema1);
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
TDeleteStorageGroupsReq deleteStorageGroupsReq = new TDeleteStorageGroupsReq();
List<String> sgs = Arrays.asList(sg0, sg1);
deleteStorageGroupsReq.setPrefixPathList(sgs);
TSStatus deleteSgStatus = client.deleteStorageGroups(deleteStorageGroupsReq);
- TStorageGroupSchemaResp root =
- client.getMatchedStorageGroupSchemas(Arrays.asList("root", "*"));
+ TDatabaseSchemaResp root = client.getMatchedStorageGroupSchemas(Arrays.asList("root", "*"));
Assert.assertTrue(root.getStorageGroupSchemaMap().isEmpty());
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), deleteSgStatus.getCode());
}
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBClusterRegionLeaderBalancingIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBClusterRegionLeaderBalancingIT.java
index a8bad2f649..2d1f17cb6c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBClusterRegionLeaderBalancingIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBClusterRegionLeaderBalancingIT.java
@@ -26,9 +26,9 @@ import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.commons.cluster.RegionRoleType;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -90,7 +90,7 @@ public class IoTDBClusterRegionLeaderBalancingIT {
// Set StorageGroups
for (int i = 0; i < storageGroupNum; i++) {
- status = client.setDatabase(new TStorageGroupSchema(sg + i));
+ status = client.setDatabase(new TDatabaseSchema(sg + i));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
}
@@ -140,7 +140,7 @@ public class IoTDBClusterRegionLeaderBalancingIT {
for (int i = 0; i < storageGroupNum; i++) {
// Set StorageGroups
- status = client.setDatabase(new TStorageGroupSchema(sg + i));
+ status = client.setDatabase(new TDatabaseSchema(sg + i));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
// Create a DataRegionGroup for each StorageGroup
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBConfigNodeSwitchLeaderIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBConfigNodeSwitchLeaderIT.java
index 236d0df9e3..3c264f70bf 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBConfigNodeSwitchLeaderIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBConfigNodeSwitchLeaderIT.java
@@ -25,9 +25,9 @@ import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -102,9 +102,9 @@ public class IoTDBConfigNodeSwitchLeaderIT {
try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
// Set StorageGroups
- status = client.setDatabase((new TStorageGroupSchema(sg0)));
+ status = client.setDatabase((new TDatabaseSchema(sg0)));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
- status = client.setDatabase((new TStorageGroupSchema(sg1)));
+ status = client.setDatabase((new TDatabaseSchema(sg1)));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
// Create SchemaRegionGroups through getOrCreateSchemaPartition and record
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java
index 030b249a8e..5d72ff2a36 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java
@@ -26,12 +26,12 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -128,7 +128,7 @@ public class IoTDBAutoRegionGroupExtensionIT {
String curSg = sg + i;
TSStatus status =
client.setDatabase(
- new TStorageGroupSchema(curSg)
+ new TDatabaseSchema(curSg)
.setMinSchemaRegionGroupNum(testMinSchemaRegionGroupNum)
.setMinDataRegionGroupNum(testMinDataRegionGroupNum));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBCustomRegionGroupExtensionIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBCustomRegionGroupExtensionIT.java
index 6ee12cef1c..3db5f876ef 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBCustomRegionGroupExtensionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBCustomRegionGroupExtensionIT.java
@@ -25,11 +25,11 @@ import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -99,7 +99,7 @@ public class IoTDBCustomRegionGroupExtensionIT {
String curSg = sg + i;
/* Set StorageGroup */
- TSStatus status = client.setDatabase(new TStorageGroupSchema(curSg));
+ TSStatus status = client.setDatabase(new TDatabaseSchema(curSg));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
/* Insert a DataPartition to create DataRegionGroups */
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionCreationIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionCreationIT.java
index f978bcf425..33844dcf48 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionCreationIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionCreationIT.java
@@ -28,12 +28,12 @@ import org.apache.iotdb.commons.cluster.RegionStatus;
import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TRegionInfo;
import org.apache.iotdb.confignode.rpc.thrift.TSetDataNodeStatusReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -100,7 +100,7 @@ public class IoTDBPartitionCreationIT {
private void setStorageGroup() throws Exception {
try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
- TSStatus status = client.setDatabase(new TStorageGroupSchema(sg));
+ TSStatus status = client.setDatabase(new TDatabaseSchema(sg));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
}
}
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java
index 16b33942c5..7d409d7a5d 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java
@@ -30,6 +30,7 @@ import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TRegionInfo;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
@@ -38,7 +39,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -110,7 +110,7 @@ public class IoTDBPartitionDurableIT {
private void setStorageGroup() throws Exception {
try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
- TSStatus status = client.setDatabase(new TStorageGroupSchema(sg));
+ TSStatus status = client.setDatabase(new TDatabaseSchema(sg));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
}
}
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionGetterIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionGetterIT.java
index 6a851fea09..e9e19f6eaf 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionGetterIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionGetterIT.java
@@ -28,6 +28,7 @@ import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TGetRegionIdReq;
import org.apache.iotdb.confignode.rpc.thrift.TGetRegionIdResp;
import org.apache.iotdb.confignode.rpc.thrift.TGetSeriesSlotListReq;
@@ -39,8 +40,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TSchemaNodeManagementResp;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -112,7 +112,7 @@ public class IoTDBPartitionGetterIT {
(SyncConfigNodeIServiceClient) EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
/* Set StorageGroups */
for (int i = 0; i < storageGroupNum; i++) {
- TSStatus status = client.setDatabase(new TStorageGroupSchema(sg + i));
+ TSStatus status = client.setDatabase(new TDatabaseSchema(sg + i));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
}
@@ -326,7 +326,7 @@ public class IoTDBPartitionGetterIT {
// Check the number of DataRegionGroup.
// And this number should be greater than or equal to leastDataRegionGroupNum
- TShowStorageGroupResp showStorageGroupResp =
+ TShowDatabaseResp showStorageGroupResp =
client.showStorageGroup(Arrays.asList(storageGroup.split("\\.")));
Assert.assertTrue(
showStorageGroupResp.getStorageGroupInfoMap().get(storageGroup).getDataRegionNum()
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionInheritPolicyIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionInheritPolicyIT.java
index f4a054bc0a..a36df635b8 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionInheritPolicyIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionInheritPolicyIT.java
@@ -24,9 +24,9 @@ import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -82,7 +82,7 @@ public class IoTDBPartitionInheritPolicyIT {
try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
for (int i = 0; i < storageGroupNum; i++) {
- TSStatus status = client.setDatabase(new TStorageGroupSchema(sg + i));
+ TSStatus status = client.setDatabase(new TDatabaseSchema(sg + i));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());
}
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtils.java b/node-commons/src/main/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtils.java
index 1677caacc9..3a2be10483 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtils.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtils.java
@@ -20,8 +20,8 @@ package org.apache.iotdb.commons.utils;
import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.rpc.thrift.TPipeSinkInfo;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
@@ -67,7 +67,7 @@ public class ThriftConfigNodeSerDeUtils {
}
public static void serializeTStorageGroupSchema(
- TStorageGroupSchema storageGroupSchema, ByteBuffer buffer) {
+ TDatabaseSchema storageGroupSchema, ByteBuffer buffer) {
try {
storageGroupSchema.write(generateWriteProtocol(buffer));
} catch (TException e) {
@@ -75,8 +75,8 @@ public class ThriftConfigNodeSerDeUtils {
}
}
- public static TStorageGroupSchema deserializeTStorageGroupSchema(ByteBuffer buffer) {
- TStorageGroupSchema storageGroupSchema = new TStorageGroupSchema();
+ public static TDatabaseSchema deserializeTStorageGroupSchema(ByteBuffer buffer) {
+ TDatabaseSchema storageGroupSchema = new TDatabaseSchema();
try {
storageGroupSchema.read(generateReadProtocol(buffer));
} catch (TException e) {
@@ -86,7 +86,7 @@ public class ThriftConfigNodeSerDeUtils {
}
public static void serializeTStorageGroupSchema(
- TStorageGroupSchema storageGroupSchema, OutputStream outputStream) {
+ TDatabaseSchema storageGroupSchema, OutputStream outputStream) {
try {
storageGroupSchema.write(generateWriteProtocol(outputStream));
} catch (TException e) {
@@ -94,8 +94,8 @@ public class ThriftConfigNodeSerDeUtils {
}
}
- public static TStorageGroupSchema deserializeTStorageGroupSchema(InputStream inputStream) {
- TStorageGroupSchema storageGroupSchema = new TStorageGroupSchema();
+ public static TDatabaseSchema deserializeTStorageGroupSchema(InputStream inputStream) {
+ TDatabaseSchema storageGroupSchema = new TDatabaseSchema();
try {
storageGroupSchema.read(generateReadProtocol(inputStream));
} catch (TException e) {
diff --git a/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtilsTest.java b/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtilsTest.java
index 24aee00bf6..5d949079ac 100644
--- a/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtilsTest.java
+++ b/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftConfigNodeSerDeUtilsTest.java
@@ -20,7 +20,7 @@ package org.apache.iotdb.commons.utils;
import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.junit.After;
import org.junit.Assert;
@@ -39,7 +39,7 @@ public class ThriftConfigNodeSerDeUtilsTest {
@Test
public void readWriteTStorageGroupSchemaTest() {
- TStorageGroupSchema storageGroupSchema0 = new TStorageGroupSchema();
+ TDatabaseSchema storageGroupSchema0 = new TDatabaseSchema();
storageGroupSchema0.setName("root.sg");
storageGroupSchema0.setTTL(Long.MAX_VALUE);
storageGroupSchema0.setSchemaReplicationFactor(3);
@@ -48,7 +48,7 @@ public class ThriftConfigNodeSerDeUtilsTest {
ThriftConfigNodeSerDeUtils.serializeTStorageGroupSchema(storageGroupSchema0, buffer);
buffer.flip();
- TStorageGroupSchema storageGroupSchema1 =
+ TDatabaseSchema storageGroupSchema1 =
ThriftConfigNodeSerDeUtils.deserializeTStorageGroupSchema(buffer);
Assert.assertEquals(storageGroupSchema0, storageGroupSchema1);
}
diff --git a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java
index aac3de5a11..8efabdfb29 100644
--- a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java
+++ b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.metadata.schemaregion.rocksdb.mnode;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.metadata.mnode.IStorageGroupMNode;
import org.apache.iotdb.db.metadata.mnode.MNodeType;
import org.apache.iotdb.db.metadata.schemaregion.rocksdb.RSchemaConstants;
@@ -109,10 +109,10 @@ public class RStorageGroupMNode extends RInternalMNode implements IStorageGroupM
public void setTimePartitionInterval(long timePartitionInterval) {}
@Override
- public void setStorageGroupSchema(TStorageGroupSchema schema) {}
+ public void setStorageGroupSchema(TDatabaseSchema schema) {}
@Override
- public TStorageGroupSchema getStorageGroupSchema() {
+ public TDatabaseSchema getStorageGroupSchema() {
return null;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
index 8ddf9dccec..46498c02b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
@@ -55,6 +55,8 @@ import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRestartResp;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeUpdateReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TDeactivateSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupsReq;
@@ -102,18 +104,16 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowModelReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowModelResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TSystemConfigurationResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TUpdateModelInfoReq;
@@ -492,7 +492,7 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie
}
@Override
- public TSStatus setDatabase(TStorageGroupSchema databaseSchema) throws TException {
+ public TSStatus setDatabase(TDatabaseSchema databaseSchema) throws TException {
for (int i = 0; i < RETRY_NUM; i++) {
try {
TSStatus status = client.setDatabase(databaseSchema);
@@ -513,7 +513,7 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie
}
@Override
- public TSStatus alterDatabase(TStorageGroupSchema databaseSchema) throws TException {
+ public TSStatus alterDatabase(TDatabaseSchema databaseSchema) throws TException {
for (int i = 0; i < RETRY_NUM; i++) {
try {
TSStatus status = client.alterDatabase(databaseSchema);
@@ -598,12 +598,11 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie
}
@Override
- public TStorageGroupSchemaResp getMatchedStorageGroupSchemas(List<String> storageGroupPathPattern)
+ public TDatabaseSchemaResp getMatchedStorageGroupSchemas(List<String> storageGroupPathPattern)
throws TException {
for (int i = 0; i < RETRY_NUM; i++) {
try {
- TStorageGroupSchemaResp resp =
- client.getMatchedStorageGroupSchemas(storageGroupPathPattern);
+ TDatabaseSchemaResp resp = client.getMatchedStorageGroupSchemas(storageGroupPathPattern);
if (!updateConfigNodeLeader(resp.status)) {
return resp;
}
@@ -1149,12 +1148,11 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie
}
@Override
- public TShowStorageGroupResp showStorageGroup(List<String> storageGroupPathPattern)
+ public TShowDatabaseResp showStorageGroup(List<String> storageGroupPathPattern)
throws TException {
for (int i = 0; i < RETRY_NUM; i++) {
try {
- TShowStorageGroupResp showStorageGroupResp =
- client.showStorageGroup(storageGroupPathPattern);
+ TShowDatabaseResp showStorageGroupResp = client.showStorageGroup(storageGroupPathPattern);
if (!updateConfigNodeLeader(showStorageGroupResp.getStatus())) {
return showStorageGroupResp;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IStorageGroupMNode.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IStorageGroupMNode.java
index 60244cbf96..25d9e2f7b0 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IStorageGroupMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IStorageGroupMNode.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.metadata.mnode;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
/** This interface defines a StorageGroupMNode's operation interfaces. */
public interface IStorageGroupMNode extends IMNode {
@@ -33,7 +33,7 @@ public interface IStorageGroupMNode extends IMNode {
void setTimePartitionInterval(long timePartitionInterval);
- void setStorageGroupSchema(TStorageGroupSchema schema);
+ void setStorageGroupSchema(TDatabaseSchema schema);
- TStorageGroupSchema getStorageGroupSchema();
+ TDatabaseSchema getStorageGroupSchema();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupEntityMNode.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupEntityMNode.java
index 5f9d50cca8..f68a5ddad3 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupEntityMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupEntityMNode.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.metadata.mnode;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.metadata.mnode.visitor.MNodeVisitor;
public class StorageGroupEntityMNode extends EntityMNode implements IStorageGroupMNode {
@@ -61,10 +61,10 @@ public class StorageGroupEntityMNode extends EntityMNode implements IStorageGrou
public void setTimePartitionInterval(long timePartitionInterval) {}
@Override
- public void setStorageGroupSchema(TStorageGroupSchema schema) {}
+ public void setStorageGroupSchema(TDatabaseSchema schema) {}
@Override
- public TStorageGroupSchema getStorageGroupSchema() {
+ public TDatabaseSchema getStorageGroupSchema() {
return null;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupMNode.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupMNode.java
index 7fb6e90d03..2cf4d75c75 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupMNode.java
@@ -18,14 +18,14 @@
*/
package org.apache.iotdb.db.metadata.mnode;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.metadata.mnode.visitor.MNodeVisitor;
public class StorageGroupMNode extends InternalMNode implements IStorageGroupMNode {
private static final long serialVersionUID = 7999036474525817732L;
- private TStorageGroupSchema schema;
+ private TDatabaseSchema schema;
public StorageGroupMNode(IMNode parent, String name) {
super(parent, name);
@@ -34,7 +34,7 @@ public class StorageGroupMNode extends InternalMNode implements IStorageGroupMNo
// TODO: @yukun, remove this constructor
public StorageGroupMNode(IMNode parent, String name, long dataTTL) {
super(parent, name);
- this.schema = new TStorageGroupSchema(name).setTTL(dataTTL);
+ this.schema = new TDatabaseSchema(name).setTTL(dataTTL);
}
@Override
@@ -71,12 +71,12 @@ public class StorageGroupMNode extends InternalMNode implements IStorageGroupMNo
}
@Override
- public void setStorageGroupSchema(TStorageGroupSchema schema) {
+ public void setStorageGroupSchema(TDatabaseSchema schema) {
this.schema = schema;
}
@Override
- public TStorageGroupSchema getStorageGroupSchema() {
+ public TDatabaseSchema getStorageGroupSchema() {
return schema;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
index 16dff082fe..898db7c635 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
@@ -37,9 +37,9 @@ import org.apache.iotdb.commons.partition.SeriesPartitionTable;
import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.utils.PathUtils;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.db.client.ConfigNodeClient;
import org.apache.iotdb.db.client.ConfigNodeClientManager;
import org.apache.iotdb.db.client.ConfigNodeInfo;
@@ -190,7 +190,7 @@ public class PartitionCache {
result.reset();
getStorageGroupMap(result, devicePaths, true);
if (!result.isSuccess()) {
- TStorageGroupSchemaResp storageGroupSchemaResp =
+ TDatabaseSchemaResp storageGroupSchemaResp =
client.getMatchedStorageGroupSchemas(ROOT_PATH);
if (storageGroupSchemaResp.getStatus().getCode()
== TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
@@ -235,7 +235,7 @@ public class PartitionCache {
// try to create databases one by one until done or one database fail
Set<String> successFullyCreatedStorageGroup = new HashSet<>();
for (String storageGroupName : storageGroupNamesNeedCreated) {
- TStorageGroupSchema storageGroupSchema = new TStorageGroupSchema();
+ TDatabaseSchema storageGroupSchema = new TDatabaseSchema();
storageGroupSchema.setName(storageGroupName);
TSStatus tsStatus = client.setDatabase(storageGroupSchema);
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() == tsStatus.getCode()) {
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 e835df708b..e74d93a428 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
@@ -39,6 +39,8 @@ import org.apache.iotdb.confignode.rpc.thrift.TCreateCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateFunctionReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateTriggerReq;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TDeactivateSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupsReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteTimeSeriesReq;
@@ -63,15 +65,13 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
import org.apache.iotdb.db.client.ConfigNodeClient;
import org.apache.iotdb.db.client.ConfigNodeClientManager;
@@ -203,7 +203,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
DatabaseSchemaStatement databaseSchemaStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
// Construct request using statement
- TStorageGroupSchema storageGroupSchema =
+ TDatabaseSchema storageGroupSchema =
DatabaseSchemaTask.constructStorageGroupSchema(databaseSchemaStatement);
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.configNodeRegionId)) {
@@ -230,7 +230,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
DatabaseSchemaStatement databaseSchemaStatement) {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
// Construct request using statement
- TStorageGroupSchema storageGroupSchema =
+ TDatabaseSchema storageGroupSchema =
DatabaseSchemaTask.constructStorageGroupSchema(databaseSchemaStatement);
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.configNodeRegionId)) {
@@ -262,7 +262,7 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
try (ConfigNodeClient client =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.configNodeRegionId)) {
// Send request to some API server
- TShowStorageGroupResp resp = client.showStorageGroup(storageGroupPathPattern);
+ TShowDatabaseResp resp = client.showStorageGroup(storageGroupPathPattern);
// build TSBlock
showStorageGroupStatement.buildTSBlock(resp.getStorageGroupInfoMap(), future);
} catch (ClientManagerException | TException e) {
@@ -856,18 +856,16 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.configNodeRegionId)) {
if (showTTLStatement.isAll()) {
List<String> allStorageGroupPathPattern = Arrays.asList("root", "**");
- TStorageGroupSchemaResp resp =
- client.getMatchedStorageGroupSchemas(allStorageGroupPathPattern);
- for (Map.Entry<String, TStorageGroupSchema> entry :
+ TDatabaseSchemaResp resp = client.getMatchedStorageGroupSchemas(allStorageGroupPathPattern);
+ for (Map.Entry<String, TDatabaseSchema> entry :
resp.getStorageGroupSchemaMap().entrySet()) {
storageGroupToTTL.put(entry.getKey(), entry.getValue().getTTL());
}
} else {
for (PartialPath storageGroupPath : storageGroupPaths) {
List<String> storageGroupPathPattern = Arrays.asList(storageGroupPath.getNodes());
- TStorageGroupSchemaResp resp =
- client.getMatchedStorageGroupSchemas(storageGroupPathPattern);
- for (Map.Entry<String, TStorageGroupSchema> entry :
+ TDatabaseSchemaResp resp = client.getMatchedStorageGroupSchemas(storageGroupPathPattern);
+ for (Map.Entry<String, TDatabaseSchema> entry :
resp.getStorageGroupSchemaMap().entrySet()) {
if (!storageGroupToTTL.containsKey(entry.getKey())) {
storageGroupToTTL.put(entry.getKey(), entry.getValue().getTTL());
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 2771f3cb49..ee431f4e34 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
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.mpp.plan.execution.config.metadata;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
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;
@@ -49,9 +49,9 @@ public class DatabaseSchemaTask implements IConfigTask {
}
/** Construct DatabaseSchema according to statement */
- public static TStorageGroupSchema constructStorageGroupSchema(
+ public static TDatabaseSchema constructStorageGroupSchema(
DatabaseSchemaStatement databaseSchemaStatement) {
- TStorageGroupSchema storageGroupSchema = new TStorageGroupSchema();
+ TDatabaseSchema storageGroupSchema = new TDatabaseSchema();
storageGroupSchema.setName(databaseSchemaStatement.getStorageGroupPath().getFullPath());
if (databaseSchemaStatement.getTTL() != null) {
storageGroupSchema.setTTL(databaseSchemaStatement.getTTL());
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/ShowStorageGroupStatement.java
index c20a5ece03..e5e98ab8d8 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/ShowStorageGroupStatement.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.mpp.plan.statement.metadata;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupInfo;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseInfo;
import org.apache.iotdb.db.mpp.common.header.ColumnHeader;
import org.apache.iotdb.db.mpp.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
@@ -72,7 +72,7 @@ public class ShowStorageGroupStatement extends ShowStatement implements IConfigS
}
public void buildTSBlock(
- Map<String, TStorageGroupInfo> storageGroupInfoMap, SettableFuture<ConfigTaskResult> future) {
+ Map<String, TDatabaseInfo> storageGroupInfoMap, SettableFuture<ConfigTaskResult> future) {
List<TSDataType> outputDataTypes =
isDetailed
@@ -84,9 +84,9 @@ public class ShowStorageGroupStatement extends ShowStatement implements IConfigS
.collect(Collectors.toList());
TsBlockBuilder builder = new TsBlockBuilder(outputDataTypes);
- for (Map.Entry<String, TStorageGroupInfo> entry : storageGroupInfoMap.entrySet()) {
+ for (Map.Entry<String, TDatabaseInfo> entry : storageGroupInfoMap.entrySet()) {
String storageGroup = entry.getKey();
- TStorageGroupInfo storageGroupInfo = entry.getValue();
+ TDatabaseInfo storageGroupInfo = entry.getValue();
builder.getTimeColumnBuilder().writeLong(0L);
builder.getColumnBuilder(0).writeBinary(new Binary(storageGroup));
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 a7a2f5588c..e23dfe2491 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
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.metadata.mtree;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.metadata.mnode.IMNode;
import org.apache.iotdb.db.metadata.mnode.IStorageGroupMNode;
import org.apache.iotdb.db.utils.EnvironmentUtils;
@@ -257,7 +257,7 @@ public class ConfigMTreeTest {
newTree.deserialize(inputStream);
for (int i = 0; i < pathList.length; i++) {
- TStorageGroupSchema storageGroupSchema =
+ TDatabaseSchema storageGroupSchema =
newTree.getStorageGroupNodeByStorageGroupPath(pathList[i]).getStorageGroupSchema();
Assert.assertEquals(i, storageGroupSchema.getTTL());
Assert.assertEquals(i, storageGroupSchema.getSchemaReplicationFactor());
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift b/thrift-confignode/src/main/thrift/confignode.thrift
index de3006fc9a..46c55a955f 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -174,13 +174,13 @@ struct TCountStorageGroupResp {
2: optional i32 count
}
-struct TStorageGroupSchemaResp {
+struct TDatabaseSchemaResp {
1: required common.TSStatus status
- // map<string, TStorageGroupSchema>
- 2: optional map<string, TStorageGroupSchema> storageGroupSchemaMap
+ // map<string, TDatabaseSchema>
+ 2: optional map<string, TDatabaseSchema> storageGroupSchemaMap
}
-struct TStorageGroupSchema {
+struct TDatabaseSchema {
1: required string name
2: optional i64 TTL
3: optional i32 schemaReplicationFactor
@@ -482,8 +482,8 @@ struct TShowConfigNodesResp {
2: optional list<TConfigNodeInfo> configNodesInfoList
}
-// Show storageGroup
-struct TStorageGroupInfo {
+// Show Database
+struct TDatabaseInfo {
1: required string name
2: required i64 TTL
3: required i32 schemaReplicationFactor
@@ -497,10 +497,10 @@ struct TStorageGroupInfo {
11: required i32 maxDataRegionNum
}
-struct TShowStorageGroupResp {
+struct TShowDatabaseResp {
1: required common.TSStatus status
- // map<StorageGroupName, TStorageGroupInfo>
- 2: optional map<string, TStorageGroupInfo> storageGroupInfoMap
+ // map<DatabaseName, TDatabaseInfo>
+ 2: optional map<string, TDatabaseInfo> storageGroupInfoMap
}
// Show regions
@@ -781,7 +781,7 @@ service IConfigNodeRPCService {
// ======================================================
/**
- * Set a new Databse, all fields in TStorageGroupSchema can be customized
+ * Set a new Databse, all fields in TDatabaseSchema can be customized
* while the undefined fields will automatically use default values
*
* @return SUCCESS_STATUS if the new Database set successfully
@@ -789,7 +789,7 @@ service IConfigNodeRPCService {
* DATABASE_CONFIG_ERROR if some of the DatabaseSchema is illeagal
* DATABASE_ALREADY_EXISTS if the Database already exist
*/
- common.TSStatus setDatabase(TStorageGroupSchema databaseSchema)
+ common.TSStatus setDatabase(TDatabaseSchema databaseSchema)
/**
* Alter a Database's schema, including
@@ -800,7 +800,7 @@ service IConfigNodeRPCService {
* DATABASE_CONFIG_ERROR if some of the DatabaseSchema is illeagal
* DATABASE_NOT_EXIST if the specified Database doesn't exist
*/
- common.TSStatus alterDatabase(TStorageGroupSchema databaseSchema)
+ common.TSStatus alterDatabase(TDatabaseSchema databaseSchema)
/**
* Generate a DeleteStorageGroupProcedure to delete a specific StorageGroup
@@ -835,8 +835,8 @@ service IConfigNodeRPCService {
/** Count the matched StorageGroups */
TCountStorageGroupResp countMatchedStorageGroups(list<string> storageGroupPathPattern)
- /** Get the matched StorageGroups' TStorageGroupSchema */
- TStorageGroupSchemaResp getMatchedStorageGroupSchemas(list<string> storageGroupPathPattern)
+ /** Get the matched StorageGroups' TDatabaseSchema */
+ TDatabaseSchemaResp getMatchedStorageGroupSchemas(list<string> storageGroupPathPattern)
// ======================================================
// SchemaPartition
@@ -1102,7 +1102,7 @@ service IConfigNodeRPCService {
TShowConfigNodesResp showConfigNodes()
/** Show cluster StorageGroups' information */
- TShowStorageGroupResp showStorageGroup(list<string> storageGroupPathPattern)
+ TShowDatabaseResp showStorageGroup(list<string> storageGroupPathPattern)
/**
* Show the matched cluster Regions' information