Skip to content

Commit 500c55b

Browse files
authored
[To dev/1.3] Remove the min_schema/data_region_group_num field in the query result (#18495)
1 parent 3fbbe5f commit 500c55b

4 files changed

Lines changed: 3 additions & 15 deletions

File tree

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,8 @@ public TShowDatabaseResp showDatabase(GetDatabasePlan getDatabasePlan) {
356356
databaseInfo.setDataReplicationFactor(databaseSchema.getDataReplicationFactor());
357357
databaseInfo.setTimePartitionOrigin(databaseSchema.getTimePartitionOrigin());
358358
databaseInfo.setTimePartitionInterval(databaseSchema.getTimePartitionInterval());
359-
databaseInfo.setMinSchemaRegionNum(
360-
getMinRegionGroupNum(database, TConsensusGroupType.SchemaRegion));
361359
databaseInfo.setMaxSchemaRegionNum(
362360
getMaxRegionGroupNum(database, TConsensusGroupType.SchemaRegion));
363-
databaseInfo.setMinDataRegionNum(
364-
getMinRegionGroupNum(database, TConsensusGroupType.DataRegion));
365361
databaseInfo.setMaxDataRegionNum(
366362
getMaxRegionGroupNum(database, TConsensusGroupType.DataRegion));
367363

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ private ColumnHeaderConstant() {
5959
public static final String TIME_PARTITION_ORIGIN = "TimePartitionOrigin";
6060
public static final String TIME_PARTITION_INTERVAL = "TimePartitionInterval";
6161
public static final String SCHEMA_REGION_GROUP_NUM = "SchemaRegionGroupNum";
62-
public static final String MIN_SCHEMA_REGION_GROUP_NUM = "MinSchemaRegionGroupNum";
6362
public static final String MAX_SCHEMA_REGION_GROUP_NUM = "MaxSchemaRegionGroupNum";
6463
public static final String DATA_REGION_GROUP_NUM = "DataRegionGroupNum";
65-
public static final String MIN_DATA_REGION_GROUP_NUM = "MinDataRegionGroupNum";
6664
public static final String MAX_DATA_REGION_GROUP_NUM = "MaxDataRegionGroupNum";
6765
public static final String CHILD_PATHS = "ChildPaths";
6866
public static final String NODE_TYPES = "NodeTypes";
@@ -278,10 +276,8 @@ private ColumnHeaderConstant() {
278276
new ColumnHeader(TIME_PARTITION_ORIGIN, TSDataType.INT64),
279277
new ColumnHeader(TIME_PARTITION_INTERVAL, TSDataType.INT64),
280278
new ColumnHeader(SCHEMA_REGION_GROUP_NUM, TSDataType.INT32),
281-
new ColumnHeader(MIN_SCHEMA_REGION_GROUP_NUM, TSDataType.INT32),
282279
new ColumnHeader(MAX_SCHEMA_REGION_GROUP_NUM, TSDataType.INT32),
283280
new ColumnHeader(DATA_REGION_GROUP_NUM, TSDataType.INT32),
284-
new ColumnHeader(MIN_DATA_REGION_GROUP_NUM, TSDataType.INT32),
285281
new ColumnHeader(MAX_DATA_REGION_GROUP_NUM, TSDataType.INT32));
286282

287283
public static final List<ColumnHeader> showChildPathsColumnHeaders =

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,9 @@ public void buildTSBlock(
101101
builder.getColumnBuilder(4).writeLong(storageGroupInfo.getTimePartitionInterval());
102102
if (isDetailed) {
103103
builder.getColumnBuilder(5).writeInt(storageGroupInfo.getSchemaRegionNum());
104-
builder.getColumnBuilder(6).writeInt(storageGroupInfo.getMinSchemaRegionNum());
105-
builder.getColumnBuilder(7).writeInt(storageGroupInfo.getMaxSchemaRegionNum());
106-
builder.getColumnBuilder(8).writeInt(storageGroupInfo.getDataRegionNum());
107-
builder.getColumnBuilder(9).writeInt(storageGroupInfo.getMinDataRegionNum());
108-
builder.getColumnBuilder(10).writeInt(storageGroupInfo.getMaxDataRegionNum());
104+
builder.getColumnBuilder(6).writeInt(storageGroupInfo.getMaxSchemaRegionNum());
105+
builder.getColumnBuilder(7).writeInt(storageGroupInfo.getDataRegionNum());
106+
builder.getColumnBuilder(8).writeInt(storageGroupInfo.getMaxDataRegionNum());
109107
}
110108
builder.declarePosition();
111109
}

‎iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,10 +603,8 @@ struct TDatabaseInfo {
603603
4: required i32 dataReplicationFactor
604604
5: required i64 timePartitionInterval
605605
6: required i32 schemaRegionNum
606-
7: required i32 minSchemaRegionNum
607606
8: required i32 maxSchemaRegionNum
608607
9: required i32 dataRegionNum
609-
10: required i32 minDataRegionNum
610608
11: required i32 maxDataRegionNum
611609
12: optional i64 timePartitionOrigin
612610
}

0 commit comments

Comments
 (0)