(iotdb) branch master updated: [IOTDB-6292] Add the internal address column in the result of show regions (#11915)

[tanxinyu]

This is an automated email from the ASF dual-hosted git repository.

tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 96929fa9671 [IOTDB-6292] Add the internal address column in the result 
of show regions (#11915)
96929fa9671 is described below

commit 96929fa9671502004b80f96539b85805352ced6b
Author: Yongzao <yong...@apache.org>
AuthorDate: Wed Jan 17 16:02:03 2024 +0800

    [IOTDB-6292] Add the internal address column in the result of show regions 
(#11915)
---
 .../confignode/persistence/partition/DatabasePartitionTable.java   | 1 +
 .../iotdb/db/queryengine/common/header/ColumnHeaderConstant.java   | 1 +
 .../queryengine/plan/execution/config/metadata/ShowRegionTask.java | 7 +++++--
 iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift | 1 +
 4 files changed, 8 insertions(+), 2 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..ae56f014a8a 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
@@ -301,6 +301,7 @@ public class ColumnHeaderConstant {
           new ColumnHeader(DATA_NODE_ID, TSDataType.INT32),
           new ColumnHeader(RPC_ADDRESS, TSDataType.TEXT),
           new ColumnHeader(RPC_PORT, TSDataType.INT32),
+          new ColumnHeader(INTERNAL_ADDRESS, TSDataType.TEXT),
           new ColumnHeader(ROLE, TSDataType.TEXT),
           new ColumnHeader(CREATE_TIME, 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..6dfc4419044 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
@@ -90,9 +90,12 @@ public class ShowRegionTask implements IConfigTask {
         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(9)
+            .writeBinary(BytesUtils.valueOf(regionInfo.getInternalAddress()));
+        
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 {