This is an automated email from the ASF dual-hosted git repository.
haonan 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 eeaeac0726 Add Cluster function figure and rename thrift file and
class name (#6481)
eeaeac0726 is described below
commit eeaeac0726481ca7e0e87eace84ade57d608c800
Author: Jialin Qiao <[email protected]>
AuthorDate: Tue Jun 28 19:55:45 2022 +0800
Add Cluster function figure and rename thrift file and class name (#6481)
Co-authored-by: HTHou <[email protected]>
---
client-cpp/README.md | 2 +-
client-cpp/pom.xml | 4 ++--
client-cpp/src/main/Session.cpp | 4 ++--
client-cpp/src/main/Session.h | 8 ++++----
client-py/iotdb/Session.py | 4 ++--
client-py/iotdb/utils/IoTDBRpcDataSet.py | 2 +-
.../service/thrift/ConfigNodeRPCService.java | 4 ++--
.../thrift/ConfigNodeRPCServiceProcessor.java | 4 ++--
.../iotdb/confignode/cli/TemporaryClientDemo.java | 8 ++++----
docs/UserGuide/Cluster/Cluster-Concept.md | 12 ++++++++----
docs/zh/UserGuide/Cluster/Cluster-Concept.md | 8 ++++++--
example/client-cpp-example/README.md | 2 +-
.../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 6 +++---
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 16 ++++++++--------
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 7 ++++---
.../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 6 +++---
.../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 4 ++--
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 2 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 13 +++++++------
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 4 ++--
.../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 4 ++--
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 4 ++--
.../apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java | 4 ++--
.../iotdb/jdbc/IoTDBPreparedStatementTest.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 2 +-
.../async/AsyncConfigNodeIServiceClient.java | 4 ++--
.../async/AsyncDataNodeInternalServiceClient.java | 4 ++--
.../client/sync/SyncConfigNodeIServiceClient.java | 4 ++--
.../sync/SyncDataNodeInternalServiceClient.java | 4 ++--
.../iotdb/commons/client/ClientManagerTest.java | 4 ++--
.../client/mock/MockInternalRPCService.java | 8 ++++----
.../apache/iotdb/db/client/ConfigNodeClient.java | 9 +++++----
...{InternalService.java => ClientRPCService.java} | 22 +++++++++++-----------
...erviceMBean.java => ClientRPCServiceMBean.java} | 2 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 6 +++---
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 6 +++---
.../org/apache/iotdb/db/service/RPCService.java | 2 +-
.../db/service/thrift/ProcessorWithMetrics.java | 4 ++--
...erviceImpl.java => DataNodeRPCServiceImpl.java} | 8 ++++----
...ServiceImpl.java => DataNodeTSServiceImpl.java} | 6 +++---
.../db/service/thrift/impl/TSIEventHandler.java | 4 ++--
.../schedule/DefaultDriverSchedulerTest.java | 5 +++--
...ImplTest.java => ClientRPCServiceImplTest.java} | 14 +++++++-------
.../org/apache/iotdb/rpc/IoTDBJDBCDataSet.java | 8 ++++----
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 6 +++---
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 8 ++++----
.../org/apache/iotdb/rpc/SynchronizedHandler.java | 6 +++---
.../apache/iotdb/session/SessionConnection.java | 10 +++++-----
.../org/apache/iotdb/session/SessionDataSet.java | 6 +++---
.../src/main/thrift/confignode.thrift | 2 +-
.../src/main/thrift/{rpc.thrift => client.thrift} | 2 +-
.../main/thrift/{mpp.thrift => datanode.thrift} | 8 ++++----
52 files changed, 160 insertions(+), 148 deletions(-)
diff --git a/client-cpp/README.md b/client-cpp/README.md
index 2800fd4598..d550a2f151 100644
--- a/client-cpp/README.md
+++ b/client-cpp/README.md
@@ -53,7 +53,7 @@ On Mac machines, the hierarchy of the package should look
like this:
+-- client
| +-- include
| +-- Session.h
-| +-- TSIService.h
+| +-- IClientRPCService.h
| +-- rpc_types.h
| +-- rpc_constants.h
| +-- thrift
diff --git a/client-cpp/pom.xml b/client-cpp/pom.xml
index a6feb1d413..5068db166f 100644
--- a/client-cpp/pom.xml
+++ b/client-cpp/pom.xml
@@ -165,8 +165,8 @@
<configuration>
<fileSets>
<fileSet>
-
<sourceFile>../thrift/src/main/thrift/rpc.thrift</sourceFile>
-
<destinationFile>${project.build.directory}/thrift/rpc.thrift</destinationFile>
+
<sourceFile>../thrift/src/main/thrift/client.thrift</sourceFile>
+
<destinationFile>${project.build.directory}/thrift/client.thrift</destinationFile>
</fileSet>
<fileSet>
<sourceFile>../thrift-commons/src/main/thrift/common.thrift</sourceFile>
diff --git a/client-cpp/src/main/Session.cpp b/client-cpp/src/main/Session.cpp
index 4ca93e143a..52de4e69c0 100644
--- a/client-cpp/src/main/Session.cpp
+++ b/client-cpp/src/main/Session.cpp
@@ -614,10 +614,10 @@ void Session::open(bool enableRPCCompression, int
connectionTimeoutInMs) {
}
if (enableRPCCompression) {
shared_ptr<TCompactProtocol> protocol(new TCompactProtocol(transport));
- client = std::make_shared<TSIServiceClient>(protocol);
+ client = std::make_shared<IClientRPCServiceClient>(protocol);
} else {
shared_ptr<TBinaryProtocol> protocol(new TBinaryProtocol(transport));
- client = std::make_shared<TSIServiceClient>(protocol);
+ client = std::make_shared<IClientRPCServiceClient>(protocol);
}
std::map<std::string, std::string> configuration;
diff --git a/client-cpp/src/main/Session.h b/client-cpp/src/main/Session.h
index b3eea5d76e..9caae5bc45 100644
--- a/client-cpp/src/main/Session.h
+++ b/client-cpp/src/main/Session.h
@@ -40,7 +40,7 @@
#include <thrift/transport/TSocket.h>
#include <thrift/transport/TTransportException.h>
#include <thrift/transport/TBufferTransports.h>
-#include "TSIService.h"
+#include "IClientRPCService.h"
using ::apache::thrift::protocol::TBinaryProtocol;
using ::apache::thrift::protocol::TCompactProtocol;
@@ -634,7 +634,7 @@ private:
int64_t queryId;
int64_t statementId;
int64_t sessionId;
- std::shared_ptr<TSIServiceIf> client;
+ std::shared_ptr<IClientRPCServiceIf> client;
int batchSize = 1024;
std::vector<std::string> columnNameList;
std::vector<std::string> columnTypeDeduplicatedList;
@@ -664,7 +664,7 @@ public:
std::map<std::string, int> &columnNameIndexMap,
bool isIgnoreTimeStamp,
int64_t queryId, int64_t statementId,
- std::shared_ptr<TSIServiceIf> client, int64_t sessionId,
+ std::shared_ptr<IClientRPCServiceIf> client, int64_t
sessionId,
const std::shared_ptr<TSQueryDataSet> &queryDataSet) :
tsQueryDataSetTimeBuffer(queryDataSet->time) {
this->sessionId = sessionId;
this->sql = sql;
@@ -893,7 +893,7 @@ private:
std::string username;
std::string password;
const TSProtocolVersion::type protocolVersion =
TSProtocolVersion::IOTDB_SERVICE_PROTOCOL_V3;
- std::shared_ptr<TSIServiceIf> client;
+ std::shared_ptr<IClientRPCServiceIf> client;
std::shared_ptr<TTransport> transport;
bool isClosed = true;
int64_t sessionId;
diff --git a/client-py/iotdb/Session.py b/client-py/iotdb/Session.py
index c5a83d3e05..529a6a93d8 100644
--- a/client-py/iotdb/Session.py
+++ b/client-py/iotdb/Session.py
@@ -24,7 +24,7 @@ from thrift.transport import TSocket, TTransport
from iotdb.utils.SessionDataSet import SessionDataSet
from .template.Template import Template
from .template.TemplateQueryType import TemplateQueryType
-from .thrift.rpc.TSIService import (
+from .thrift.rpc.IClientRPCService import (
Client,
TSCreateTimeseriesReq,
TSCreateAlignedTimeseriesReq,
@@ -61,7 +61,7 @@ from .thrift.rpc.ttypes import (
# from thrift.protocol import TBinaryProtocol, TCompactProtocol
# from thrift.transport import TSocket, TTransport
#
-# from iotdb.rpc.TSIService import Client, TSCreateTimeseriesReq,
TSInsertRecordReq, TSInsertTabletReq, \
+# from iotdb.rpc.IClientRPCService import Client, TSCreateTimeseriesReq,
TSInsertRecordReq, TSInsertTabletReq, \
# TSExecuteStatementReq, TSOpenSessionReq, TSQueryDataSet,
TSFetchResultsReq, TSCloseOperationReq, \
# TSCreateMultiTimeseriesReq, TSCloseSessionReq, TSInsertTabletsReq,
TSInsertRecordsReq
# from iotdb.rpc.ttypes import TSDeleteDataReq, TSProtocolVersion,
TSSetTimeZoneReq
diff --git a/client-py/iotdb/utils/IoTDBRpcDataSet.py
b/client-py/iotdb/utils/IoTDBRpcDataSet.py
index 9d4bfa33cb..67b907140c 100644
--- a/client-py/iotdb/utils/IoTDBRpcDataSet.py
+++ b/client-py/iotdb/utils/IoTDBRpcDataSet.py
@@ -23,7 +23,7 @@ import logging
import numpy as np
import pandas as pd
from thrift.transport import TTransport
-from iotdb.thrift.rpc.TSIService import TSFetchResultsReq, TSCloseOperationReq
+from iotdb.thrift.rpc.IClientRPCService import TSFetchResultsReq,
TSCloseOperationReq
from iotdb.utils.IoTDBConstants import TSDataType
logger = logging.getLogger("IoTDB")
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
index 8ba2b961ec..eef7337bf1 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.commons.service.ThriftService;
import org.apache.iotdb.commons.service.ThriftServiceThread;
import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
-import org.apache.iotdb.confignode.rpc.thrift.ConfigIService;
+import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
/** ConfigNodeRPCServer exposes the interface that interacts with the DataNode
*/
public class ConfigNodeRPCService extends ThriftService implements
ConfigNodeRPCServiceMBean {
@@ -53,7 +53,7 @@ public class ConfigNodeRPCService extends ThriftService
implements ConfigNodeRPC
@Override
public void initTProcessor() throws InstantiationException {
- processor = new ConfigIService.Processor<>(configNodeRPCServiceProcessor);
+ processor = new
IConfigNodeRPCService.Processor<>(configNodeRPCServiceProcessor);
}
@Override
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 30c7ebf814..88b82f4f9c 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
@@ -51,7 +51,7 @@ 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;
-import org.apache.iotdb.confignode.rpc.thrift.ConfigIService;
+import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerResp;
import org.apache.iotdb.confignode.rpc.thrift.TCheckUserPrivilegesReq;
@@ -101,7 +101,7 @@ import java.util.Collections;
import java.util.List;
/** ConfigNodeRPCServer exposes the interface that interacts with the DataNode
*/
-public class ConfigNodeRPCServiceProcessor implements ConfigIService.Iface {
+public class ConfigNodeRPCServiceProcessor implements
IConfigNodeRPCService.Iface {
private static final Logger LOGGER =
LoggerFactory.getLogger(ConfigNodeRPCServiceProcessor.class);
diff --git
a/confignode/src/test/java/org/apache/iotdb/confignode/cli/TemporaryClientDemo.java
b/confignode/src/test/java/org/apache/iotdb/confignode/cli/TemporaryClientDemo.java
index 2071b75277..0c77e5d974 100644
---
a/confignode/src/test/java/org/apache/iotdb/confignode/cli/TemporaryClientDemo.java
+++
b/confignode/src/test/java/org/apache/iotdb/confignode/cli/TemporaryClientDemo.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.confignode.cli;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.confignode.rpc.thrift.ConfigIService;
+import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.confignode.rpc.thrift.TSetStorageGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.rpc.RpcTransportFactory;
@@ -39,8 +39,8 @@ public class TemporaryClientDemo {
private static final int timeOutInMS = 10000;
private final Random random = new Random();
- private Map<Integer, ConfigIService.Client> clients;
- private ConfigIService.Client defaultClient;
+ private Map<Integer, IConfigNodeRPCService.Client> clients;
+ private IConfigNodeRPCService.Client defaultClient;
public void setStorageGroupsDemo() throws TException {
createClients();
@@ -70,7 +70,7 @@ public class TemporaryClientDemo {
for (int i = 22277; i <= 22281; i += 2) {
TTransport transport =
RpcTransportFactory.INSTANCE.getTransport("0.0.0.0", i, timeOutInMS);
transport.open();
- clients.put(i, new ConfigIService.Client(new
TBinaryProtocol(transport)));
+ clients.put(i, new IConfigNodeRPCService.Client(new
TBinaryProtocol(transport)));
}
}
}
diff --git a/docs/UserGuide/Cluster/Cluster-Concept.md
b/docs/UserGuide/Cluster/Cluster-Concept.md
index a7330f64be..73dabb4f74 100644
--- a/docs/UserGuide/Cluster/Cluster-Concept.md
+++ b/docs/UserGuide/Cluster/Cluster-Concept.md
@@ -27,7 +27,7 @@ Apache IoTDB Cluster contains two types of nodes: ConfigNode
and DataNode, each
A illustrate of the cluster architecture：
-<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Architecture.png?raw=true";>
+<img style="width:100%; max-width:500px; max-height:400px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Architecture.png?raw=true";>
ConfigNode is the control node of the cluster, which manage the node status of
cluster, partition information, etc. All ConfigNodes in the cluster form a high
available group, which is fully replicated.
@@ -38,7 +38,7 @@ Client could only connect to the DataNode for operation.
## Characteristics of Cluster
* Native Cluster Architecture
- * All module is designed for the IoTDB cluster.
+ * All modules are designed for cluster.
* Standalone is a special form of Cluster.
* High Scalability
* Support add nodes in a few seconds without data migration.
@@ -81,7 +81,7 @@ A region is the basic unit of replication. Multiple replicas
of a region constru
A illustration of the partition allocation in cluster:
-<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Data-Partition.png?raw=true";>
+<img style="width:100%; max-width:500px; max-height:500px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Data-Partition.png?raw=true";>
The figure contains 1 SchemaRegion group, and the schema_replication_factor is
3, so the 3 white SchemaRegion-0s form a replication group, and the Raft
protocol is used to ensure data consistency.
@@ -94,4 +94,8 @@ Among multiple replicas of each region group, data
consistency is guaranteed thr
* Current supported consensus protocol
* Standalone：Could only be used when replica is 1, which is the empty
implementation of the consensus protocol.
* MultiLeader：Could be used in any number of replicas, only for DataRegion,
writes can be applied on each replica and replicated asynchronously to other
replicas.
- * Ratis：Raft consensus protocol, Could be used in any number of replicas,
could be used for any region groups。
\ No newline at end of file
+ * Ratis：Raft consensus protocol, Could be used in any number of replicas,
could be used for any region groups。
+
+## 0.14.0-preview1 Function Map
+
+<img style="width:100%; max-width:800px; max-height:1000px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Preview1-Function.png?raw=true";>
diff --git a/docs/zh/UserGuide/Cluster/Cluster-Concept.md
b/docs/zh/UserGuide/Cluster/Cluster-Concept.md
index 82a5670c61..34da0e84a4 100644
--- a/docs/zh/UserGuide/Cluster/Cluster-Concept.md
+++ b/docs/zh/UserGuide/Cluster/Cluster-Concept.md
@@ -27,7 +27,7 @@ Apache IoTDB 集群版包含两种角色的节点，ConfigNode 和 DataNode，
集群架构示例如下图：
-<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Architecture.png?raw=true";>
+<img style="width:100%; max-width:500px; max-height:400px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Architecture.png?raw=true";>
ConfigNode 是集群的控制节点，管理集群的节点状态、分区信息等，集群所有 ConfigNode 组成一个高可用组，数据全量备份。
@@ -82,7 +82,7 @@ Region 是数据复制的基本单位，一个 Region 的多个副本构成了
完整的集群分区复制的示意图如下：
-<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Data-Partition.png?raw=true";>
+<img style="width:100%; max-width:500px; max-height:500px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Data-Partition.png?raw=true";>
图中包含 1 个 SchemaRegion 组，元数据采用 3 副本，因此 3 个白色的 SchemaRegion-0 组成了一个副本组。
@@ -96,3 +96,7 @@ Region 是数据复制的基本单位，一个 Region 的多个副本构成了
* Standalone：仅单副本时可用，一致性协议的空实现，效率最高。
* MultiLeader：任意副本数可用，当前仅可用于 DataRegion 的副本上，写入可以在任一副本进行，并异步复制到其他副本。
* Ratis：Raft 协议的一种实现，任意副本数可用，当前可用于任意副本组上。
+
+## 0.14.0-Preview1 功能图
+
+<img style="width:100%; max-width:800px; max-height:1000px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Preview1-Function.png?raw=true";>
\ No newline at end of file
diff --git a/example/client-cpp-example/README.md
b/example/client-cpp-example/README.md
index 33292d8b7d..38d392633a 100644
--- a/example/client-cpp-example/README.md
+++ b/example/client-cpp-example/README.md
@@ -34,7 +34,7 @@ You can find some files to form a complete project:
+-- client
| +-- include
| +-- Session.h
-| +-- TSIService.h
+| +-- IClientRPCService.h
| +-- rpc_types.h
| +-- rpc_constants.h
| +-- thrift
diff --git
a/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
index d79beec126..45c7cb91ce 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.rpc.IoTDBJDBCDataSet;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.thrift.TException;
@@ -67,7 +67,7 @@ public abstract class AbstractIoTDBJDBCResultSet implements
ResultSet {
List<String> columnTypeList,
Map<String, Integer> columnNameIndex,
boolean ignoreTimeStamp,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
String sql,
long queryId,
long sessionId,
@@ -102,7 +102,7 @@ public abstract class AbstractIoTDBJDBCResultSet implements
ResultSet {
List<String> columnTypeList,
Map<String, Integer> columnNameIndex,
boolean ignoreTimeStamp,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
String sql,
long queryId,
long sessionId,
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
index a40b1f77b8..d92ccae3ce 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
@@ -22,9 +22,9 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.rpc.RpcTransportFactory;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.ServerProperties;
import org.apache.iotdb.service.rpc.thrift.TSCloseSessionReq;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSOpenSessionReq;
import org.apache.iotdb.service.rpc.thrift.TSOpenSessionResp;
import org.apache.iotdb.service.rpc.thrift.TSProtocolVersion;
@@ -68,7 +68,7 @@ public class IoTDBConnection implements Connection {
TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V3;
private static final String NOT_SUPPORT_PREPARE_CALL = "Does not support
prepareCall";
private static final String NOT_SUPPORT_PREPARE_STATEMENT = "Does not
support prepareStatement";
- private TSIService.Iface client = null;
+ private IClientRPCService.Iface client = null;
private long sessionId = -1;
private IoTDBConnectionParams params;
private boolean isClosed = true;
@@ -111,9 +111,9 @@ public class IoTDBConnection implements Connection {
this.zoneId = ZoneId.of(params.getTimeZone());
openTransport();
if (Config.rpcThriftCompressionEnable) {
- setClient(new TSIService.Client(new TCompactProtocol(transport)));
+ setClient(new IClientRPCService.Client(new TCompactProtocol(transport)));
} else {
- setClient(new TSIService.Client(new TBinaryProtocol(transport)));
+ setClient(new IClientRPCService.Client(new TBinaryProtocol(transport)));
}
// open client session
openSession();
@@ -454,7 +454,7 @@ public class IoTDBConnection implements Connection {
throw new SQLException("Does not support setSavepoint");
}
- public TSIService.Iface getClient() {
+ public IClientRPCService.Iface getClient() {
return client;
}
@@ -462,7 +462,7 @@ public class IoTDBConnection implements Connection {
return sessionId;
}
- public void setClient(TSIService.Iface client) {
+ public void setClient(IClientRPCService.Iface client) {
this.client = client;
}
@@ -536,9 +536,9 @@ public class IoTDBConnection implements Connection {
transport.close();
openTransport();
if (Config.rpcThriftCompressionEnable) {
- setClient(new TSIService.Client(new TCompactProtocol(transport)));
+ setClient(new IClientRPCService.Client(new
TCompactProtocol(transport)));
} else {
- setClient(new TSIService.Client(new TBinaryProtocol(transport)));
+ setClient(new IClientRPCService.Client(new
TBinaryProtocol(transport)));
}
openSession();
setClient(RpcUtils.newSynchronizedClient(getClient()));
diff --git
a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
index 3df1a438db..fdc4c4ac13 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
@@ -20,9 +20,9 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSFetchMetadataReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchMetadataResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -57,7 +57,7 @@ import java.util.TreeMap;
public class IoTDBDatabaseMetadata implements DatabaseMetaData {
private IoTDBConnection connection;
- private TSIService.Iface client;
+ private IClientRPCService.Iface client;
private static final Logger logger =
LoggerFactory.getLogger(IoTDBDatabaseMetadata.class);
private static final String METHOD_NOT_SUPPORTED_STRING = "Method not
supported";
// when running the program in IDE, we can not get the version info using
@@ -70,7 +70,8 @@ public class IoTDBDatabaseMetadata implements
DatabaseMetaData {
private WatermarkEncoder groupedLSBWatermarkEncoder;
private static String sqlKeywordsThatArentSQL92;
- IoTDBDatabaseMetadata(IoTDBConnection connection, TSIService.Iface client,
long sessionId) {
+ IoTDBDatabaseMetadata(
+ IoTDBConnection connection, IClientRPCService.Iface client, long
sessionId) {
this.connection = connection;
this.client = client;
this.sessionId = sessionId;
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java
index 27c8384ee5..f79131b634 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.service.rpc.thrift.TSTracingInfo;
@@ -42,7 +42,7 @@ public class IoTDBJDBCResultSet extends
AbstractIoTDBJDBCResultSet {
List<String> columnTypeList,
Map<String, Integer> columnNameIndex,
boolean ignoreTimeStamp,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
String sql,
long queryId,
long sessionId,
@@ -83,7 +83,7 @@ public class IoTDBJDBCResultSet extends
AbstractIoTDBJDBCResultSet {
List<String> columnTypeList,
Map<String, Integer> columnNameIndex,
boolean ignoreTimeStamp,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
String sql,
long queryId,
long sessionId,
diff --git
a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java
index c0e70b78a7..da51dcf324 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java
@@ -21,9 +21,9 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSQueryNonAlignDataSet;
import org.apache.iotdb.service.rpc.thrift.TSTracingInfo;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
@@ -61,7 +61,7 @@ public class IoTDBNonAlignJDBCResultSet extends
AbstractIoTDBJDBCResultSet {
List<String> columnTypeList,
Map<String, Integer> columnNameIndex,
boolean ignoreTimeStamp,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
String sql,
long queryId,
long sessionId,
diff --git
a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedStatement.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedStatement.java
index 12d4fc556f..e45dd5ebf1 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedStatement.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.jdbc;
-import org.apache.iotdb.service.rpc.thrift.TSIService.Iface;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService.Iface;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.thrift.TException;
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
index cc5c6398c2..4772dafc49 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
@@ -23,12 +23,12 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.rpc.TSStatusCode;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSCancelOperationReq;
import org.apache.iotdb.service.rpc.thrift.TSCloseOperationReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteBatchStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.service.rpc.thrift.TSQueryNonAlignDataSet;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
@@ -63,7 +63,7 @@ public class IoTDBStatement implements Statement {
*/
private int queryTimeout = -1;
- protected TSIService.Iface client;
+ protected IClientRPCService.Iface client;
private List<String> batchSQLList;
private static final String NOT_SUPPORT_EXECUTE = "Not support execute";
private static final String NOT_SUPPORT_EXECUTE_UPDATE = "Not support
executeUpdate";
@@ -83,7 +83,7 @@ public class IoTDBStatement implements Statement {
/** Constructor of IoTDBStatement. */
IoTDBStatement(
IoTDBConnection connection,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
int fetchSize,
ZoneId zoneId,
@@ -102,7 +102,7 @@ public class IoTDBStatement implements Statement {
// only for test
IoTDBStatement(
IoTDBConnection connection,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
ZoneId zoneId,
int seconds,
@@ -117,14 +117,15 @@ public class IoTDBStatement implements Statement {
this.stmtId = statementId;
}
- IoTDBStatement(IoTDBConnection connection, TSIService.Iface client, long
sessionId, ZoneId zoneId)
+ IoTDBStatement(
+ IoTDBConnection connection, IClientRPCService.Iface client, long
sessionId, ZoneId zoneId)
throws SQLException {
this(connection, client, sessionId, Config.DEFAULT_FETCH_SIZE, zoneId, 0);
}
IoTDBStatement(
IoTDBConnection connection,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
ZoneId zoneId,
int seconds)
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java
b/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java
index d4dd75ba8e..c70017756d 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSExecuteBatchStatementReq;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.thrift.TException;
import org.junit.After;
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.when;
public class BatchTest {
@Mock private IoTDBConnection connection;
- @Mock private TSIService.Iface client;
+ @Mock private IClientRPCService.Iface client;
private long sessionId;
@Mock private IoTDBStatement statement;
private TSStatus errorStatus =
RpcUtils.getStatus(TSStatusCode.INTERNAL_SERVER_ERROR);
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
index 876876b700..f782c407b8 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
@@ -20,9 +20,9 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.rpc.RpcUtils;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.ServerProperties;
import org.apache.iotdb.service.rpc.thrift.TSGetTimeZoneResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSSetTimeZoneReq;
import org.apache.thrift.TException;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
public class IoTDBConnectionTest {
- @Mock private TSIService.Iface client;
+ @Mock private IClientRPCService.Iface client;
private IoTDBConnection connection = new IoTDBConnection();
private TSStatus successStatus = RpcUtils.SUCCESS_STATUS;
diff --git
a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
index 511390b5a1..84de9a2524 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
@@ -21,11 +21,11 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.ServerProperties;
import org.apache.iotdb.service.rpc.thrift.TSExecuteBatchStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.thrift.TException;
import org.junit.Assert;
@@ -55,7 +55,7 @@ public class IoTDBDatabaseMetadataTest {
private long sessionId;
private TSStatus resp;
@Mock private IoTDBConnection connection;
- @Mock private TSIService.Iface client;
+ @Mock private IClientRPCService.Iface client;
@Mock private Statement statement;
@Mock private DatabaseMetaData databaseMetaData;
@Mock private TSStatus successStatus = new
TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
diff --git
a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java
b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java
index 1be9bb3c89..4d9b6f2b51 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java
@@ -20,6 +20,7 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.rpc.RpcUtils;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSCloseOperationReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
@@ -27,7 +28,6 @@ import org.apache.iotdb.service.rpc.thrift.TSFetchMetadataReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchMetadataResp;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -109,7 +109,7 @@ public class IoTDBJDBCResultSetTest {
private long queryId;
private long sessionId;
@Mock private IoTDBConnection connection;
- @Mock private TSIService.Iface client;
+ @Mock private IClientRPCService.Iface client;
@Mock private Statement statement;
@Mock private TSFetchMetadataResp fetchMetadataResp;
@Mock private TSFetchResultsResp fetchResultsResp;
diff --git
a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java
b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java
index 0ea1f00e71..0d2efc4566 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java
@@ -20,9 +20,9 @@ package org.apache.iotdb.jdbc;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.rpc.TSStatusCode;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService.Iface;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService.Iface;
import org.junit.Before;
import org.junit.Test;
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java
b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java
index 579d1df194..a17322d0bc 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.jdbc;
import org.apache.iotdb.rpc.RpcUtils;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService.Iface;
import org.apache.iotdb.service.rpc.thrift.TSFetchMetadataReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchMetadataResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService.Iface;
import org.junit.After;
import org.junit.Assert;
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java
b/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java
index 6fe32285db..5b51d845c6 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeIServiceClient.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.AsyncBaseClientFactory;
import org.apache.iotdb.commons.client.ClientFactoryProperty;
import org.apache.iotdb.commons.client.ClientManager;
-import org.apache.iotdb.confignode.rpc.thrift.ConfigIService;
+import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.rpc.TNonblockingSocketWrapper;
import org.apache.commons.pool2.PooledObject;
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
-public class AsyncConfigNodeIServiceClient extends ConfigIService.AsyncClient {
+public class AsyncConfigNodeIServiceClient extends
IConfigNodeRPCService.AsyncClient {
private static final Logger logger =
LoggerFactory.getLogger(AsyncConfigNodeIServiceClient.class);
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java
b/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java
index f9abb05eb6..3a4fe1f68e 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.commons.client.AsyncBaseClientFactory;
import org.apache.iotdb.commons.client.ClientFactoryProperty;
import org.apache.iotdb.commons.client.ClientManager;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.mpp.rpc.thrift.InternalService;
+import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService;
import org.apache.iotdb.rpc.TNonblockingSocketWrapper;
import org.apache.commons.pool2.PooledObject;
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
-public class AsyncDataNodeInternalServiceClient extends
InternalService.AsyncClient {
+public class AsyncDataNodeInternalServiceClient extends
IDataNodeRPCService.AsyncClient {
private static final Logger logger =
LoggerFactory.getLogger(AsyncDataNodeInternalServiceClient.class);
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java
b/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java
index ea1f1ec14d..522470d8be 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.BaseClientFactory;
import org.apache.iotdb.commons.client.ClientFactoryProperty;
import org.apache.iotdb.commons.client.ClientManager;
-import org.apache.iotdb.confignode.rpc.thrift.ConfigIService;
+import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.rpc.RpcTransportFactory;
import org.apache.iotdb.rpc.TConfigurationConst;
import org.apache.iotdb.rpc.TimeoutChangeableTransport;
@@ -37,7 +37,7 @@ import org.apache.thrift.transport.TTransportException;
import java.lang.reflect.Constructor;
import java.net.SocketException;
-public class SyncConfigNodeIServiceClient extends ConfigIService.Client
+public class SyncConfigNodeIServiceClient extends IConfigNodeRPCService.Client
implements SyncThriftClient, AutoCloseable {
private final TEndPoint endPoint;
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java
b/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java
index e3407516f4..3d992c5b48 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.commons.client.BaseClientFactory;
import org.apache.iotdb.commons.client.ClientFactoryProperty;
import org.apache.iotdb.commons.client.ClientManager;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.mpp.rpc.thrift.InternalService;
+import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService;
import org.apache.iotdb.rpc.RpcTransportFactory;
import org.apache.iotdb.rpc.TConfigurationConst;
import org.apache.iotdb.rpc.TimeoutChangeableTransport;
@@ -38,7 +38,7 @@ import org.apache.thrift.transport.TTransportException;
import java.lang.reflect.Constructor;
import java.net.SocketException;
-public class SyncDataNodeInternalServiceClient extends InternalService.Client
+public class SyncDataNodeInternalServiceClient extends
IDataNodeRPCService.Client
implements SyncThriftClient, AutoCloseable {
private final TEndPoint endPoint;
diff --git
a/node-commons/src/test/java/org/apache/iotdb/commons/client/ClientManagerTest.java
b/node-commons/src/test/java/org/apache/iotdb/commons/client/ClientManagerTest.java
index e1aee6ac33..d0bb75ae50 100644
---
a/node-commons/src/test/java/org/apache/iotdb/commons/client/ClientManagerTest.java
+++
b/node-commons/src/test/java/org/apache/iotdb/commons/client/ClientManagerTest.java
@@ -24,7 +24,7 @@ import
org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient;
import org.apache.iotdb.commons.client.mock.MockInternalRPCService;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
import org.apache.iotdb.commons.exception.StartupException;
-import org.apache.iotdb.mpp.rpc.thrift.InternalService;
+import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService;
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
@@ -47,7 +47,7 @@ public class ClientManagerTest {
@Before
public void setUp() throws StartupException {
service = new MockInternalRPCService(endPoint);
- service.initSyncedServiceImpl(mock(InternalService.Iface.class));
+ service.initSyncedServiceImpl(mock(IDataNodeRPCService.Iface.class));
service.start();
}
diff --git
a/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
b/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
index 9cf8ae042a..85f1d63ae6 100644
---
a/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
+++
b/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
@@ -26,7 +26,7 @@ import
org.apache.iotdb.commons.exception.runtime.RPCServiceException;
import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.ThriftService;
import org.apache.iotdb.commons.service.ThriftServiceThread;
-import org.apache.iotdb.mpp.rpc.thrift.InternalService;
+import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService;
import org.apache.thrift.server.TServerEventHandler;
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock;
public class MockInternalRPCService extends ThriftService implements
MockInternalRPCServiceMBean {
private final TEndPoint thisNode;
- private InternalService.Iface mockedProcessor;
+ private IDataNodeRPCService.Iface mockedProcessor;
public MockInternalRPCService(TEndPoint thisNode) {
this.thisNode = thisNode;
@@ -48,7 +48,7 @@ public class MockInternalRPCService extends ThriftService
implements MockInterna
@Override
public void initSyncedServiceImpl(Object mockedProcessor) {
- this.mockedProcessor = (InternalService.Iface) mockedProcessor;
+ this.mockedProcessor = (IDataNodeRPCService.Iface) mockedProcessor;
super.mbeanName =
String.format(
"%s:%s=%s", this.getClass().getPackage(), IoTDBConstant.JMX_TYPE,
getID().getJmxName());
@@ -57,7 +57,7 @@ public class MockInternalRPCService extends ThriftService
implements MockInterna
@Override
public void initTProcessor() {
- processor = new InternalService.Processor<>(mockedProcessor);
+ processor = new IDataNodeRPCService.Processor<>(mockedProcessor);
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
index 4a303b6ff1..0a8fb410dd 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.commons.client.ClientPoolProperty;
import org.apache.iotdb.commons.client.sync.SyncThriftClient;
import org.apache.iotdb.commons.client.sync.SyncThriftClientWithErrorHandler;
import org.apache.iotdb.commons.consensus.PartitionRegionId;
-import org.apache.iotdb.confignode.rpc.thrift.ConfigIService;
+import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerResp;
import org.apache.iotdb.confignode.rpc.thrift.TCheckUserPrivilegesReq;
@@ -82,7 +82,8 @@ import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
-public class ConfigNodeClient implements ConfigIService.Iface,
SyncThriftClient, AutoCloseable {
+public class ConfigNodeClient
+ implements IConfigNodeRPCService.Iface, SyncThriftClient, AutoCloseable {
private static final Logger logger =
LoggerFactory.getLogger(ConfigNodeClient.class);
private static final int RETRY_NUM = 5;
@@ -92,7 +93,7 @@ public class ConfigNodeClient implements
ConfigIService.Iface, SyncThriftClient,
private long connectionTimeout =
ClientPoolProperty.DefaultProperty.WAIT_CLIENT_TIMEOUT_MS;
- private ConfigIService.Iface client;
+ private IConfigNodeRPCService.Iface client;
private TTransport transport;
@@ -152,7 +153,7 @@ public class ConfigNodeClient implements
ConfigIService.Iface, SyncThriftClient,
throw new TException(e);
}
- client = new ConfigIService.Client(protocolFactory.getProtocol(transport));
+ client = new
IConfigNodeRPCService.Client(protocolFactory.getProtocol(transport));
}
private void reconnect() throws TException {
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/InternalService.java
b/server/src/main/java/org/apache/iotdb/db/service/ClientRPCService.java
similarity index 82%
rename from
server/src/main/java/org/apache/iotdb/db/service/InternalService.java
rename to server/src/main/java/org/apache/iotdb/db/service/ClientRPCService.java
index 7ce1aef254..4048b15f25 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/InternalService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/ClientRPCService.java
@@ -27,14 +27,14 @@ 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.InternalServiceImpl;
-import org.apache.iotdb.mpp.rpc.thrift.InternalService.Processor;
+import org.apache.iotdb.db.service.thrift.impl.DataNodeRPCServiceImpl;
+import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService.Processor;
-public class InternalService extends ThriftService implements
InternalServiceMBean {
+public class ClientRPCService extends ThriftService implements
ClientRPCServiceMBean {
- private InternalServiceImpl impl;
+ private DataNodeRPCServiceImpl impl;
- private InternalService() {}
+ private ClientRPCService() {}
@Override
public ServiceType getID() {
@@ -44,7 +44,7 @@ public class InternalService extends ThriftService implements
InternalServiceMBe
@Override
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
- impl = new InternalServiceImpl();
+ impl = new DataNodeRPCServiceImpl();
initSyncedServiceImpl(null);
processor = new Processor<>(impl);
}
@@ -82,13 +82,13 @@ public class InternalService extends ThriftService
implements InternalServiceMBe
return IoTDBDescriptor.getInstance().getConfig().getInternalPort();
}
- private static class InternalServiceHolder {
- private static final InternalService INSTANCE = new InternalService();
+ private static class ClientRPCServiceHolder {
+ private static final ClientRPCService INSTANCE = new ClientRPCService();
- private InternalServiceHolder() {}
+ private ClientRPCServiceHolder() {}
}
- public static InternalService getInstance() {
- return InternalService.InternalServiceHolder.INSTANCE;
+ public static ClientRPCService getInstance() {
+ return ClientRPCServiceHolder.INSTANCE;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/InternalServiceMBean.java
b/server/src/main/java/org/apache/iotdb/db/service/ClientRPCServiceMBean.java
similarity index 95%
rename from
server/src/main/java/org/apache/iotdb/db/service/InternalServiceMBean.java
rename to
server/src/main/java/org/apache/iotdb/db/service/ClientRPCServiceMBean.java
index 6abb847e81..6c264e5a9e 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/InternalServiceMBean.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/ClientRPCServiceMBean.java
@@ -19,4 +19,4 @@
package org.apache.iotdb.db.service;
-public interface InternalServiceMBean {}
+public interface ClientRPCServiceMBean {}
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 3a8c4592b3..ead4105378 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
@@ -60,7 +60,7 @@ import org.apache.iotdb.db.protocol.rest.RestService;
import org.apache.iotdb.db.service.basic.ServiceProvider;
import org.apache.iotdb.db.service.basic.StandaloneServiceProvider;
import org.apache.iotdb.db.service.metrics.MetricsService;
-import org.apache.iotdb.db.service.thrift.impl.DataNodeTSIServiceImpl;
+import org.apache.iotdb.db.service.thrift.impl.DataNodeTSServiceImpl;
import org.apache.iotdb.db.sync.receiver.ReceiverService;
import org.apache.iotdb.db.sync.sender.service.SenderService;
import org.apache.iotdb.db.wal.WALManager;
@@ -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(InternalService.getInstance());
+ registerManager.register(ClientRPCService.getInstance());
}
/** register DataNode with ConfigNode */
@@ -396,7 +396,7 @@ public class DataNode implements DataNodeMBean {
// init rpc service
IoTDBDescriptor.getInstance()
.getConfig()
- .setRpcImplClassName(DataNodeTSIServiceImpl.class.getName());
+ .setRpcImplClassName(DataNodeTSServiceImpl.class.getName());
if (IoTDBDescriptor.getInstance().getConfig().isEnableRpcService()) {
registerManager.register(RPCService.getInstance());
}
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 23c0a11e6e..f943f1c7c9 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
@@ -48,7 +48,7 @@ import org.apache.iotdb.db.protocol.rest.RestService;
import org.apache.iotdb.db.rescon.PrimitiveArrayManager;
import org.apache.iotdb.db.rescon.SystemInfo;
import org.apache.iotdb.db.service.metrics.MetricsService;
-import org.apache.iotdb.db.service.thrift.impl.DataNodeTSIServiceImpl;
+import org.apache.iotdb.db.service.thrift.impl.DataNodeTSServiceImpl;
import org.apache.iotdb.db.sync.receiver.ReceiverService;
import org.apache.iotdb.db.sync.sender.service.SenderService;
import org.apache.iotdb.db.wal.WALManager;
@@ -129,7 +129,7 @@ public class NewIoTDB implements NewIoTDBMBean {
// init rpc service
IoTDBDescriptor.getInstance()
.getConfig()
- .setRpcImplClassName(DataNodeTSIServiceImpl.class.getName());
+ .setRpcImplClassName(DataNodeTSServiceImpl.class.getName());
registerManager.register(MetricsService.getInstance());
logger.info("recover the schema...");
@@ -144,7 +144,7 @@ public class NewIoTDB implements NewIoTDBMBean {
registerManager.register(StorageEngineV2.getInstance());
registerManager.register(MPPDataExchangeService.getInstance());
- registerManager.register(InternalService.getInstance());
+ registerManager.register(ClientRPCService.getInstance());
registerManager.register(DriverScheduler.getInstance());
registerManager.register(TemporaryQueryDataFileService.getInstance());
diff --git a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
index 9658e85427..85b3d128b9 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
@@ -29,7 +29,7 @@ import
org.apache.iotdb.db.service.thrift.ProcessorWithMetrics;
import org.apache.iotdb.db.service.thrift.handler.RPCServiceThriftHandler;
import org.apache.iotdb.db.service.thrift.impl.TSIEventHandler;
import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
-import org.apache.iotdb.service.rpc.thrift.TSIService.Processor;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService.Processor;
import java.lang.reflect.InvocationTargetException;
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java
b/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java
index e9e08d80b2..dda3cb1a4b 100644
---
a/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java
@@ -23,8 +23,8 @@ 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;
import org.apache.iotdb.metrics.utils.MetricLevel;
-import org.apache.iotdb.service.rpc.thrift.TSIService.Iface;
-import org.apache.iotdb.service.rpc.thrift.TSIService.Processor;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService.Iface;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService.Processor;
import org.apache.thrift.ProcessFunction;
import org.apache.thrift.TApplicationException;
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRPCServiceImpl.java
similarity index 98%
rename from
server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java
rename to
server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRPCServiceImpl.java
index 1fc8acf022..fb1d5fb85b 100644
---
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRPCServiceImpl.java
@@ -63,7 +63,7 @@ import org.apache.iotdb.db.service.metrics.enums.Tag;
import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.type.Gauge;
import org.apache.iotdb.metrics.utils.MetricLevel;
-import org.apache.iotdb.mpp.rpc.thrift.InternalService;
+import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService;
import org.apache.iotdb.mpp.rpc.thrift.TCancelFragmentInstanceReq;
import org.apache.iotdb.mpp.rpc.thrift.TCancelPlanFragmentReq;
import org.apache.iotdb.mpp.rpc.thrift.TCancelQueryReq;
@@ -103,14 +103,14 @@ import java.util.Map;
import java.util.Random;
import java.util.stream.Collectors;
-public class InternalServiceImpl implements InternalService.Iface {
+public class DataNodeRPCServiceImpl implements IDataNodeRPCService.Iface {
- private static final Logger LOGGER =
LoggerFactory.getLogger(InternalServiceImpl.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DataNodeRPCServiceImpl.class);
private final SchemaEngine schemaEngine = SchemaEngine.getInstance();
private final StorageEngineV2 storageEngine = StorageEngineV2.getInstance();
private static final double loadBalanceThreshold = 0.1;
- public InternalServiceImpl() {
+ public DataNodeRPCServiceImpl() {
super();
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSServiceImpl.java
similarity index 99%
rename from
server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
rename to
server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSServiceImpl.java
index 65770b9658..cf06db5a88 100644
---
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSServiceImpl.java
@@ -121,9 +121,9 @@ import static
org.apache.iotdb.db.utils.ErrorHandlingUtils.onIoTDBException;
import static
org.apache.iotdb.db.utils.ErrorHandlingUtils.onNPEOrUnexpectedException;
import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onQueryException;
-public class DataNodeTSIServiceImpl implements TSIEventHandler {
+public class DataNodeTSServiceImpl implements TSIEventHandler {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DataNodeTSIServiceImpl.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DataNodeTSServiceImpl.class);
private static final IoTDBConfig config =
IoTDBDescriptor.getInstance().getConfig();
@@ -135,7 +135,7 @@ public class DataNodeTSIServiceImpl implements
TSIEventHandler {
private final ISchemaFetcher SCHEMA_FETCHER;
- public DataNodeTSIServiceImpl() {
+ public DataNodeTSServiceImpl() {
if (config.isClusterMode()) {
PARTITION_FETCHER = ClusterPartitionFetcher.getInstance();
SCHEMA_FETCHER = ClusterSchemaFetcher.getInstance();
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSIEventHandler.java
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSIEventHandler.java
index 0a4887ffac..33fb4d8875 100644
---
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSIEventHandler.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSIEventHandler.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.db.service.thrift.impl;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
-public interface TSIEventHandler extends TSIService.Iface {
+public interface TSIEventHandler extends IClientRPCService.Iface {
void handleClientExit();
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DefaultDriverSchedulerTest.java
b/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DefaultDriverSchedulerTest.java
index 07d0f87510..e7ad0d91a7 100644
---
a/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DefaultDriverSchedulerTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DefaultDriverSchedulerTest.java
@@ -26,7 +26,7 @@ import
org.apache.iotdb.db.mpp.execution.exchange.IMPPDataExchangeManager;
import org.apache.iotdb.db.mpp.execution.schedule.task.DriverTask;
import org.apache.iotdb.db.mpp.execution.schedule.task.DriverTaskStatus;
import org.apache.iotdb.db.utils.stats.CpuTimer;
-import org.apache.iotdb.mpp.rpc.thrift.InternalService;
+import org.apache.iotdb.mpp.rpc.thrift.IDataNodeRPCService;
import io.airlift.units.Duration;
import org.junit.After;
@@ -309,7 +309,8 @@ public class DefaultDriverSchedulerTest {
IMPPDataExchangeManager mockMPPDataExchangeManager =
Mockito.mock(IMPPDataExchangeManager.class);
manager.setBlockManager(mockMPPDataExchangeManager);
- InternalService.Client mockMppServiceClient =
Mockito.mock(InternalService.Client.class);
+ IDataNodeRPCService.Client mockMppServiceClient =
+ Mockito.mock(IDataNodeRPCService.Client.class);
ITaskScheduler defaultScheduler = manager.getScheduler();
QueryId queryId = new QueryId("test");
FragmentInstanceId instanceId1 =
diff --git
a/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
b/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java
similarity index 96%
rename from
server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
rename to
server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java
index 84e065ae5f..6fdea59066 100644
---
a/server/src/test/java/org/apache/iotdb/db/service/InternalServiceImplTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.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.InternalServiceImpl;
+import org.apache.iotdb.db.service.thrift.impl.DataNodeRPCServiceImpl;
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 InternalServiceImplTest {
+public class ClientRPCServiceImplTest {
private static final IoTDBConfig conf =
IoTDBDescriptor.getInstance().getConfig();
- InternalServiceImpl internalServiceImpl;
+ DataNodeRPCServiceImpl dataNodeRPCServiceImpl;
static LocalConfigNode configNode;
@BeforeClass
@@ -85,7 +85,7 @@ public class InternalServiceImplTest {
.addConsensusGroup(
ConsensusGroupId.Factory.createFromTConsensusGroupId(regionReplicaSet.getRegionId()),
genSchemaRegionPeerList(regionReplicaSet));
- internalServiceImpl = new InternalServiceImpl();
+ dataNodeRPCServiceImpl = new DataNodeRPCServiceImpl();
}
@After
@@ -146,7 +146,7 @@ public class InternalServiceImplTest {
request.setConsensusGroupId(regionReplicaSet.getRegionId());
// Use consensus layer to execute request
- TSendPlanNodeResp response = internalServiceImpl.sendPlanNode(request);
+ TSendPlanNodeResp response = dataNodeRPCServiceImpl.sendPlanNode(request);
Assert.assertTrue(response.accepted);
}
@@ -222,7 +222,7 @@ public class InternalServiceImplTest {
request.setConsensusGroupId(regionReplicaSet.getRegionId());
// Use consensus layer to execute request
- TSendPlanNodeResp response = internalServiceImpl.sendPlanNode(request);
+ TSendPlanNodeResp response = dataNodeRPCServiceImpl.sendPlanNode(request);
Assert.assertTrue(response.accepted);
}
@@ -309,7 +309,7 @@ public class InternalServiceImplTest {
request.setConsensusGroupId(regionReplicaSet.getRegionId());
// Use consensus layer to execute request
- TSendPlanNodeResp response = internalServiceImpl.sendPlanNode(request);
+ TSendPlanNodeResp response = dataNodeRPCServiceImpl.sendPlanNode(request);
Assert.assertTrue(response.accepted);
}
diff --git
a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java
b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java
index 8f47547ce5..40ae340c5c 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBJDBCDataSet.java
@@ -20,10 +20,10 @@
package org.apache.iotdb.rpc;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSCloseOperationReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -49,7 +49,7 @@ public class IoTDBJDBCDataSet {
public static final int START_INDEX = 2;
public String sql;
public boolean isClosed = false;
- public TSIService.Iface client;
+ public IClientRPCService.Iface client;
public List<String> columnNameList; // no deduplication
public List<String> columnTypeList; // no deduplication
public Map<String, Integer>
@@ -87,7 +87,7 @@ public class IoTDBJDBCDataSet {
boolean ignoreTimeStamp,
long queryId,
long statementId,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
TSQueryDataSet queryDataSet,
int fetchSize,
@@ -188,7 +188,7 @@ public class IoTDBJDBCDataSet {
boolean ignoreTimeStamp,
long queryId,
long statementId,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
TSQueryDataSet queryDataSet,
int fetchSize,
diff --git
a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
index 3da00dc36a..124d61888f 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
@@ -20,10 +20,10 @@
package org.apache.iotdb.rpc;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSCloseOperationReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsReq;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -48,7 +48,7 @@ public class IoTDBRpcDataSet {
public static final int START_INDEX = 2;
public String sql;
public boolean isClosed = false;
- public TSIService.Iface client;
+ public IClientRPCService.Iface client;
public List<String> columnNameList; // no deduplication
public List<String> columnTypeList; // no deduplication
public Map<String, Integer>
@@ -86,7 +86,7 @@ public class IoTDBRpcDataSet {
boolean ignoreTimeStamp,
long queryId,
long statementId,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
TSQueryDataSet queryDataSet,
int fetchSize,
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
index 28d90ae734..89c9a21c4a 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
@@ -22,9 +22,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.protocol.influxdb.rpc.thrift.InfluxDBService;
import org.apache.iotdb.protocol.influxdb.rpc.thrift.InfluxTSStatus;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
import org.apache.iotdb.service.rpc.thrift.TSFetchResultsResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import java.lang.reflect.Proxy;
import java.text.SimpleDateFormat;
@@ -63,11 +63,11 @@ public class RpcUtils {
public static final TSStatus SUCCESS_STATUS =
new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
- public static TSIService.Iface newSynchronizedClient(TSIService.Iface
client) {
- return (TSIService.Iface)
+ public static IClientRPCService.Iface
newSynchronizedClient(IClientRPCService.Iface client) {
+ return (IClientRPCService.Iface)
Proxy.newProxyInstance(
RpcUtils.class.getClassLoader(),
- new Class[] {TSIService.Iface.class},
+ new Class[] {IClientRPCService.Iface.class},
new SynchronizedHandler(client));
}
diff --git
a/service-rpc/src/main/java/org/apache/iotdb/rpc/SynchronizedHandler.java
b/service-rpc/src/main/java/org/apache/iotdb/rpc/SynchronizedHandler.java
index a7bffa363c..0235b504af 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/SynchronizedHandler.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/SynchronizedHandler.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.rpc;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.thrift.TException;
@@ -28,9 +28,9 @@ import java.lang.reflect.Method;
public class SynchronizedHandler implements InvocationHandler {
- private final TSIService.Iface client;
+ private final IClientRPCService.Iface client;
- public SynchronizedHandler(TSIService.Iface client) {
+ public SynchronizedHandler(IClientRPCService.Iface client) {
this.client = client;
}
diff --git
a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
index 0f0741ec21..63653dfbde 100644
--- a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
+++ b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.rpc.RedirectException;
import org.apache.iotdb.rpc.RpcTransportFactory;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSAppendSchemaTemplateReq;
import org.apache.iotdb.service.rpc.thrift.TSCloseSessionReq;
import org.apache.iotdb.service.rpc.thrift.TSCreateAlignedTimeseriesReq;
@@ -36,7 +37,6 @@ import org.apache.iotdb.service.rpc.thrift.TSDeleteDataReq;
import org.apache.iotdb.service.rpc.thrift.TSDropSchemaTemplateReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSInsertRecordReq;
import org.apache.iotdb.service.rpc.thrift.TSInsertRecordsOfOneDeviceReq;
import org.apache.iotdb.service.rpc.thrift.TSInsertRecordsReq;
@@ -77,7 +77,7 @@ public class SessionConnection {
"Fail to reconnect to server. Please check server status";
private Session session;
private TTransport transport;
- private TSIService.Iface client;
+ private IClientRPCService.Iface client;
private long sessionId;
private long statementId;
private ZoneId zoneId;
@@ -118,9 +118,9 @@ public class SessionConnection {
}
if (session.enableRPCCompression) {
- client = new TSIService.Client(new TCompactProtocol(transport));
+ client = new IClientRPCService.Client(new TCompactProtocol(transport));
} else {
- client = new TSIService.Client(new TBinaryProtocol(transport));
+ client = new IClientRPCService.Client(new TBinaryProtocol(transport));
}
client = RpcUtils.newSynchronizedClient(client);
@@ -188,7 +188,7 @@ public class SessionConnection {
}
}
- protected TSIService.Iface getClient() {
+ protected IClientRPCService.Iface getClient() {
return client;
}
diff --git a/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java
b/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java
index 3c1f6c7b96..b5930f4761 100644
--- a/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java
+++ b/session/src/main/java/org/apache/iotdb/session/SessionDataSet.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.session;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.IoTDBRpcDataSet;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.service.rpc.thrift.TSIService;
+import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -50,7 +50,7 @@ public class SessionDataSet implements AutoCloseable {
Map<String, Integer> columnNameIndex,
long queryId,
long statementId,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
TSQueryDataSet queryDataSet,
boolean ignoreTimeStamp) {
@@ -77,7 +77,7 @@ public class SessionDataSet implements AutoCloseable {
Map<String, Integer> columnNameIndex,
long queryId,
long statementId,
- TSIService.Iface client,
+ IClientRPCService.Iface client,
long sessionId,
TSQueryDataSet queryDataSet,
boolean ignoreTimeStamp,
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift
b/thrift-confignode/src/main/thrift/confignode.thrift
index 66af9851ae..9ffca7390a 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -240,7 +240,7 @@ struct TShowRegionResp {
2: optional list<common.TRegionInfo> regionInfoList;
}
-service ConfigIService {
+service IConfigNodeRPCService {
/* DataNode */
diff --git a/thrift/src/main/thrift/rpc.thrift
b/thrift/src/main/thrift/client.thrift
similarity index 99%
rename from thrift/src/main/thrift/rpc.thrift
rename to thrift/src/main/thrift/client.thrift
index 3df4774d95..4a4fab7d05 100644
--- a/thrift/src/main/thrift/rpc.thrift
+++ b/thrift/src/main/thrift/client.thrift
@@ -406,7 +406,7 @@ struct TSDropSchemaTemplateReq {
2: required string templateName
}
-service TSIService {
+service IClientRPCService {
TSOpenSessionResp openSession(1:TSOpenSessionReq req);
common.TSStatus closeSession(1:TSCloseSessionReq req);
diff --git a/thrift/src/main/thrift/mpp.thrift
b/thrift/src/main/thrift/datanode.thrift
similarity index 97%
rename from thrift/src/main/thrift/mpp.thrift
rename to thrift/src/main/thrift/datanode.thrift
index 02866b7f64..d98e0ec754 100644
--- a/thrift/src/main/thrift/mpp.thrift
+++ b/thrift/src/main/thrift/datanode.thrift
@@ -132,7 +132,7 @@ struct TCancelFragmentInstanceReq {
struct TCancelResp {
1: required bool cancelled
- 2: optional string messsage
+ 2: optional string message
}
struct TSchemaFetchRequest {
@@ -170,17 +170,17 @@ struct THeartbeatResp {
4: optional i16 memory
}
-service InternalService {
+service IDataNodeRPCService {
// -----------------------------------For Data
Node-----------------------------------------------
/**
- * disptcher FragmentInstance to remote node for query request
+ * dispatch FragmentInstance to remote node for query request
*/
TSendFragmentInstanceResp sendFragmentInstance(TSendFragmentInstanceReq req);
/**
- * disptcher PlanNode to remote node for write request in order to save
resource
+ * dispatch PlanNode to remote node for write request in order to save
resource
*/
TSendPlanNodeResp sendPlanNode(TSendPlanNodeReq req);
![https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Architecture.png?raw=true"](https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Architecture.png?raw=true"){kind=link}
![https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Data-Partition.png?raw=true"](https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Data-Partition.png?raw=true"){kind=link}
![https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Preview1-Function.png?raw=true"](https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Cluster/Preview1-Function.png?raw=true"){kind=link}