This is an automated email from the ASF dual-hosted git repository. yongzao pushed a commit to branch add-internal-address-in-show-region in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f9d82908ecae68470864e64562890d4db49f2f3a Author: YongzaoDan <[email protected]> AuthorDate: Wed Jan 17 14:10:42 2024 +0800 Finish --- .../persistence/partition/DatabasePartitionTable.java | 1 + .../db/queryengine/common/header/ColumnHeaderConstant.java | 1 + .../plan/execution/config/metadata/ShowRegionTask.java | 11 +++++++---- .../thrift-confignode/src/main/thrift/confignode.thrift | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/DatabasePartitionTable.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/DatabasePartitionTable.java index aaa9d53ccf1..8ba1eac0b07 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/DatabasePartitionTable.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/DatabasePartitionTable.java @@ -439,6 +439,7 @@ public class DatabasePartitionTable { regionInfo.setClientRpcIp(dataNodeLocation.getClientRpcEndPoint().getIp()); regionInfo.setClientRpcPort(dataNodeLocation.getClientRpcEndPoint().getPort()); regionInfo.setCreateTime(regionGroup.getCreateTime()); + regionInfo.setInternalAddress(dataNodeLocation.getInternalEndPoint().getIp()); regionInfoList.add(regionInfo); }); 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 39456586239..e952d5dcc00 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 @@ -299,6 +299,7 @@ public class ColumnHeaderConstant { new ColumnHeader(SERIES_SLOT_NUM, TSDataType.INT32), new ColumnHeader(TIME_SLOT_NUM, TSDataType.INT64), new ColumnHeader(DATA_NODE_ID, TSDataType.INT32), + new ColumnHeader(INTERNAL_ADDRESS, TSDataType.TEXT), new ColumnHeader(RPC_ADDRESS, TSDataType.TEXT), new ColumnHeader(RPC_PORT, TSDataType.INT32), new ColumnHeader(ROLE, TSDataType.TEXT), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java index 0988da52997..9e1df368ba7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java @@ -88,11 +88,14 @@ public class ShowRegionTask implements IConfigTask { builder.getColumnBuilder(4).writeInt(regionInfo.getSeriesSlots()); builder.getColumnBuilder(5).writeLong(regionInfo.getTimeSlots()); builder.getColumnBuilder(6).writeInt(regionInfo.getDataNodeId()); - builder.getColumnBuilder(7).writeBinary(BytesUtils.valueOf(regionInfo.getClientRpcIp())); - builder.getColumnBuilder(8).writeInt(regionInfo.getClientRpcPort()); - builder.getColumnBuilder(9).writeBinary(BytesUtils.valueOf(regionInfo.getRoleType())); builder - .getColumnBuilder(10) + .getColumnBuilder(7) + .writeBinary(BytesUtils.valueOf(regionInfo.getInternalAddress())); + builder.getColumnBuilder(8).writeBinary(BytesUtils.valueOf(regionInfo.getClientRpcIp())); + builder.getColumnBuilder(9).writeInt(regionInfo.getClientRpcPort()); + builder.getColumnBuilder(10).writeBinary(BytesUtils.valueOf(regionInfo.getRoleType())); + builder + .getColumnBuilder(11) .writeBinary( new Binary( DateTimeUtils.convertLongToDate(regionInfo.getCreateTime()), diff --git a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift index e7d8220e9e3..8f560037166 100644 --- a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift +++ b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift @@ -620,6 +620,7 @@ struct TRegionInfo { 8: optional string status 9: optional string roleType 10: optional i64 createTime + 11: optional string internalAddress } struct TShowRegionResp {
