Skip to content

Commit a7dadfa

Browse files
zerolbsonyzerolbsony
committed
fix: align database region group column order
1 parent fea9ffe commit a7dadfa

5 files changed

Lines changed: 21 additions & 24 deletions

File tree

‎integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
package org.apache.iotdb.relational.it.schema;
2121

22+
import org.apache.iotdb.commons.schema.table.InformationSchema;
23+
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
2224
import org.apache.iotdb.db.it.utils.TestUtils;
2325
import org.apache.iotdb.it.env.EnvFactory;
2426
import org.apache.iotdb.it.framework.IoTDBTestRunner;
2527
import org.apache.iotdb.itbase.category.TableClusterIT;
2628
import org.apache.iotdb.itbase.category.TableLocalStandaloneIT;
2729
import org.apache.iotdb.itbase.env.BaseEnv;
28-
import org.apache.iotdb.commons.schema.table.InformationSchema;
29-
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
3030

3131
import org.junit.After;
3232
import org.junit.Assert;
@@ -165,9 +165,9 @@ public void testManageDatabase() {
165165
assertEquals(dataReplicaFactors[cnt], resultSet.getInt(4));
166166
assertEquals(timePartitionInterval[cnt], resultSet.getLong(5));
167167
assertEquals(schemaRegionGroupNum[cnt], resultSet.getInt(6));
168-
assertEquals(dataRegionGroupNum[cnt], resultSet.getInt(7));
169-
assertEquals(minSchemaRegionGroupNum[cnt], resultSet.getInt(8));
170-
assertTrue(resultSet.getInt(9) >= minSchemaRegionGroupNum[cnt]);
168+
assertEquals(minSchemaRegionGroupNum[cnt], resultSet.getInt(7));
169+
assertTrue(resultSet.getInt(8) >= minSchemaRegionGroupNum[cnt]);
170+
assertEquals(dataRegionGroupNum[cnt], resultSet.getInt(9));
171171
assertEquals(minDataRegionGroupNum[cnt], resultSet.getInt(10));
172172
assertTrue(resultSet.getInt(11) >= minDataRegionGroupNum[cnt]);
173173
cnt++;
@@ -654,13 +654,10 @@ public void testInformationSchema() throws SQLException {
654654
try (final ResultSet resultSet = statement.executeQuery("select * from databases")) {
655655
final ResultSetMetaData metaData = resultSet.getMetaData();
656656
final List<TsTableColumnSchema> expectedColumnSchemas =
657-
InformationSchema.getSchemaTables()
658-
.get(InformationSchema.DATABASES)
659-
.getColumnList();
657+
InformationSchema.getSchemaTables().get(InformationSchema.DATABASES).getColumnList();
660658
assertEquals(expectedColumnSchemas.size(), metaData.getColumnCount());
661659
for (int i = 0; i < expectedColumnSchemas.size(); i++) {
662-
assertEquals(
663-
expectedColumnSchemas.get(i).getColumnName(), metaData.getColumnName(i + 1));
660+
assertEquals(expectedColumnSchemas.get(i).getColumnName(), metaData.getColumnName(i + 1));
664661
}
665662

666663
int cnt = 0;
@@ -676,9 +673,9 @@ public void testInformationSchema() throws SQLException {
676673
assertEquals(1, resultSet.getInt(4));
677674
assertEquals(604800000, resultSet.getLong(5));
678675
assertEquals(0, resultSet.getInt(6));
679-
assertEquals(0, resultSet.getInt(7));
680-
assertEquals(1, resultSet.getInt(8));
681-
assertTrue(resultSet.getInt(9) >= resultSet.getInt(8));
676+
assertEquals(1, resultSet.getInt(7));
677+
assertTrue(resultSet.getInt(8) >= resultSet.getInt(7));
678+
assertEquals(0, resultSet.getInt(9));
682679
assertEquals(2, resultSet.getInt(10));
683680
assertTrue(resultSet.getInt(11) >= resultSet.getInt(10));
684681
}
@@ -887,7 +884,7 @@ public void testDBAuth() throws SQLException {
887884
Collections.singleton("information_schema,INF,null,null,null,"));
888885
TestUtils.assertResultSetEqual(
889886
userStmt.executeQuery("select * from information_schema.databases"),
890-
"database,ttl(ms),schema_replication_factor,data_replication_factor,time_partition_interval,schema_region_group_num,data_region_group_num,min_schema_region_group_num,max_schema_region_group_num,min_data_region_group_num,max_data_region_group_num,",
887+
"database,ttl(ms),schema_replication_factor,data_replication_factor,time_partition_interval,schema_region_group_num,min_schema_region_group_num,max_schema_region_group_num,data_region_group_num,min_data_region_group_num,max_data_region_group_num,",
891888
Collections.singleton(
892889
"information_schema,INF,null,null,null,null,null,null,null,null,null,"));
893890
}

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ protected void constructLine() {
345345
columnBuilders[3].writeInt(currentDatabase.getDataReplicationFactor());
346346
columnBuilders[4].writeLong(currentDatabase.getTimePartitionInterval());
347347
columnBuilders[5].writeInt(currentDatabase.getSchemaRegionNum());
348-
columnBuilders[6].writeInt(currentDatabase.getDataRegionNum());
349-
columnBuilders[7].writeInt(currentDatabase.getMinSchemaRegionNum());
350-
columnBuilders[8].writeInt(currentDatabase.getMaxSchemaRegionNum());
348+
columnBuilders[6].writeInt(currentDatabase.getMinSchemaRegionNum());
349+
columnBuilders[7].writeInt(currentDatabase.getMaxSchemaRegionNum());
350+
columnBuilders[8].writeInt(currentDatabase.getDataRegionNum());
351351
columnBuilders[9].writeInt(currentDatabase.getMinDataRegionNum());
352352
columnBuilders[10].writeInt(currentDatabase.getMaxDataRegionNum());
353353
resultBuilder.declarePosition();

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ private static void buildTSBlockForDetails(
166166
builder.getColumnBuilder(3).writeInt(storageGroupInfo.getDataReplicationFactor());
167167
builder.getColumnBuilder(4).writeLong(storageGroupInfo.getTimePartitionInterval());
168168
builder.getColumnBuilder(5).writeInt(storageGroupInfo.getSchemaRegionNum());
169-
builder.getColumnBuilder(6).writeInt(storageGroupInfo.getDataRegionNum());
170-
builder.getColumnBuilder(7).writeInt(storageGroupInfo.getMinSchemaRegionNum());
171-
builder.getColumnBuilder(8).writeInt(storageGroupInfo.getMaxSchemaRegionNum());
169+
builder.getColumnBuilder(6).writeInt(storageGroupInfo.getMinSchemaRegionNum());
170+
builder.getColumnBuilder(7).writeInt(storageGroupInfo.getMaxSchemaRegionNum());
171+
builder.getColumnBuilder(8).writeInt(storageGroupInfo.getDataRegionNum());
172172
builder.getColumnBuilder(9).writeInt(storageGroupInfo.getMinDataRegionNum());
173173
builder.getColumnBuilder(10).writeInt(storageGroupInfo.getMaxDataRegionNum());
174174
builder.declarePosition();

‎iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,9 +736,9 @@ private ColumnHeaderConstant() {
736736
new ColumnHeader(DATA_REPLICATION_FACTOR, TSDataType.INT32),
737737
new ColumnHeader(TIME_PARTITION_INTERVAL, TSDataType.INT64),
738738
new ColumnHeader(SCHEMA_REGION_GROUP_NUM, TSDataType.INT32),
739-
new ColumnHeader(DATA_REGION_GROUP_NUM, TSDataType.INT32),
740739
new ColumnHeader(MIN_SCHEMA_REGION_GROUP_NUM, TSDataType.INT32),
741740
new ColumnHeader(MAX_SCHEMA_REGION_GROUP_NUM, TSDataType.INT32),
741+
new ColumnHeader(DATA_REGION_GROUP_NUM, TSDataType.INT32),
742742
new ColumnHeader(MIN_DATA_REGION_GROUP_NUM, TSDataType.INT32),
743743
new ColumnHeader(MAX_DATA_REGION_GROUP_NUM, TSDataType.INT32));
744744

‎iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ public class InformationSchema {
106106
databaseTable.addColumnSchema(
107107
new AttributeColumnSchema(
108108
ColumnHeaderConstant.SCHEMA_REGION_GROUP_NUM_TABLE_MODEL, TSDataType.INT32));
109-
databaseTable.addColumnSchema(
110-
new AttributeColumnSchema(
111-
ColumnHeaderConstant.DATA_REGION_GROUP_NUM_TABLE_MODEL, TSDataType.INT32));
112109
databaseTable.addColumnSchema(
113110
new AttributeColumnSchema(
114111
ColumnHeaderConstant.MIN_SCHEMA_REGION_GROUP_NUM_TABLE_MODEL, TSDataType.INT32));
115112
databaseTable.addColumnSchema(
116113
new AttributeColumnSchema(
117114
ColumnHeaderConstant.MAX_SCHEMA_REGION_GROUP_NUM_TABLE_MODEL, TSDataType.INT32));
115+
databaseTable.addColumnSchema(
116+
new AttributeColumnSchema(
117+
ColumnHeaderConstant.DATA_REGION_GROUP_NUM_TABLE_MODEL, TSDataType.INT32));
118118
databaseTable.addColumnSchema(
119119
new AttributeColumnSchema(
120120
ColumnHeaderConstant.MIN_DATA_REGION_GROUP_NUM_TABLE_MODEL, TSDataType.INT32));

0 commit comments

Comments
 (0)