This is an automated email from the ASF dual-hosted git repository. JackieTien97 pushed a commit to branch rc/1.3.8 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ac360caf6f1f5e83c50296f9f9ad83fe3944b3fd Author: libo <[email protected]> AuthorDate: Wed Aug 19 16:45:45 2026 +0800 [To dev/1.3] Remove the min_schema/data_region_group_num field in the query result (#18495) --- .../iotdb/confignode/manager/schema/ClusterSchemaManager.java | 4 ---- .../iotdb/db/queryengine/common/header/ColumnHeaderConstant.java | 4 ---- .../plan/statement/metadata/ShowDatabaseStatement.java | 8 +++----- .../thrift-confignode/src/main/thrift/confignode.thrift | 2 -- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java index e267cfd9250..bdcbbcabb87 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java @@ -356,12 +356,8 @@ public class ClusterSchemaManager { databaseInfo.setDataReplicationFactor(databaseSchema.getDataReplicationFactor()); databaseInfo.setTimePartitionOrigin(databaseSchema.getTimePartitionOrigin()); databaseInfo.setTimePartitionInterval(databaseSchema.getTimePartitionInterval()); - databaseInfo.setMinSchemaRegionNum( - getMinRegionGroupNum(database, TConsensusGroupType.SchemaRegion)); databaseInfo.setMaxSchemaRegionNum( getMaxRegionGroupNum(database, TConsensusGroupType.SchemaRegion)); - databaseInfo.setMinDataRegionNum( - getMinRegionGroupNum(database, TConsensusGroupType.DataRegion)); databaseInfo.setMaxDataRegionNum( getMaxRegionGroupNum(database, TConsensusGroupType.DataRegion)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java index 92712daee52..7c49cc21a6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java @@ -59,10 +59,8 @@ public class ColumnHeaderConstant { public static final String TIME_PARTITION_ORIGIN = "TimePartitionOrigin"; public static final String TIME_PARTITION_INTERVAL = "TimePartitionInterval"; public static final String SCHEMA_REGION_GROUP_NUM = "SchemaRegionGroupNum"; - public static final String MIN_SCHEMA_REGION_GROUP_NUM = "MinSchemaRegionGroupNum"; public static final String MAX_SCHEMA_REGION_GROUP_NUM = "MaxSchemaRegionGroupNum"; public static final String DATA_REGION_GROUP_NUM = "DataRegionGroupNum"; - public static final String MIN_DATA_REGION_GROUP_NUM = "MinDataRegionGroupNum"; public static final String MAX_DATA_REGION_GROUP_NUM = "MaxDataRegionGroupNum"; public static final String CHILD_PATHS = "ChildPaths"; public static final String NODE_TYPES = "NodeTypes"; @@ -278,10 +276,8 @@ public class ColumnHeaderConstant { new ColumnHeader(TIME_PARTITION_ORIGIN, TSDataType.INT64), new ColumnHeader(TIME_PARTITION_INTERVAL, TSDataType.INT64), new ColumnHeader(SCHEMA_REGION_GROUP_NUM, TSDataType.INT32), - new ColumnHeader(MIN_SCHEMA_REGION_GROUP_NUM, TSDataType.INT32), new ColumnHeader(MAX_SCHEMA_REGION_GROUP_NUM, TSDataType.INT32), new ColumnHeader(DATA_REGION_GROUP_NUM, TSDataType.INT32), - new ColumnHeader(MIN_DATA_REGION_GROUP_NUM, TSDataType.INT32), new ColumnHeader(MAX_DATA_REGION_GROUP_NUM, TSDataType.INT32)); public static final List<ColumnHeader> showChildPathsColumnHeaders = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java index 356336bf5ad..16ca343f0e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java @@ -101,11 +101,9 @@ public class ShowDatabaseStatement extends ShowStatement implements IConfigState builder.getColumnBuilder(4).writeLong(storageGroupInfo.getTimePartitionInterval()); if (isDetailed) { builder.getColumnBuilder(5).writeInt(storageGroupInfo.getSchemaRegionNum()); - builder.getColumnBuilder(6).writeInt(storageGroupInfo.getMinSchemaRegionNum()); - builder.getColumnBuilder(7).writeInt(storageGroupInfo.getMaxSchemaRegionNum()); - builder.getColumnBuilder(8).writeInt(storageGroupInfo.getDataRegionNum()); - builder.getColumnBuilder(9).writeInt(storageGroupInfo.getMinDataRegionNum()); - builder.getColumnBuilder(10).writeInt(storageGroupInfo.getMaxDataRegionNum()); + builder.getColumnBuilder(6).writeInt(storageGroupInfo.getMaxSchemaRegionNum()); + builder.getColumnBuilder(7).writeInt(storageGroupInfo.getDataRegionNum()); + builder.getColumnBuilder(8).writeInt(storageGroupInfo.getMaxDataRegionNum()); } builder.declarePosition(); } diff --git a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift index b04274945da..1ffaa4ffa7f 100644 --- a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift +++ b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift @@ -603,10 +603,8 @@ struct TDatabaseInfo { 4: required i32 dataReplicationFactor 5: required i64 timePartitionInterval 6: required i32 schemaRegionNum - 7: required i32 minSchemaRegionNum 8: required i32 maxSchemaRegionNum 9: required i32 dataRegionNum - 10: required i32 minDataRegionNum 11: required i32 maxDataRegionNum 12: optional i64 timePartitionOrigin }
