You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/07/02 04:57:27 UTC
[iotdb] branch master updated: Fix a rpc service name to DataNodeInternalRPCService (#6561)
This is an automated email from the ASF dual-hosted git repository.
jackietien 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 540e058b62 Fix a rpc service name to DataNodeInternalRPCService (#6561)
540e058b62 is described below
commit 540e058b6206b25afad28349548eb073d1cb177a
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Sat Jul 2 12:57:22 2022 +0800
Fix a rpc service name to DataNodeInternalRPCService (#6561)
---
.../java/org/apache/iotdb/db/service/DataNode.java | 2 +-
...Service.java => DataNodeInternalRPCService.java} | 21 +++++++++++----------
...an.java => DataNodeInternalRPCServiceMBean.java} | 2 +-
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 2 +-
...mpl.java => DataNodeInternalRPCServiceImpl.java} | 7 ++++---
...java => DataNodeInternalRPCServiceImplTest.java} | 14 +++++++-------
6 files changed, 25 insertions(+), 23 deletions(-)
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 82416df4a6..5b2f704f8b 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
@@ -163,7 +163,7 @@ public class DataNode implements DataNodeMBean {
// start InternalService first so that it can respond to configNode's heartbeat before joining
// cluster
- registerManager.register(ClientRPCService.getInstance());
+ registerManager.register(DataNodeInternalRPCService.getInstance());
}
/** register DataNode with ConfigNode */
diff --git a/server/src/main/java/org/apache/iotdb/db/service/ClientRPCService.java b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java
similarity index 81%
rename from server/src/main/java/org/apache/iotdb/db/service/ClientRPCService.java
rename to server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java
index 4048b15f25..a93ed66c7c 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/ClientRPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java
@@ -27,14 +27,15 @@ import org.apache.iotdb.commons.service.ThriftServiceThread;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.service.thrift.handler.InternalServiceThriftHandler;
-import org.apache.iotdb.db.service.thrift.impl.DataNodeRPCServiceImpl;
+import org.apache.iotdb.db.service.thrift.impl.DataNodeInternalRPCServiceImpl;
import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService.Processor;
-public class ClientRPCService extends ThriftService implements ClientRPCServiceMBean {
+public class DataNodeInternalRPCService extends ThriftService
+ implements DataNodeInternalRPCServiceMBean {
- private DataNodeRPCServiceImpl impl;
+ private DataNodeInternalRPCServiceImpl impl;
- private ClientRPCService() {}
+ private DataNodeInternalRPCService() {}
@Override
public ServiceType getID() {
@@ -44,7 +45,7 @@ public class ClientRPCService extends ThriftService implements ClientRPCServiceM
@Override
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
- impl = new DataNodeRPCServiceImpl();
+ impl = new DataNodeInternalRPCServiceImpl();
initSyncedServiceImpl(null);
processor = new Processor<>(impl);
}
@@ -82,13 +83,13 @@ public class ClientRPCService extends ThriftService implements ClientRPCServiceM
return IoTDBDescriptor.getInstance().getConfig().getInternalPort();
}
- private static class ClientRPCServiceHolder {
- private static final ClientRPCService INSTANCE = new ClientRPCService();
+ private static class DataNodeInternalRPCServiceHolder {
+ private static final DataNodeInternalRPCService INSTANCE = new DataNodeInternalRPCService();
- private ClientRPCServiceHolder() {}
+ private DataNodeInternalRPCServiceHolder() {}
}
- public static ClientRPCService getInstance() {
- return ClientRPCServiceHolder.INSTANCE;
+ public static DataNodeInternalRPCService getInstance() {
+ return DataNodeInternalRPCServiceHolder.INSTANCE;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/ClientRPCServiceMBean.java b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceMBean.java
similarity index 94%
rename from server/src/main/java/org/apache/iotdb/db/service/ClientRPCServiceMBean.java
rename to server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceMBean.java
index 6c264e5a9e..fd3b9e7b92 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/ClientRPCServiceMBean.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceMBean.java
@@ -19,4 +19,4 @@
package org.apache.iotdb.db.service;
-public interface ClientRPCServiceMBean {}
+public interface DataNodeInternalRPCServiceMBean {}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
index 9d974c1355..4c13029d79 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
@@ -135,7 +135,7 @@ public class NewIoTDB implements NewIoTDBMBean {
registerManager.register(StorageEngineV2.getInstance());
registerManager.register(MPPDataExchangeService.getInstance());
- registerManager.register(ClientRPCService.getInstance());
+ registerManager.register(DataNodeInternalRPCService.getInstance());
registerManager.register(DriverScheduler.getInstance());
registerManager.register(TemporaryQueryDataFileService.getInstance());
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRPCServiceImpl.java
rename to server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index c6a12c5c79..b25d320b5b 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -103,13 +103,14 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-public class DataNodeRPCServiceImpl implements IDataNodeRPCService.Iface {
+public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface {
- private static final Logger LOGGER = LoggerFactory.getLogger(DataNodeRPCServiceImpl.class);
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(DataNodeInternalRPCServiceImpl.class);
private final SchemaEngine schemaEngine = SchemaEngine.getInstance();
private final StorageEngineV2 storageEngine = StorageEngineV2.getInstance();
- public DataNodeRPCServiceImpl() {
+ public DataNodeInternalRPCServiceImpl() {
super();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java b/server/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java
similarity index 95%
rename from server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java
rename to server/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java
index 01d8e44461..a2a5f3d075 100644
--- a/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java
@@ -39,7 +39,7 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.CreateAlignedTimeSeriesNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.CreateMultiTimeSeriesNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.CreateTimeSeriesNode;
-import org.apache.iotdb.db.service.thrift.impl.DataNodeRPCServiceImpl;
+import org.apache.iotdb.db.service.thrift.impl.DataNodeInternalRPCServiceImpl;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.mpp.rpc.thrift.TPlanNode;
import org.apache.iotdb.mpp.rpc.thrift.TSendPlanNodeReq;
@@ -64,9 +64,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class ClientRPCServiceImplTest {
+public class DataNodeInternalRPCServiceImplTest {
private static final IoTDBConfig conf = IoTDBDescriptor.getInstance().getConfig();
- DataNodeRPCServiceImpl dataNodeRPCServiceImpl;
+ DataNodeInternalRPCServiceImpl dataNodeInternalRPCServiceImpl;
static LocalConfigNode configNode;
@BeforeClass
@@ -85,7 +85,7 @@ public class ClientRPCServiceImplTest {
.addConsensusGroup(
ConsensusGroupId.Factory.createFromTConsensusGroupId(regionReplicaSet.getRegionId()),
genSchemaRegionPeerList(regionReplicaSet));
- dataNodeRPCServiceImpl = new DataNodeRPCServiceImpl();
+ dataNodeInternalRPCServiceImpl = new DataNodeInternalRPCServiceImpl();
}
@After
@@ -146,7 +146,7 @@ public class ClientRPCServiceImplTest {
request.setConsensusGroupId(regionReplicaSet.getRegionId());
// Use consensus layer to execute request
- TSendPlanNodeResp response = dataNodeRPCServiceImpl.sendPlanNode(request);
+ TSendPlanNodeResp response = dataNodeInternalRPCServiceImpl.sendPlanNode(request);
Assert.assertTrue(response.accepted);
}
@@ -222,7 +222,7 @@ public class ClientRPCServiceImplTest {
request.setConsensusGroupId(regionReplicaSet.getRegionId());
// Use consensus layer to execute request
- TSendPlanNodeResp response = dataNodeRPCServiceImpl.sendPlanNode(request);
+ TSendPlanNodeResp response = dataNodeInternalRPCServiceImpl.sendPlanNode(request);
Assert.assertTrue(response.accepted);
}
@@ -309,7 +309,7 @@ public class ClientRPCServiceImplTest {
request.setConsensusGroupId(regionReplicaSet.getRegionId());
// Use consensus layer to execute request
- TSendPlanNodeResp response = dataNodeRPCServiceImpl.sendPlanNode(request);
+ TSendPlanNodeResp response = dataNodeInternalRPCServiceImpl.sendPlanNode(request);
Assert.assertTrue(response.accepted);
}