This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch table_disk_usage_statistics_with_cache in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 640f99811b1c2c6ad804dd2eb2028ee8902f328d Author: shuwenwei <[email protected]> AuthorDate: Thu Jan 8 16:02:59 2026 +0800 fix conflict --- .../queryengine/execution/operator/source/ShowDiskUsageOperator.java | 4 ++-- .../java/org/apache/iotdb/commons/schema/table/InformationSchema.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java index 8c51eb8dbb1..79b01cbcd3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java @@ -82,7 +82,7 @@ public class ShowDiskUsageOperator implements SourceOperator { Object[] row = new Object[4]; row[0] = new Binary(dataRegion.getDatabaseName(), TSFileConfig.STRING_CHARSET); row[1] = IoTDBDescriptor.getInstance().getConfig().getDataNodeId(); - row[2] = Integer.parseInt(dataRegion.getDataRegionId()); + row[2] = Integer.parseInt(dataRegion.getDataRegionIdString()); row[3] = timePartition; if (!pushDownFilter.satisfyRow(0, row)) { return false; @@ -127,7 +127,7 @@ public class ShowDiskUsageOperator implements SourceOperator { tsBlockBuilder.getValueColumnBuilders()[1].writeInt( IoTDBDescriptor.getInstance().getConfig().getDataNodeId()); tsBlockBuilder.getValueColumnBuilders()[2].writeInt( - Integer.parseInt(timePartitionIterator.currentDataRegion().getDataRegionId())); + Integer.parseInt(timePartitionIterator.currentDataRegion().getDataRegionIdString())); tsBlockBuilder.getValueColumnBuilders()[3].writeLong( timePartitionIterator.currentTimePartition()); tsBlockBuilder.getValueColumnBuilders()[4].writeLong(statisticUtil.getResult()[0]); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java index 7a4de8d8573..58733c7d468 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchema.java @@ -361,7 +361,7 @@ public class InformationSchema { tableDiskUsageTable.addColumnSchema( new FieldColumnSchema(ColumnHeaderConstant.TABLE_NAME_TABLE_MODEL, TSDataType.STRING)); tableDiskUsageTable.addColumnSchema( - new FieldColumnSchema(ColumnHeaderConstant.NODE_ID_TABLE_MODEL, TSDataType.INT32)); + new FieldColumnSchema(ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL, TSDataType.INT32)); tableDiskUsageTable.addColumnSchema( new FieldColumnSchema(ColumnHeaderConstant.REGION_ID_TABLE_MODEL, TSDataType.INT32)); tableDiskUsageTable.addColumnSchema( @@ -394,7 +394,7 @@ public class InformationSchema { ImmutableSet.of( ColumnHeaderConstant.DATABASE, ColumnHeaderConstant.TABLE_NAME_TABLE_MODEL, - ColumnHeaderConstant.NODE_ID_TABLE_MODEL, + ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL, ColumnHeaderConstant.REGION_ID_TABLE_MODEL, ColumnHeaderConstant.TIME_PARTITION_TABLE_MODEL));
