You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/06/26 05:10:14 UTC
[iotdb] 01/02: rename
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rename
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a68ef723d42a2ee785f999eda16df68b6d1ce09c
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Jun 26 12:51:49 2022 +0800
rename
---
.../resources/conf/iotdb-confignode.properties | 4 +-
.../assembly/resources/sbin/stop-confignode.bat | 6 +--
.../confignode/client/SyncDataNodeClientPool.java | 8 ++--
.../confignode/conf/ConfigNodeDescriptor.java | 2 +-
.../confignode/conf/ConfigNodeStartupCheck.java | 6 +--
.../consensus/request/ConfigRequest.java | 6 +--
.../consensus/request/ConfigRequestType.java | 2 +-
...LocationsReq.java => GetRegionInfoListReq.java} | 10 ++---
...nLocationsResp.java => RegionInfoListResp.java} | 14 +++---
.../statemachine/PartitionRegionStateMachine.java | 4 +-
.../confignode/manager/ClusterSchemaManager.java | 4 +-
.../iotdb/confignode/manager/ConfigManager.java | 12 +++---
.../iotdb/confignode/manager/ConsensusManager.java | 4 +-
.../manager/{Manager.java => IManager.java} | 6 +--
.../iotdb/confignode/manager/NodeManager.java | 4 +-
.../iotdb/confignode/manager/PartitionManager.java | 8 ++--
.../iotdb/confignode/manager/ProcedureManager.java | 2 +-
.../iotdb/confignode/manager/load/LoadManager.java | 6 +--
.../manager/load/balancer/PartitionBalancer.java | 6 +--
.../manager/load/balancer/RegionBalancer.java | 6 +--
.../manager/load/balancer/RouteBalancer.java | 6 +--
.../partition/GreedyPartitionAllocator.java | 6 +--
.../executor/ConfigRequestExecutor.java | 10 ++---
.../persistence/partition/PartitionInfo.java | 22 +++++-----
.../partition/StorageGroupPartitionTable.java | 34 +++++++--------
.../thrift/ConfigNodeRPCServiceProcessor.java | 12 +++---
.../consensus/request/ConfigRequestSerDeTest.java | 16 +++----
.../confignode/persistence/PartitionInfoTest.java | 50 +++++++++++-----------
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 10 ++---
.../confignode1conf/iotdb-confignode.properties | 2 +-
.../confignode2conf/iotdb-confignode.properties | 2 +-
.../confignode3conf/iotdb-confignode.properties | 2 +-
docs/UserGuide/Cluster/Cluster-Setup-Example.md | 8 ++--
docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md | 10 ++---
.../org/apache/iotdb/it/env/ConfigNodeWrapper.java | 2 +-
.../org/apache/iotdb/it/env/DataNodeWrapper.java | 2 +-
.../iotdb/commons/partition/SerializeTest.java | 2 +-
.../commons/utils/ThriftCommonsSerDeUtilsTest.java | 4 +-
.../resources/conf/iotdb-engine.properties | 2 +-
.../src/assembly/resources/sbin/stop-datanode.bat | 6 +--
server/src/assembly/resources/sbin/stop-server.bat | 6 +--
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +-
.../mpp/plan/analyze/FakePartitionFetcherImpl.java | 32 +++++++-------
.../mpp/plan/execution/config/ShowRegionTask.java | 23 +++++-----
.../crud/InsertMultiTabletsStatement.java | 2 +-
.../plan/statement/crud/InsertRowStatement.java | 2 +-
.../plan/statement/crud/InsertRowsStatement.java | 2 +-
.../plan/statement/crud/InsertTabletStatement.java | 2 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 4 +-
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 4 +-
.../iotdb/db/mpp/plan/plan/distribution/Util.java | 2 +-
.../plan/scheduler/StandaloneSchedulerTest.java | 2 +-
.../iotdb/db/service/InternalServiceImplTest.java | 2 +-
.../datanode1conf/iotdb-engine.properties | 2 +-
.../datanode2conf/iotdb-engine.properties | 2 +-
.../datanode3conf/iotdb-engine.properties | 2 +-
thrift-commons/src/main/thrift/common.thrift | 10 ++---
.../src/main/thrift/confignode.thrift | 2 +-
58 files changed, 214 insertions(+), 217 deletions(-)
diff --git a/confignode/src/assembly/resources/conf/iotdb-confignode.properties b/confignode/src/assembly/resources/conf/iotdb-confignode.properties
index 59803ee9ab..e2b5bbb204 100644
--- a/confignode/src/assembly/resources/conf/iotdb-confignode.properties
+++ b/confignode/src/assembly/resources/conf/iotdb-confignode.properties
@@ -24,7 +24,7 @@
# could set ip or hostname
# Datatype: String
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
# Used for cluster internal RPC communication
@@ -39,7 +39,7 @@ consensus_port=22278
# Used for connecting to the ConfigNodeGroup
# Format: ip:port
-# where the ip should be consistent with the target ConfigNode's confignode_rpc_address,
+# where the ip should be consistent with the target ConfigNode's confignode_rpc_ip,
# and the port should be consistent with the target ConfigNode's confignode_rpc_port.
# For the first ConfigNode to start, target_configNode points to its own ip:port.
# For other ConfigNodes that are started or restarted, target_ConfigNode points to any running ConfigNode's ip:port.
diff --git a/confignode/src/assembly/resources/sbin/stop-confignode.bat b/confignode/src/assembly/resources/sbin/stop-confignode.bat
index bcfc5d8643..31353f8ca0 100644
--- a/confignode/src/assembly/resources/sbin/stop-confignode.bat
+++ b/confignode/src/assembly/resources/sbin/stop-confignode.bat
@@ -27,12 +27,12 @@ for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "^rpc_port"
set rpc_port=%%i
)
-for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_address"
+for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_ip"
%superior_dir%\conf\iotdb-confignode.properties') do (
- set rpc_address=%%i
+ set rpc_ip=%%i
)
-for /f "tokens=5" %%a in ('netstat /ano ^| findstr %rpc_address%:%rpc_port%') do (
+for /f "tokens=5" %%a in ('netstat /ano ^| findstr %rpc_ip%:%rpc_port%') do (
taskkill /f /pid %%a
)
rem ps ax | grep -i 'confignode.ConfigNode' | grep -v grep | awk '{print $1}' | xargs kill -SIGTERM
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/client/SyncDataNodeClientPool.java b/confignode/src/main/java/org/apache/iotdb/confignode/client/SyncDataNodeClientPool.java
index 8f83496d75..22f184a345 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/client/SyncDataNodeClientPool.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/client/SyncDataNodeClientPool.java
@@ -86,17 +86,17 @@ public class SyncDataNodeClientPool {
}
public void deleteRegions(Set<TRegionReplicaSet> deletedRegionSet) {
- Map<TDataNodeLocation, List<TConsensusGroupId>> regionLocationMap = new HashMap<>();
+ Map<TDataNodeLocation, List<TConsensusGroupId>> regionInfoMap = new HashMap<>();
deletedRegionSet.forEach(
(tRegionReplicaSet) -> {
for (TDataNodeLocation dataNodeLocation : tRegionReplicaSet.getDataNodeLocations()) {
- regionLocationMap
+ regionInfoMap
.computeIfAbsent(dataNodeLocation, k -> new ArrayList<>())
.add(tRegionReplicaSet.getRegionId());
}
});
- LOGGER.info("Current regionLocationMap {} ", regionLocationMap);
- regionLocationMap.forEach(
+ LOGGER.info("Current regionInfoMap {} ", regionInfoMap);
+ regionInfoMap.forEach(
(dataNodeLocation, regionIds) ->
deleteRegions(dataNodeLocation.getInternalEndPoint(), regionIds, deletedRegionSet));
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 436ec0614a..7bcc973b6b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -106,7 +106,7 @@ public class ConfigNodeDescriptor {
Properties properties = new Properties();
properties.load(inputStream);
- conf.setRpcAddress(properties.getProperty("rpc_address", conf.getRpcAddress()));
+ conf.setRpcAddress(properties.getProperty("rpc_ip", conf.getRpcAddress()));
conf.setRpcPort(
Integer.parseInt(properties.getProperty("rpc_port", String.valueOf(conf.getRpcPort()))));
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
index dbd14572c6..b37fd95f5c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
@@ -240,7 +240,7 @@ public class ConfigNodeStartupCheck {
}
// Startup configuration
- systemProperties.setProperty("rpc_address", String.valueOf(conf.getRpcAddress()));
+ systemProperties.setProperty("rpc_ip", String.valueOf(conf.getRpcAddress()));
systemProperties.setProperty("rpc_port", String.valueOf(conf.getRpcPort()));
systemProperties.setProperty("consensus_port", String.valueOf(conf.getConsensusPort()));
@@ -283,11 +283,11 @@ public class ConfigNodeStartupCheck {
boolean needReWrite = false;
// Startup configuration
- String rpcAddress = systemProperties.getProperty("rpc_address", null);
+ String rpcAddress = systemProperties.getProperty("rpc_ip", null);
if (rpcAddress == null) {
needReWrite = true;
} else if (!rpcAddress.equals(conf.getRpcAddress())) {
- throw new ConfigurationException("rpc_address", conf.getRpcAddress(), rpcAddress);
+ throw new ConfigurationException("rpc_ip", conf.getRpcAddress(), rpcAddress);
}
if (systemProperties.getProperty("rpc_port", null) == null) {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequest.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequest.java
index ec1e50e793..6918470bf0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequest.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequest.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetNodePathsPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateSchemaPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetSchemaPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.write.AdjustMaxRegionGroupCountReq;
@@ -198,8 +198,8 @@ public abstract class ConfigRequest implements IConsensusRequest {
case GetNodePathsPartition:
req = new GetNodePathsPartitionReq();
break;
- case GetRegionLocations:
- req = new GetRegionLocationsReq();
+ case GetRegionInfoList:
+ req = new GetRegionInfoListReq();
break;
default:
throw new IOException("unknown PhysicalPlan type: " + typeNum);
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestType.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestType.java
index 6197a6e425..8566e117a7 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestType.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestType.java
@@ -64,5 +64,5 @@ public enum ConfigRequestType {
CreateFunction,
DropFunction,
GetNodePathsPartition,
- GetRegionLocations;
+ GetRegionInfoList;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/GetRegionLocationsReq.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/GetRegionInfoListReq.java
similarity index 87%
rename from confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/GetRegionLocationsReq.java
rename to confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/GetRegionInfoListReq.java
index 9ca74423d3..3174a16ddc 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/GetRegionLocationsReq.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/GetRegionInfoListReq.java
@@ -28,16 +28,16 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
-public class GetRegionLocationsReq extends ConfigRequest {
+public class GetRegionInfoListReq extends ConfigRequest {
private TConsensusGroupType regionType;
- public GetRegionLocationsReq() {
- super(ConfigRequestType.GetRegionLocations);
+ public GetRegionInfoListReq() {
+ super(ConfigRequestType.GetRegionInfoList);
}
- public GetRegionLocationsReq(TConsensusGroupType regionType) {
- super(ConfigRequestType.GetRegionLocations);
+ public GetRegionInfoListReq(TConsensusGroupType regionType) {
+ super(ConfigRequestType.GetRegionInfoList);
this.regionType = regionType;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/RegionLocationsResp.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/RegionInfoListResp.java
similarity index 76%
rename from confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/RegionLocationsResp.java
rename to confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/RegionInfoListResp.java
index 36867f119c..045f4fdce8 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/RegionLocationsResp.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/RegionInfoListResp.java
@@ -19,17 +19,17 @@
package org.apache.iotdb.confignode.consensus.response;
-import org.apache.iotdb.common.rpc.thrift.TRegionLocation;
+import org.apache.iotdb.common.rpc.thrift.TRegionInfo;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.consensus.common.DataSet;
import java.util.List;
-public class RegionLocationsResp implements DataSet {
+public class RegionInfoListResp implements DataSet {
private TSStatus status;
- private List<TRegionLocation> regionInfosList;
+ private List<TRegionInfo> regionInfoList;
public TSStatus getStatus() {
return status;
@@ -39,11 +39,11 @@ public class RegionLocationsResp implements DataSet {
this.status = status;
}
- public List<TRegionLocation> getRegionInfosList() {
- return regionInfosList;
+ public List<TRegionInfo> getRegionInfoList() {
+ return regionInfoList;
}
- public void setRegionInfosList(List<TRegionLocation> regionInfosList) {
- this.regionInfosList = regionInfosList;
+ public void setRegionInfoList(List<TRegionInfo> regionInfoList) {
+ this.regionInfoList = regionInfoList;
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/PartitionRegionStateMachine.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/PartitionRegionStateMachine.java
index d2784f4570..398f4db1a2 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/PartitionRegionStateMachine.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/PartitionRegionStateMachine.java
@@ -87,7 +87,7 @@ public class PartitionRegionStateMachine implements IStateMachine, IStateMachine
protected TSStatus write(ConfigRequest plan) {
TSStatus result;
try {
- result = executor.executorNonQueryPlan(plan);
+ result = executor.executeNonQueryPlan(plan);
} catch (UnknownPhysicalPlanTypeException | AuthException e) {
LOGGER.error(e.getMessage());
result = new TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
@@ -128,7 +128,7 @@ public class PartitionRegionStateMachine implements IStateMachine, IStateMachine
protected DataSet read(ConfigRequest plan) {
DataSet result;
try {
- result = executor.executorQueryPlan(plan);
+ result = executor.executeQueryPlan(plan);
} catch (UnknownPhysicalPlanTypeException | AuthException e) {
LOGGER.error(e.getMessage());
result = null;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
index e50347c1ae..a92e3c2b49 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
@@ -49,10 +49,10 @@ public class ClusterSchemaManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ClusterSchemaManager.class);
- private final Manager configManager;
+ private final IManager configManager;
private final ClusterSchemaInfo clusterSchemaInfo;
- public ClusterSchemaManager(Manager configManager, ClusterSchemaInfo clusterSchemaInfo) {
+ public ClusterSchemaManager(IManager configManager, ClusterSchemaInfo clusterSchemaInfo) {
this.configManager = configManager;
this.clusterSchemaInfo = clusterSchemaInfo;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 691bc35192..69f5325db0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -39,7 +39,7 @@ import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetNodePathsPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateSchemaPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetSchemaPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.write.RegisterDataNodeReq;
@@ -54,7 +54,7 @@ import org.apache.iotdb.confignode.consensus.response.DataNodeConfigurationResp;
import org.apache.iotdb.confignode.consensus.response.DataNodeInfosResp;
import org.apache.iotdb.confignode.consensus.response.DataPartitionResp;
import org.apache.iotdb.confignode.consensus.response.PermissionInfoResp;
-import org.apache.iotdb.confignode.consensus.response.RegionLocationsResp;
+import org.apache.iotdb.confignode.consensus.response.RegionInfoListResp;
import org.apache.iotdb.confignode.consensus.response.SchemaNodeManagementResp;
import org.apache.iotdb.confignode.consensus.response.SchemaPartitionResp;
import org.apache.iotdb.confignode.consensus.response.StorageGroupSchemaResp;
@@ -95,7 +95,7 @@ import java.util.stream.Collectors;
import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD;
/** Entry of all management, AssignPartitionManager,AssignRegionManager. */
-public class ConfigManager implements Manager {
+public class ConfigManager implements IManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigManager.class);
@@ -690,12 +690,12 @@ public class ConfigManager implements Manager {
}
@Override
- public DataSet showRegion(GetRegionLocationsReq getRegionsinfoReq) {
+ public DataSet showRegion(GetRegionInfoListReq getRegionsinfoReq) {
TSStatus status = confirmLeader();
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- return partitionManager.getRetionLocations(getRegionsinfoReq);
+ return partitionManager.getRegionInfoList(getRegionsinfoReq);
} else {
- RegionLocationsResp regionResp = new RegionLocationsResp();
+ RegionInfoListResp regionResp = new RegionInfoListResp();
regionResp.setStatus(status);
return regionResp;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index 4435d6fd7e..496c92172a 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -50,12 +50,12 @@ public class ConsensusManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ConsensusManager.class);
private static final ConfigNodeConfig conf = ConfigNodeDescriptor.getInstance().getConf();
- private final Manager configManager;
+ private final IManager configManager;
private ConsensusGroupId consensusGroupId;
private IConsensus consensusImpl;
- public ConsensusManager(Manager configManager, PartitionRegionStateMachine stateMachine)
+ public ConsensusManager(IManager configManager, PartitionRegionStateMachine stateMachine)
throws IOException {
this.configManager = configManager;
setConsensusLayer(stateMachine);
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/Manager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
similarity index 98%
rename from confignode/src/main/java/org/apache/iotdb/confignode/manager/Manager.java
rename to confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
index 38176cb559..65ce70ade3 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/Manager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.confignode.consensus.request.read.CountStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.read.GetDataNodeInfoReq;
import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateDataPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.write.RegisterDataNodeReq;
import org.apache.iotdb.confignode.consensus.request.write.RemoveConfigNodeReq;
@@ -52,7 +52,7 @@ import java.util.List;
* a subset of services provided by {@ConfigManager}. For use internally only, passed to Managers,
* services.
*/
-public interface Manager {
+public interface IManager {
/**
* if a service stop
@@ -240,5 +240,5 @@ public interface Manager {
void addMetrics();
/** Show (data/schema) regions */
- DataSet showRegion(GetRegionLocationsReq getRegionsinfoReq);
+ DataSet showRegion(GetRegionInfoListReq getRegionsinfoReq);
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/NodeManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/NodeManager.java
index 7b02e4834a..b448d10cca 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/NodeManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/NodeManager.java
@@ -58,7 +58,7 @@ public class NodeManager {
private static final Logger LOGGER = LoggerFactory.getLogger(NodeManager.class);
- private final Manager configManager;
+ private final IManager configManager;
private final NodeInfo nodeInfo;
private final ReentrantLock removeConfigNodeLock;
@@ -66,7 +66,7 @@ public class NodeManager {
/** TODO:do some operate after add node or remove node */
private final List<ChangeServerListener> listeners = new CopyOnWriteArrayList<>();
- public NodeManager(Manager configManager, NodeInfo nodeInfo) {
+ public NodeManager(IManager configManager, NodeInfo nodeInfo) {
this.configManager = configManager;
this.nodeInfo = nodeInfo;
this.removeConfigNodeLock = new ReentrantLock();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
index 5b82738703..c3868cccc0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetNodePathsPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateSchemaPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetSchemaPartitionReq;
import org.apache.iotdb.confignode.consensus.request.write.CreateDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.write.CreateSchemaPartitionReq;
@@ -72,7 +72,7 @@ public class PartitionManager {
private static final Logger LOGGER = LoggerFactory.getLogger(PartitionManager.class);
- private final Manager configManager;
+ private final IManager configManager;
private final PartitionInfo partitionInfo;
private static final int REGION_CLEANER_WORK_INTERVAL = 300;
private static final int REGION_CLEANER_WORK_INITIAL_DELAY = 10;
@@ -80,7 +80,7 @@ public class PartitionManager {
private SeriesPartitionExecutor executor;
private final ScheduledExecutorService regionCleaner;
- public PartitionManager(Manager configManager, PartitionInfo partitionInfo) {
+ public PartitionManager(IManager configManager, PartitionInfo partitionInfo) {
this.configManager = configManager;
this.partitionInfo = partitionInfo;
this.regionCleaner =
@@ -521,7 +521,7 @@ public class PartitionManager {
return executor.getSeriesPartitionSlot(devicePath);
}
- public DataSet getRetionLocations(GetRegionLocationsReq req) {
+ public DataSet getRegionInfoList(GetRegionInfoListReq req) {
return getConsensusManager().read(req).getDataset();
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
index e7af8959bd..3addeddb5d 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
@@ -166,7 +166,7 @@ public class ProcedureManager {
GET-SET Region
*/
// ======================================================
- public Manager getConfigManager() {
+ public IManager getConfigManager() {
return configManager;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
index 5be3588e0b..3d76fea103 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.confignode.exception.NotEnoughDataNodeException;
import org.apache.iotdb.confignode.exception.StorageGroupNotExistsException;
import org.apache.iotdb.confignode.manager.ClusterSchemaManager;
import org.apache.iotdb.confignode.manager.ConsensusManager;
-import org.apache.iotdb.confignode.manager.Manager;
+import org.apache.iotdb.confignode.manager.IManager;
import org.apache.iotdb.confignode.manager.NodeManager;
import org.apache.iotdb.confignode.manager.PartitionManager;
import org.apache.iotdb.confignode.manager.load.balancer.PartitionBalancer;
@@ -65,7 +65,7 @@ public class LoadManager {
private static final Logger LOGGER = LoggerFactory.getLogger(LoadManager.class);
- private final Manager configManager;
+ private final IManager configManager;
private final long heartbeatInterval =
ConfigNodeDescriptor.getInstance().getConf().getHeartbeatInterval();
@@ -87,7 +87,7 @@ public class LoadManager {
private Future<?> currentHeartbeatFuture;
private int balanceCount = 0;
- public LoadManager(Manager configManager) {
+ public LoadManager(IManager configManager) {
this.configManager = configManager;
this.heartbeatCacheMap = new ConcurrentHashMap<>();
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/PartitionBalancer.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/PartitionBalancer.java
index 88c4d1bcee..2c71f84a29 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/PartitionBalancer.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/PartitionBalancer.java
@@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.partition.DataPartitionTable;
import org.apache.iotdb.commons.partition.SchemaPartitionTable;
-import org.apache.iotdb.confignode.manager.Manager;
+import org.apache.iotdb.confignode.manager.IManager;
import org.apache.iotdb.confignode.manager.load.balancer.partition.GreedyPartitionAllocator;
import org.apache.iotdb.confignode.manager.load.balancer.partition.IPartitionAllocator;
@@ -35,9 +35,9 @@ import java.util.Map;
*/
public class PartitionBalancer {
- private final Manager configManager;
+ private final IManager configManager;
- public PartitionBalancer(Manager configManager) {
+ public PartitionBalancer(IManager configManager) {
this.configManager = configManager;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
index b4e7693721..70c264bfa5 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.confignode.consensus.request.write.CreateRegionsReq;
import org.apache.iotdb.confignode.exception.NotEnoughDataNodeException;
import org.apache.iotdb.confignode.exception.StorageGroupNotExistsException;
import org.apache.iotdb.confignode.manager.ClusterSchemaManager;
-import org.apache.iotdb.confignode.manager.Manager;
+import org.apache.iotdb.confignode.manager.IManager;
import org.apache.iotdb.confignode.manager.NodeManager;
import org.apache.iotdb.confignode.manager.PartitionManager;
import org.apache.iotdb.confignode.manager.load.balancer.region.CopySetRegionAllocator;
@@ -41,9 +41,9 @@ import java.util.Map;
*/
public class RegionBalancer {
- private final Manager configManager;
+ private final IManager configManager;
- public RegionBalancer(Manager configManager) {
+ public RegionBalancer(IManager configManager) {
this.configManager = configManager;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
index a9eccd8156..aebb25a43d 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
@@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.manager.load.balancer;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
-import org.apache.iotdb.confignode.manager.Manager;
+import org.apache.iotdb.confignode.manager.IManager;
import org.apache.iotdb.confignode.manager.load.LoadManager;
import org.apache.iotdb.confignode.manager.load.balancer.router.IRouter;
import org.apache.iotdb.confignode.manager.load.balancer.router.LoadScoreGreedyRouter;
@@ -34,9 +34,9 @@ import java.util.Map;
*/
public class RouteBalancer {
- private final Manager configManager;
+ private final IManager configManager;
- public RouteBalancer(Manager configManager) {
+ public RouteBalancer(IManager configManager) {
this.configManager = configManager;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java
index 9a702a3773..f92c02694a 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.partition.DataPartitionTable;
import org.apache.iotdb.commons.partition.SchemaPartitionTable;
import org.apache.iotdb.commons.partition.SeriesPartitionTable;
-import org.apache.iotdb.confignode.manager.Manager;
+import org.apache.iotdb.confignode.manager.IManager;
import org.apache.iotdb.confignode.manager.PartitionManager;
import org.apache.iotdb.tsfile.utils.Pair;
@@ -37,9 +37,9 @@ import java.util.concurrent.ConcurrentHashMap;
/** Allocating new Partitions by greedy algorithm */
public class GreedyPartitionAllocator implements IPartitionAllocator {
- private final Manager configManager;
+ private final IManager configManager;
- public GreedyPartitionAllocator(Manager configManager) {
+ public GreedyPartitionAllocator(IManager configManager) {
this.configManager = configManager;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigRequestExecutor.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigRequestExecutor.java
index 2ec583ce12..68129c151d 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigRequestExecutor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigRequestExecutor.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.confignode.consensus.request.read.CountStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.read.GetDataNodeInfoReq;
import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetNodePathsPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetSchemaPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.write.AdjustMaxRegionGroupCountReq;
@@ -104,7 +104,7 @@ public class ConfigRequestExecutor {
this.udfInfo = udfInfo;
}
- public DataSet executorQueryPlan(ConfigRequest req)
+ public DataSet executeQueryPlan(ConfigRequest req)
throws UnknownPhysicalPlanTypeException, AuthException {
switch (req.getType()) {
case GetDataNodeInfo:
@@ -133,14 +133,14 @@ public class ConfigRequestExecutor {
return authorInfo.executeListRoleUsers((AuthorReq) req);
case GetNodePathsPartition:
return getSchemaNodeManagementPartition(req);
- case GetRegionLocations:
- return partitionInfo.getRegionLocations((GetRegionLocationsReq) req);
+ case GetRegionInfoList:
+ return partitionInfo.getRegionInfoList((GetRegionInfoListReq) req);
default:
throw new UnknownPhysicalPlanTypeException(req.getType());
}
}
- public TSStatus executorNonQueryPlan(ConfigRequest req)
+ public TSStatus executeNonQueryPlan(ConfigRequest req)
throws UnknownPhysicalPlanTypeException, AuthException {
switch (req.getType()) {
case RegisterDataNode:
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
index 552db2932f..8716f5fe00 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.confignode.persistence.partition;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.common.rpc.thrift.TRegionLocation;
+import org.apache.iotdb.common.rpc.thrift.TRegionInfo;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
@@ -31,7 +31,7 @@ import org.apache.iotdb.commons.partition.DataPartitionTable;
import org.apache.iotdb.commons.partition.SchemaPartitionTable;
import org.apache.iotdb.commons.snapshot.SnapshotProcessor;
import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetSchemaPartitionReq;
import org.apache.iotdb.confignode.consensus.request.write.CreateDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.write.CreateRegionsReq;
@@ -40,7 +40,7 @@ import org.apache.iotdb.confignode.consensus.request.write.DeleteStorageGroupReq
import org.apache.iotdb.confignode.consensus.request.write.PreDeleteStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.write.SetStorageGroupReq;
import org.apache.iotdb.confignode.consensus.response.DataPartitionResp;
-import org.apache.iotdb.confignode.consensus.response.RegionLocationsResp;
+import org.apache.iotdb.confignode.consensus.response.RegionInfoListResp;
import org.apache.iotdb.confignode.consensus.response.SchemaNodeManagementResp;
import org.apache.iotdb.confignode.consensus.response.SchemaPartitionResp;
import org.apache.iotdb.confignode.exception.StorageGroupNotExistsException;
@@ -405,20 +405,20 @@ public class PartitionInfo implements SnapshotProcessor {
}
/** Get region information */
- public DataSet getRegionLocations(GetRegionLocationsReq regionsInfoReq) {
- RegionLocationsResp regionResp = new RegionLocationsResp();
- List<TRegionLocation> regionLocationList = new ArrayList<>();
+ public DataSet getRegionInfoList(GetRegionInfoListReq regionsInfoReq) {
+ RegionInfoListResp regionResp = new RegionInfoListResp();
+ List<TRegionInfo> regionInfoList = new ArrayList<>();
if (storageGroupPartitionTables.isEmpty()) {
regionResp.setStatus(RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS));
return regionResp;
}
storageGroupPartitionTables.forEach(
(storageGroup, storageGroupPartitionTable) -> {
- storageGroupPartitionTable.getRegionInfos(regionsInfoReq, regionLocationList);
+ storageGroupPartitionTable.getRegionInfoList(regionsInfoReq, regionInfoList);
});
- regionLocationList.sort(
+ regionInfoList.sort(
Comparator.comparingInt(regionId -> regionId.getConsensusGroupId().getId()));
- regionResp.setRegionInfosList(regionLocationList);
+ regionResp.setRegionInfoList(regionInfoList);
regionResp.setStatus(RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS));
return regionResp;
}
@@ -605,9 +605,9 @@ public class PartitionInfo implements SnapshotProcessor {
TDataNodeLocation dataNodeLocation = entry.getKey();
String name =
"EndPoint("
- + dataNodeLocation.getExternalEndPoint().ip
+ + dataNodeLocation.getClientRpcEndPoint().ip
+ ":"
- + dataNodeLocation.getExternalEndPoint().port
+ + dataNodeLocation.getClientRpcEndPoint().port
+ ")";
MetricsService.getInstance()
.getMetricManager()
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java
index cf082bc8ad..f5ef81017b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/StorageGroupPartitionTable.java
@@ -20,14 +20,14 @@ package org.apache.iotdb.confignode.persistence.partition;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
-import org.apache.iotdb.common.rpc.thrift.TRegionLocation;
+import org.apache.iotdb.common.rpc.thrift.TRegionInfo;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.cluster.RegionStatus;
import org.apache.iotdb.commons.partition.DataPartitionTable;
import org.apache.iotdb.commons.partition.SchemaPartitionTable;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.db.service.metrics.MetricsService;
import org.apache.iotdb.db.service.metrics.enums.Metric;
import org.apache.iotdb.db.service.metrics.enums.Tag;
@@ -363,39 +363,37 @@ public class StorageGroupPartitionTable {
return result;
}
- public void getRegionInfos(
- GetRegionLocationsReq regionsInfoReq, List<TRegionLocation> regionLocationList) {
+ public void getRegionInfoList(
+ GetRegionInfoListReq regionsInfoReq, List<TRegionInfo> regionInfoList) {
regionInfoMap.forEach(
(consensusGroupId, regionGroup) -> {
TRegionReplicaSet replicaSet = regionGroup.getReplicaSet();
if (regionsInfoReq.getRegionType() == null) {
- buildTRegionsInfo(regionLocationList, replicaSet, regionGroup);
+ buildTRegionsInfo(regionInfoList, replicaSet, regionGroup);
} else if (regionsInfoReq.getRegionType().ordinal()
== replicaSet.getRegionId().getType().ordinal()) {
- buildTRegionsInfo(regionLocationList, replicaSet, regionGroup);
+ buildTRegionsInfo(regionInfoList, replicaSet, regionGroup);
}
});
}
private void buildTRegionsInfo(
- List<TRegionLocation> regionLocationList,
- TRegionReplicaSet replicaSet,
- RegionGroup regionGroup) {
+ List<TRegionInfo> regionInfoList, TRegionReplicaSet replicaSet, RegionGroup regionGroup) {
replicaSet
.getDataNodeLocations()
.forEach(
(dataNodeLocation) -> {
- TRegionLocation tRegionInfos = new TRegionLocation();
- tRegionInfos.setConsensusGroupId(replicaSet.getRegionId());
- tRegionInfos.setStorageGroup(storageGroupName);
+ TRegionInfo tRegionInfoList = new TRegionInfo();
+ tRegionInfoList.setConsensusGroupId(replicaSet.getRegionId());
+ tRegionInfoList.setStorageGroup(storageGroupName);
long slots = regionGroup.getCounter();
- tRegionInfos.setSlots((int) slots);
- tRegionInfos.setDataNodeId(dataNodeLocation.getDataNodeId());
- tRegionInfos.setRpcAddresss(dataNodeLocation.getExternalEndPoint().getIp());
- tRegionInfos.setRpcPort(dataNodeLocation.getExternalEndPoint().getPort());
+ tRegionInfoList.setSlots((int) slots);
+ tRegionInfoList.setDataNodeId(dataNodeLocation.getDataNodeId());
+ tRegionInfoList.setClientRpcIp(dataNodeLocation.getClientRpcEndPoint().getIp());
+ tRegionInfoList.setClientRpcPort(dataNodeLocation.getClientRpcEndPoint().getPort());
// TODO: Wait for data migration. And then add the state
- tRegionInfos.setStatus(RegionStatus.Up.getStatus());
- regionLocationList.add(tRegionInfos);
+ tRegionInfoList.setStatus(RegionStatus.Up.getStatus());
+ regionInfoList.add(tRegionInfoList);
});
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index dc00336ec5..3527afa643 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.confignode.consensus.request.read.CountStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.read.GetDataNodeInfoReq;
import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateDataPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.write.RegisterDataNodeReq;
import org.apache.iotdb.confignode.consensus.request.write.RemoveConfigNodeReq;
@@ -49,7 +49,7 @@ import org.apache.iotdb.confignode.consensus.response.CountStorageGroupResp;
import org.apache.iotdb.confignode.consensus.response.DataNodeConfigurationResp;
import org.apache.iotdb.confignode.consensus.response.DataNodeInfosResp;
import org.apache.iotdb.confignode.consensus.response.PermissionInfoResp;
-import org.apache.iotdb.confignode.consensus.response.RegionLocationsResp;
+import org.apache.iotdb.confignode.consensus.response.RegionInfoListResp;
import org.apache.iotdb.confignode.consensus.response.StorageGroupSchemaResp;
import org.apache.iotdb.confignode.manager.ConfigManager;
import org.apache.iotdb.confignode.manager.ConsensusManager;
@@ -464,12 +464,12 @@ public class ConfigNodeRPCServiceProcessor implements ConfigIService.Iface {
@Override
public TShowRegionResp showRegion(TShowRegionReq showRegionReq) throws TException {
- GetRegionLocationsReq getRegionsinfoReq =
- new GetRegionLocationsReq(showRegionReq.getConsensusGroupType());
- RegionLocationsResp dataSet = (RegionLocationsResp) configManager.showRegion(getRegionsinfoReq);
+ GetRegionInfoListReq getRegionsinfoReq =
+ new GetRegionInfoListReq(showRegionReq.getConsensusGroupType());
+ RegionInfoListResp dataSet = (RegionInfoListResp) configManager.showRegion(getRegionsinfoReq);
TShowRegionResp showRegionResp = new TShowRegionResp();
showRegionResp.setStatus(dataSet.getStatus());
- showRegionResp.setRegionInfoList(dataSet.getRegionInfosList());
+ showRegionResp.setRegionInfoList(dataSet.getRegionInfoList());
return showRegionResp;
}
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestSerDeTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestSerDeTest.java
index f2d568d075..35e1f353dc 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestSerDeTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigRequestSerDeTest.java
@@ -38,7 +38,7 @@ import org.apache.iotdb.confignode.consensus.request.read.GetDataNodeInfoReq;
import org.apache.iotdb.confignode.consensus.request.read.GetDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetOrCreateSchemaPartitionReq;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.read.GetSchemaPartitionReq;
import org.apache.iotdb.confignode.consensus.request.read.GetStorageGroupReq;
import org.apache.iotdb.confignode.consensus.request.write.AdjustMaxRegionGroupCountReq;
@@ -81,7 +81,7 @@ public class ConfigRequestSerDeTest {
public void RegisterDataNodeReqTest() throws IOException {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
dataNodeLocation.setDataNodeId(1);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
@@ -197,7 +197,7 @@ public class ConfigRequestSerDeTest {
public void CreateRegionsPlanTest() throws IOException {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
dataNodeLocation.setDataNodeId(0);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
@@ -234,7 +234,7 @@ public class ConfigRequestSerDeTest {
public void CreateSchemaPartitionPlanTest() throws IOException {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
dataNodeLocation.setDataNodeId(0);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
@@ -290,7 +290,7 @@ public class ConfigRequestSerDeTest {
public void CreateDataPartitionPlanTest() throws IOException {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
dataNodeLocation.setDataNodeId(0);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
@@ -547,10 +547,10 @@ public class ConfigRequestSerDeTest {
@Test
public void GetRegionLocaltionsReqTest() throws IOException {
- GetRegionLocationsReq req0 = new GetRegionLocationsReq();
+ GetRegionInfoListReq req0 = new GetRegionInfoListReq();
req0.setRegionType(TConsensusGroupType.DataRegion);
- GetRegionLocationsReq req1 =
- (GetRegionLocationsReq) ConfigRequest.Factory.create(req0.serializeToByteBuffer());
+ GetRegionInfoListReq req1 =
+ (GetRegionInfoListReq) ConfigRequest.Factory.create(req0.serializeToByteBuffer());
Assert.assertEquals(req0.getType(), req1.getType());
Assert.assertEquals(req0.getRegionType(), req1.getRegionType());
}
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java
index 8f9c034e8f..6fde936e07 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PartitionInfoTest.java
@@ -29,12 +29,12 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.partition.DataPartitionTable;
import org.apache.iotdb.commons.partition.SchemaPartitionTable;
import org.apache.iotdb.commons.partition.SeriesPartitionTable;
-import org.apache.iotdb.confignode.consensus.request.read.GetRegionLocationsReq;
+import org.apache.iotdb.confignode.consensus.request.read.GetRegionInfoListReq;
import org.apache.iotdb.confignode.consensus.request.write.CreateDataPartitionReq;
import org.apache.iotdb.confignode.consensus.request.write.CreateRegionsReq;
import org.apache.iotdb.confignode.consensus.request.write.CreateSchemaPartitionReq;
import org.apache.iotdb.confignode.consensus.request.write.SetStorageGroupReq;
-import org.apache.iotdb.confignode.consensus.response.RegionLocationsResp;
+import org.apache.iotdb.confignode.consensus.response.RegionInfoListResp;
import org.apache.iotdb.confignode.persistence.partition.PartitionInfo;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
@@ -172,40 +172,40 @@ public class PartitionInfoTest {
createRegionsReq.addRegionGroup("root.test", dataRegionReplicaSet);
partitionInfo.createRegionGroups(createRegionsReq);
- GetRegionLocationsReq regionReq = new GetRegionLocationsReq();
+ GetRegionInfoListReq regionReq = new GetRegionInfoListReq();
regionReq.setRegionType(null);
- RegionLocationsResp regionLocations1 =
- (RegionLocationsResp) partitionInfo.getRegionLocations(regionReq);
- Assert.assertEquals(regionLocations1.getRegionInfosList().size(), 10);
- regionLocations1
- .getRegionInfosList()
+ RegionInfoListResp regionInfoList1 =
+ (RegionInfoListResp) partitionInfo.getRegionInfoList(regionReq);
+ Assert.assertEquals(regionInfoList1.getRegionInfoList().size(), 10);
+ regionInfoList1
+ .getRegionInfoList()
.forEach(
- (regionLocation) -> {
- Assert.assertEquals(regionLocation.getRpcAddresss(), "127.0.0.1");
+ (regionInfo) -> {
+ Assert.assertEquals(regionInfo.getClientRpcIp(), "127.0.0.1");
});
regionReq.setRegionType(TConsensusGroupType.SchemaRegion);
- RegionLocationsResp regionLocations2 =
- (RegionLocationsResp) partitionInfo.getRegionLocations(regionReq);
- Assert.assertEquals(regionLocations2.getRegionInfosList().size(), 5);
- regionLocations2
- .getRegionInfosList()
+ RegionInfoListResp regionInfoList2 =
+ (RegionInfoListResp) partitionInfo.getRegionInfoList(regionReq);
+ Assert.assertEquals(regionInfoList2.getRegionInfoList().size(), 5);
+ regionInfoList2
+ .getRegionInfoList()
.forEach(
- (regionLocation) -> {
+ (regionInfo) -> {
Assert.assertEquals(
- regionLocation.getConsensusGroupId().getType(), TConsensusGroupType.SchemaRegion);
+ regionInfo.getConsensusGroupId().getType(), TConsensusGroupType.SchemaRegion);
});
regionReq.setRegionType(TConsensusGroupType.DataRegion);
- RegionLocationsResp regionLocations3 =
- (RegionLocationsResp) partitionInfo.getRegionLocations(regionReq);
- Assert.assertEquals(regionLocations3.getRegionInfosList().size(), 5);
- regionLocations3
- .getRegionInfosList()
+ RegionInfoListResp regionInfoList3 =
+ (RegionInfoListResp) partitionInfo.getRegionInfoList(regionReq);
+ Assert.assertEquals(regionInfoList3.getRegionInfoList().size(), 5);
+ regionInfoList3
+ .getRegionInfoList()
.forEach(
- (regionLocation) -> {
+ (regionInfo) -> {
Assert.assertEquals(
- regionLocation.getConsensusGroupId().getType(), TConsensusGroupType.DataRegion);
+ regionInfo.getConsensusGroupId().getType(), TConsensusGroupType.DataRegion);
});
}
@@ -218,7 +218,7 @@ public class PartitionInfoTest {
for (int i = startFlag; i < locationNum + startFlag; i++) {
TDataNodeLocation tDataNodeLocation = new TDataNodeLocation();
tDataNodeLocation.setDataNodeId(i);
- tDataNodeLocation.setExternalEndPoint(new TEndPoint("127.0.0.1", 6000 + i));
+ tDataNodeLocation.setClientRpcEndPoint(new TEndPoint("127.0.0.1", 6000 + i));
tDataNodeLocation.setInternalEndPoint(new TEndPoint("127.0.0.1", 7000 + i));
tDataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("127.0.0.1", 8000 + i));
tDataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("127.0.0.1", 9000 + i));
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java b/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
index e18cdd1c86..fdec407e40 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
@@ -146,7 +146,7 @@ public class ConfigNodeRPCServiceProcessorTest {
private void registerDataNodes() throws TException {
for (int i = 0; i < 3; i++) {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003 + i));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777 + i));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010 + i));
@@ -172,7 +172,7 @@ public class ConfigNodeRPCServiceProcessorTest {
// test success re-register
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6668));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6668));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9004));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8778));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40011));
@@ -200,7 +200,7 @@ public class ConfigNodeRPCServiceProcessorTest {
infoList.sort(Comparator.comparingInt(Map.Entry::getKey));
for (int i = 0; i < 3; i++) {
dataNodeLocation.setDataNodeId(i + 1);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003 + i));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777 + i));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010 + i));
@@ -215,7 +215,7 @@ public class ConfigNodeRPCServiceProcessorTest {
Assert.assertEquals(1, infoMap.size());
Assert.assertNotNull(infoMap.get(1));
dataNodeLocation.setDataNodeId(1);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
@@ -241,7 +241,7 @@ public class ConfigNodeRPCServiceProcessorTest {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
for (int i = 0; i < 3; i++) {
dataNodeLocation.setDataNodeId(i + 1);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003 + i));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777 + i));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010 + i));
diff --git a/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties
index f05a5685ce..3ffaea659a 100644
--- a/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties
+++ b/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties
@@ -17,7 +17,7 @@
# under the License.
#
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
rpc_port=22277
consensus_port=22278
target_confignode=0.0.0.0:22277
diff --git a/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties
index a8961fd689..0c05611f4a 100644
--- a/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties
+++ b/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties
@@ -17,7 +17,7 @@
# under the License.
#
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
rpc_port=22279
consensus_port=22280
target_confignode=0.0.0.0:22277
diff --git a/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties
index 36ded2eb0d..65c0cb0ae7 100644
--- a/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties
+++ b/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties
@@ -17,7 +17,7 @@
# under the License.
#
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
rpc_port=22281
consensus_port=22282
target_confignode=0.0.0.0:22277
diff --git a/docs/UserGuide/Cluster/Cluster-Setup-Example.md b/docs/UserGuide/Cluster/Cluster-Setup-Example.md
index 321e00ca9f..78ee577928 100644
--- a/docs/UserGuide/Cluster/Cluster-Setup-Example.md
+++ b/docs/UserGuide/Cluster/Cluster-Setup-Example.md
@@ -187,7 +187,7 @@ internal_ip = A_private_Ip
```
rpc_port = 6667
-rpc_address = A_public_ip
+rpc_ip = A_public_ip
```
**NodeB**:
@@ -206,7 +206,7 @@ internal_ip = B_private_Ip
```
rpc_port = 6667
-rpc_address = B_public_ip
+rpc_ip = B_public_ip
```
**NodeC**:
@@ -225,7 +225,7 @@ internal_ip = C_private_Ip
```
rpc_port = 6667
-rpc_address = C_public_ip
+rpc_ip = C_public_ip
```
### Start IoTDB cluster
@@ -280,7 +280,7 @@ sed -i -e 's/^seed_nodes=127.0.0.1:9003,127.0.0.1:9005,127.0.0.1:9007$/seed_node
```
Set rpc\_address = public ip of node (e.g. 192.168.1.1)
```
-sed -i -e 's/^rpc_address=127.0.0.1$/rpc_address=192.168.1.1/g' conf/iotdb-engine.properties
+sed -i -e 's/^rpc_ip=127.0.0.1$/rpc_ip=192.168.1.1/g' conf/iotdb-engine.properties
```
diff --git a/docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md b/docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md
index fa323625e0..2f9a8dff89 100644
--- a/docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md
+++ b/docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md
@@ -171,7 +171,7 @@ nohup ./sbin/start-node.sh >/dev/null 2>&1 &nohup ./sbin/start-node.sh ./node2_c
假设我们需要在三个物理节点上部署分布式 IoTDB，这三个节点分别为 A, B 和 C，其公网 ip 分别为 A\_public\_IP*, *B\_public\_IP*, and *C\_public\_IP*，私网 ip 分别为 *A\_private\_IP*, *B\_private\_IP*, and *C\_private\_IP*.
-注：如果没有公网 ip 或者私网 ip 则两者**设置成一致**即可，只需要保证客户端能够访问到服务端即可。 私网ip对应iotdb-cluster.properties中的`internal_ip`配置项，公网ip对应iotdb-engine.properties中的`rpc_address`配置项。
+注：如果没有公网 ip 或者私网 ip 则两者**设置成一致**即可，只需要保证客户端能够访问到服务端即可。 私网ip对应iotdb-cluster.properties中的`internal_ip`配置项，公网ip对应iotdb-engine.properties中的`rpc_ip`配置项。
### 配置
**节点A**:
@@ -190,7 +190,7 @@ internal_ip = A_private_Ip
```
rpc_port = 6667
-rpc_address = A_public_ip
+rpc_ip = A_public_ip
```
**节点B**:
@@ -209,7 +209,7 @@ internal_ip = B_private_Ip
```
rpc_port = 6667
-rpc_address = B_public_ip
+rpc_ip = B_public_ip
```
**节点C**:
@@ -228,7 +228,7 @@ internal_ip = C_private_Ip
```
rpc_port = 6667
-rpc_address = C_public_ip
+rpc_ip = C_public_ip
```
@@ -287,7 +287,7 @@ sed -i -e 's/^seed_nodes=127.0.0.1:9003,127.0.0.1:9005,127.0.0.1:9007$/seed_node
```
设置 rpc\_address = 节点的公有ip (以192.168.1.1为例)
```
-sed -i -e 's/^rpc_address=127.0.0.1$/rpc_address=192.168.1.1/g' conf/iotdb-engine.properties
+sed -i -e 's/^rpc_ip=127.0.0.1$/rpc_ip=192.168.1.1/g' conf/iotdb-engine.properties
```
**你可以自己修改配置项而不使用“sed”命令**
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
index f80f6dbb32..50de7a2aa8 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
@@ -47,7 +47,7 @@ public class ConfigNodeWrapper extends AbstractNodeWrapper {
@Override
protected void updateConfig(Properties properties) {
- properties.setProperty("rpc_address", super.getIp());
+ properties.setProperty("rpc_ip", super.getIp());
properties.setProperty("rpc_port", String.valueOf(getPort()));
properties.setProperty("consensus_port", String.valueOf(this.consensusPort));
properties.setProperty("target_confignode", this.targetConfigNode);
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
index 2444b326ee..160558a633 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
@@ -43,7 +43,7 @@ public class DataNodeWrapper extends AbstractNodeWrapper {
@Override
protected void updateConfig(Properties properties) {
- properties.setProperty("rpc_address", super.getIp());
+ properties.setProperty("rpc_ip", super.getIp());
properties.setProperty("internal_ip", "127.0.0.1");
properties.setProperty("rpc_port", String.valueOf(getPort()));
properties.setProperty("mpp_data_exchange_port", String.valueOf(this.mppDataExchangePort));
diff --git a/node-commons/src/test/java/org/apache/iotdb/commons/partition/SerializeTest.java b/node-commons/src/test/java/org/apache/iotdb/commons/partition/SerializeTest.java
index 2b13fbc1f6..4123af916c 100644
--- a/node-commons/src/test/java/org/apache/iotdb/commons/partition/SerializeTest.java
+++ b/node-commons/src/test/java/org/apache/iotdb/commons/partition/SerializeTest.java
@@ -65,7 +65,7 @@ public abstract class SerializeTest {
for (int i = startFlag; i < locationNum + startFlag; i++) {
TDataNodeLocation tDataNodeLocation = new TDataNodeLocation();
tDataNodeLocation.setDataNodeId(i);
- tDataNodeLocation.setExternalEndPoint(new TEndPoint("127.0.0.1", 6000 + i));
+ tDataNodeLocation.setClientRpcEndPoint(new TEndPoint("127.0.0.1", 6000 + i));
tDataNodeLocation.setInternalEndPoint(new TEndPoint("127.0.0.1", 7000 + i));
tDataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("127.0.0.1", 8000 + i));
tDataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("127.0.0.1", 9000 + i));
diff --git a/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftCommonsSerDeUtilsTest.java b/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftCommonsSerDeUtilsTest.java
index 4190018650..38a4138d6f 100644
--- a/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftCommonsSerDeUtilsTest.java
+++ b/node-commons/src/test/java/org/apache/iotdb/commons/utils/ThriftCommonsSerDeUtilsTest.java
@@ -63,7 +63,7 @@ public class ThriftCommonsSerDeUtilsTest {
public void readWriteTDataNodeLocationTest() throws IOException {
TDataNodeLocation dataNodeLocation0 = new TDataNodeLocation();
dataNodeLocation0.setDataNodeId(0);
- dataNodeLocation0.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation0.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation0.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation0.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation0.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
@@ -127,7 +127,7 @@ public class ThriftCommonsSerDeUtilsTest {
for (int i = 0; i < 3; i++) {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
dataNodeLocation.setDataNodeId(i);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667 + i));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003 + i));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777 + i));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010 + i));
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 2e446322b5..2a1e0d575f 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -22,7 +22,7 @@
####################
# Datatype: String
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
# Datatype: int
rpc_port=6667
diff --git a/server/src/assembly/resources/sbin/stop-datanode.bat b/server/src/assembly/resources/sbin/stop-datanode.bat
index b7de06477f..7c5bac8e76 100644
--- a/server/src/assembly/resources/sbin/stop-datanode.bat
+++ b/server/src/assembly/resources/sbin/stop-datanode.bat
@@ -27,12 +27,12 @@ for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "^rpc_port"
set rpc_port=%%i
)
-for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_address"
+for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_ip"
%superior_dir%\conf\iotdb-engine.properties') do (
- set rpc_address=%%i
+ set rpc_ip=%%i
)
-for /f "tokens=5" %%a in ('netstat /ano ^| findstr %rpc_address%:%rpc_port%') do (
+for /f "tokens=5" %%a in ('netstat /ano ^| findstr %rpc_ip%:%rpc_port%') do (
taskkill /f /pid %%a
)
rem ps ax | grep -i 'iotdb.DataNode' | grep -v grep | awk '{print $1}' | xargs kill -SIGTERM
diff --git a/server/src/assembly/resources/sbin/stop-server.bat b/server/src/assembly/resources/sbin/stop-server.bat
index a2f85581fa..a063e5204c 100755
--- a/server/src/assembly/resources/sbin/stop-server.bat
+++ b/server/src/assembly/resources/sbin/stop-server.bat
@@ -27,12 +27,12 @@ for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "^rpc_port"
set rpc_port=%%i
)
-for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_address"
+for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_ip"
%superior_dir%\conf\iotdb-engine.properties') do (
- set rpc_address=%%i
+ set rpc_ip=%%i
)
-for /f "tokens=5" %%a in ('netstat /ano ^| findstr %rpc_address%:%rpc_port%') do (
+for /f "tokens=5" %%a in ('netstat /ano ^| findstr %rpc_ip%:%rpc_port%') do (
taskkill /f /pid %%a
)
rem ps ax | grep -i 'iotdb.IoTDB' | grep -v grep | awk '{print $1}' | xargs kill -SIGTERM
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 19f34f9196..00abcfe618 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -144,7 +144,7 @@ public class IoTDBDescriptor {
Properties properties = new Properties();
properties.load(inputStream);
- conf.setRpcAddress(properties.getProperty("rpc_address", conf.getRpcAddress()));
+ conf.setRpcAddress(properties.getProperty("rpc_ip", conf.getRpcAddress()));
loadClusterProps(properties);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java
index 19f7b43fed..5e15ce763d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java
@@ -60,10 +60,10 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(11)
- .setExternalEndPoint(new TEndPoint("192.0.1.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(12)
- .setExternalEndPoint(new TEndPoint("192.0.1.2", 9000))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.2", 9000))));
regionMap.put(new TSeriesPartitionSlot(device1.length()), region1);
TRegionReplicaSet region2 =
@@ -72,10 +72,10 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(31)
- .setExternalEndPoint(new TEndPoint("192.0.3.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.3.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(32)
- .setExternalEndPoint(new TEndPoint("192.0.3.2", 9000))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.3.2", 9000))));
regionMap.put(new TSeriesPartitionSlot(device2.length()), region2);
TRegionReplicaSet region3 =
@@ -84,10 +84,10 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(11)
- .setExternalEndPoint(new TEndPoint("192.0.1.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(12)
- .setExternalEndPoint(new TEndPoint("192.0.1.2", 9000))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.2", 9000))));
regionMap.put(new TSeriesPartitionSlot(device3.length()), region3);
schemaPartitionMap.put("root.sg", regionMap);
@@ -131,20 +131,20 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(11)
- .setExternalEndPoint(new TEndPoint("192.0.1.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(12)
- .setExternalEndPoint(new TEndPoint("192.0.1.2", 9000)))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.2", 9000)))));
d1DataRegions.add(
new TRegionReplicaSet(
new TConsensusGroupId(TConsensusGroupType.DataRegion, 2),
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(21)
- .setExternalEndPoint(new TEndPoint("192.0.2.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.2.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(22)
- .setExternalEndPoint(new TEndPoint("192.0.2.2", 9000)))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.2.2", 9000)))));
Map<TTimePartitionSlot, List<TRegionReplicaSet>> d1DataRegionMap = new HashMap<>();
d1DataRegionMap.put(new TTimePartitionSlot(), d1DataRegions);
@@ -155,10 +155,10 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(31)
- .setExternalEndPoint(new TEndPoint("192.0.3.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.3.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(32)
- .setExternalEndPoint(new TEndPoint("192.0.3.2", 9000)))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.3.2", 9000)))));
Map<TTimePartitionSlot, List<TRegionReplicaSet>> d2DataRegionMap = new HashMap<>();
d2DataRegionMap.put(new TTimePartitionSlot(), d2DataRegions);
@@ -169,20 +169,20 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(11)
- .setExternalEndPoint(new TEndPoint("192.0.1.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(12)
- .setExternalEndPoint(new TEndPoint("192.0.1.2", 9000)))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.1.2", 9000)))));
d3DataRegions.add(
new TRegionReplicaSet(
new TConsensusGroupId(TConsensusGroupType.DataRegion, 4),
Arrays.asList(
new TDataNodeLocation()
.setDataNodeId(41)
- .setExternalEndPoint(new TEndPoint("192.0.4.1", 9000)),
+ .setClientRpcEndPoint(new TEndPoint("192.0.4.1", 9000)),
new TDataNodeLocation()
.setDataNodeId(42)
- .setExternalEndPoint(new TEndPoint("192.0.4.2", 9000)))));
+ .setClientRpcEndPoint(new TEndPoint("192.0.4.2", 9000)))));
Map<TTimePartitionSlot, List<TRegionReplicaSet>> d3DataRegionMap = new HashMap<>();
d3DataRegionMap.put(new TTimePartitionSlot(), d3DataRegions);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowRegionTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowRegionTask.java
index e4447eb058..4171409eda 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowRegionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowRegionTask.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.mpp.plan.execution.config;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
-import org.apache.iotdb.common.rpc.thrift.TRegionLocation;
+import org.apache.iotdb.common.rpc.thrift.TRegionInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
import org.apache.iotdb.db.mpp.common.header.HeaderConstant;
@@ -53,15 +53,15 @@ public class ShowRegionTask implements IConfigTask {
TShowRegionResp showRegionResp, SettableFuture<ConfigTaskResult> future) {
TsBlockBuilder builder = new TsBlockBuilder(HeaderConstant.showRegionHeader.getRespDataTypes());
if (showRegionResp.getRegionInfoList() != null) {
- for (TRegionLocation regionLocation : showRegionResp.getRegionInfoList()) {
+ for (TRegionInfo regionInfo : showRegionResp.getRegionInfoList()) {
builder.getTimeColumnBuilder().writeLong(0L);
- builder.getColumnBuilder(0).writeInt(regionLocation.getConsensusGroupId().getId());
- if (regionLocation.getConsensusGroupId().getType().ordinal()
+ builder.getColumnBuilder(0).writeInt(regionInfo.getConsensusGroupId().getId());
+ if (regionInfo.getConsensusGroupId().getType().ordinal()
== TConsensusGroupType.SchemaRegion.ordinal()) {
builder
.getColumnBuilder(1)
.writeBinary(Binary.valueOf(String.valueOf(TConsensusGroupType.SchemaRegion)));
- } else if (regionLocation.getConsensusGroupId().getType().ordinal()
+ } else if (regionInfo.getConsensusGroupId().getType().ordinal()
== TConsensusGroupType.DataRegion.ordinal()) {
builder
.getColumnBuilder(1)
@@ -70,13 +70,12 @@ public class ShowRegionTask implements IConfigTask {
builder
.getColumnBuilder(2)
.writeBinary(
- Binary.valueOf(
- regionLocation.getStatus() == null ? "" : regionLocation.getStatus()));
- builder.getColumnBuilder(3).writeBinary(Binary.valueOf(regionLocation.getStorageGroup()));
- builder.getColumnBuilder(4).writeLong(regionLocation.getSlots());
- builder.getColumnBuilder(5).writeInt(regionLocation.getDataNodeId());
- builder.getColumnBuilder(6).writeBinary(Binary.valueOf(regionLocation.getRpcAddresss()));
- builder.getColumnBuilder(7).writeInt(regionLocation.getRpcPort());
+ Binary.valueOf(regionInfo.getStatus() == null ? "" : regionInfo.getStatus()));
+ builder.getColumnBuilder(3).writeBinary(Binary.valueOf(regionInfo.getStorageGroup()));
+ builder.getColumnBuilder(4).writeLong(regionInfo.getSlots());
+ builder.getColumnBuilder(5).writeInt(regionInfo.getDataNodeId());
+ builder.getColumnBuilder(6).writeBinary(Binary.valueOf(regionInfo.getClientRpcIp()));
+ builder.getColumnBuilder(7).writeInt(regionInfo.getClientRpcPort());
builder.declarePosition();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
index c3a548b27a..ef8661fd63 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
@@ -97,7 +97,7 @@ public class InsertMultiTabletsStatement extends InsertBaseStatement {
insertTabletStatement.devicePath.getFullPath(),
StorageEngineV2.getTimePartitionSlot(
insertTabletStatement.getTimes()[insertTabletStatement.getTimes().length - 1]));
- result.add(regionReplicaSet.getDataNodeLocations().get(0).getExternalEndPoint());
+ result.add(regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
return result;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
index 08f4f607e5..0f819570ea 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
@@ -131,7 +131,7 @@ public class InsertRowStatement extends InsertBaseStatement {
dataPartition.getDataRegionReplicaSetForWriting(
devicePath.getFullPath(), StorageEngineV2.getTimePartitionSlot(time));
return Collections.singletonList(
- regionReplicaSet.getDataNodeLocations().get(0).getExternalEndPoint());
+ regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
index 3b53d90f21..8ca3b237e8 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
@@ -96,7 +96,7 @@ public class InsertRowsStatement extends InsertBaseStatement {
dataPartition.getDataRegionReplicaSetForWriting(
insertRowStatement.devicePath.getFullPath(),
StorageEngineV2.getTimePartitionSlot(insertRowStatement.getTime()));
- result.add(regionReplicaSet.getDataNodeLocations().get(0).getExternalEndPoint());
+ result.add(regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
return result;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
index 798c2ad328..3c63345145 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
@@ -99,7 +99,7 @@ public class InsertTabletStatement extends InsertBaseStatement {
devicePath.getFullPath(),
StorageEngineV2.getTimePartitionSlot(times[times.length - 1]));
return Collections.singletonList(
- regionReplicaSet.getDataNodeLocations().get(0).getExternalEndPoint());
+ regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
index a2147fe1c4..1e54ffb4c1 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -177,7 +177,7 @@ public class DataNode implements DataNodeMBean {
// Set DataNodeLocation
TDataNodeLocation location = new TDataNodeLocation();
location.setDataNodeId(config.getDataNodeId());
- location.setExternalEndPoint(new TEndPoint(config.getRpcAddress(), config.getRpcPort()));
+ location.setClientRpcEndPoint(new TEndPoint(config.getRpcAddress(), config.getRpcPort()));
location.setInternalEndPoint(
new TEndPoint(config.getInternalIp(), config.getInternalPort()));
location.setMppDataExchangeEndPoint(
@@ -335,7 +335,7 @@ public class DataNode implements DataNodeMBean {
// Set DataNodeLocation
TDataNodeLocation location = new TDataNodeLocation();
location.setDataNodeId(config.getDataNodeId());
- location.setExternalEndPoint(new TEndPoint(config.getRpcAddress(), config.getRpcPort()));
+ location.setClientRpcEndPoint(new TEndPoint(config.getRpcAddress(), config.getRpcPort()));
location.setInternalEndPoint(
new TEndPoint(config.getInternalIp(), config.getInternalPort()));
location.setMppDataExchangeEndPoint(
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java
index 74a5bc8be1..2bddd59d03 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java
@@ -55,7 +55,7 @@ public class FragmentInstanceSerdeTest {
public void testSerializeAndDeserializeForTree1() throws IllegalPathException {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
dataNodeLocation.setDataNodeId(0);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
@@ -87,7 +87,7 @@ public class FragmentInstanceSerdeTest {
public void testSerializeAndDeserializeWithNullFilter() throws IllegalPathException {
TDataNodeLocation dataNodeLocation = new TDataNodeLocation();
dataNodeLocation.setDataNodeId(0);
- dataNodeLocation.setExternalEndPoint(new TEndPoint("0.0.0.0", 6667));
+ dataNodeLocation.setClientRpcEndPoint(new TEndPoint("0.0.0.0", 6667));
dataNodeLocation.setInternalEndPoint(new TEndPoint("0.0.0.0", 9003));
dataNodeLocation.setMppDataExchangeEndPoint(new TEndPoint("0.0.0.0", 8777));
dataNodeLocation.setDataRegionConsensusEndPoint(new TEndPoint("0.0.0.0", 40010));
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java
index cd3d216b76..1e6460d7f6 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java
@@ -184,7 +184,7 @@ public class Util {
private static TDataNodeLocation genDataNodeLocation(int dataNodeId, String ip) {
return new TDataNodeLocation()
.setDataNodeId(dataNodeId)
- .setExternalEndPoint(new TEndPoint(ip, 9000))
+ .setClientRpcEndPoint(new TEndPoint(ip, 9000))
.setMppDataExchangeEndPoint(new TEndPoint(ip, 9001))
.setInternalEndPoint(new TEndPoint(ip, 9002));
}
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
index 0de33b9f54..218fcb8487 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
@@ -503,7 +503,7 @@ public class StandaloneSchedulerTest {
List<TDataNodeLocation> dataNodeList = new ArrayList<>();
dataNodeList.add(
new TDataNodeLocation()
- .setExternalEndPoint(new TEndPoint(conf.getRpcAddress(), conf.getRpcPort()))
+ .setClientRpcEndPoint(new TEndPoint(conf.getRpcAddress(), conf.getRpcPort()))
.setInternalEndPoint(new TEndPoint(conf.getInternalIp(), conf.getInternalPort()))
.setMppDataExchangeEndPoint(
new TEndPoint(conf.getInternalIp(), conf.getMppDataExchangePort()))
diff --git a/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java b/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
index 8224be1bda..1771715f8e 100644
--- a/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
@@ -318,7 +318,7 @@ public class InternalServiceImplTest {
List<TDataNodeLocation> dataNodeList = new ArrayList<>();
dataNodeList.add(
new TDataNodeLocation()
- .setExternalEndPoint(new TEndPoint(conf.getRpcAddress(), conf.getRpcPort()))
+ .setClientRpcEndPoint(new TEndPoint(conf.getRpcAddress(), conf.getRpcPort()))
.setInternalEndPoint(new TEndPoint(conf.getInternalIp(), conf.getInternalPort()))
.setMppDataExchangeEndPoint(
new TEndPoint(conf.getInternalIp(), conf.getMppDataExchangePort()))
diff --git a/server/src/test/resources/datanode1conf/iotdb-engine.properties b/server/src/test/resources/datanode1conf/iotdb-engine.properties
index b57011c636..1f50868e33 100644
--- a/server/src/test/resources/datanode1conf/iotdb-engine.properties
+++ b/server/src/test/resources/datanode1conf/iotdb-engine.properties
@@ -17,7 +17,7 @@
# under the License.
#
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
internal_ip=127.0.0.1
rpc_port=6667
diff --git a/server/src/test/resources/datanode2conf/iotdb-engine.properties b/server/src/test/resources/datanode2conf/iotdb-engine.properties
index 8a8574ab80..ca0615717d 100644
--- a/server/src/test/resources/datanode2conf/iotdb-engine.properties
+++ b/server/src/test/resources/datanode2conf/iotdb-engine.properties
@@ -17,7 +17,7 @@
# under the License.
#
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
internal_ip=127.0.0.1
rpc_port=6669
diff --git a/server/src/test/resources/datanode3conf/iotdb-engine.properties b/server/src/test/resources/datanode3conf/iotdb-engine.properties
index 20ac100bc2..94e24dd390 100644
--- a/server/src/test/resources/datanode3conf/iotdb-engine.properties
+++ b/server/src/test/resources/datanode3conf/iotdb-engine.properties
@@ -17,7 +17,7 @@
# under the License.
#
-rpc_address=0.0.0.0
+rpc_ip=0.0.0.0
internal_ip=127.0.0.1
rpc_port=6671
diff --git a/thrift-commons/src/main/thrift/common.thrift b/thrift-commons/src/main/thrift/common.thrift
index 1c7a55db17..ad8ea9eb25 100644
--- a/thrift-commons/src/main/thrift/common.thrift
+++ b/thrift-commons/src/main/thrift/common.thrift
@@ -65,8 +65,8 @@ struct TConfigNodeLocation {
struct TDataNodeLocation {
1: required i32 dataNodeId
- // TEndPoint for DataNode's external rpc
- 2: required TEndPoint externalEndPoint
+ // TEndPoint for DataNode's client rpc
+ 2: required TEndPoint clientRpcEndPoint
// TEndPoint for DataNode's internal rpc
3: required TEndPoint internalEndPoint
// TEndPoint for exchange data between DataNodes
@@ -77,12 +77,12 @@ struct TDataNodeLocation {
6: required TEndPoint schemaRegionConsensusEndPoint
}
-struct TRegionLocation {
+struct TRegionInfo {
1: required TConsensusGroupId consensusGroupId
2: required string storageGroup
3: required i32 dataNodeId;
- 4: required string rpcAddresss;
- 5: required i32 rpcPort;
+ 4: required string clientRpcIp;
+ 5: required i32 clientRpcPort;
6: required i64 slots;
7: optional string status;
}
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift b/thrift-confignode/src/main/thrift/confignode.thrift
index 64163e83b8..c573bc2639 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -236,7 +236,7 @@ struct TShowRegionReq {
struct TShowRegionResp {
1: required common.TSStatus status
- 2: optional list<common.TRegionLocation> regionInfoList;
+ 2: optional list<common.TRegionInfo> regionInfoList;
}
service ConfigIService {