This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch add_function_figure
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit eece6b6af79e73c7b200c40eaac4776c227c2f7f
Merge: 101dd3e34a b6ca325434
Author: qiaojialin <646274...@qq.com>
AuthorDate: Tue Jun 28 15:42:57 2022 +0800
Merge remote-tracking branch 'origin/master' into add_function_figure
.../client/AsyncConfigNodeClientPool.java | 72 ++++++++++++++++++++++
.../confignode/client/AsyncDataNodeClientPool.java | 7 ++-
...andler.java => ConfigNodeHeartbeatHandler.java} | 34 +++++-----
...tHandler.java => DataNodeHeartbeatHandler.java} | 17 ++---
.../iotdb/confignode/manager/ConfigManager.java | 31 ++++++++++
.../apache/iotdb/confignode/manager/IManager.java | 3 +
.../iotdb/confignode/manager/NodeManager.java | 6 ++
.../iotdb/confignode/manager/load/LoadManager.java | 64 +++++++++++++++----
...eatCache.java => ConfigNodeHeartbeatCache.java} | 11 +---
...tbeatCache.java => DataNodeHeartbeatCache.java} | 6 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 20 ++----
.../resources/conf/iotdb-datanode.properties | 4 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 13 ++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 +-
.../db/mpp/plan/execution/QueryExecution.java | 54 +++++++++-------
.../mpp/plan/execution/config/ShowClusterTask.java | 5 +-
.../config/executor/ClusterConfigTaskExecutor.java | 2 +-
.../executor/StandaloneConfigTaskExecutor.java | 15 ++++-
.../thrift/impl/DataNodeRPCServiceImpl.java | 2 +-
thrift-commons/src/main/thrift/common.thrift | 10 +--
.../src/main/thrift/confignode.thrift | 4 ++
thrift/src/main/thrift/datanode.thrift | 2 +-
22 files changed, 283 insertions(+), 103 deletions(-)
diff --cc
confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 94b33f0e6e,30c7ebf814..88b82f4f9c
---
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
@@@ -101,10 -99,9 +99,9 @@@ import java.io.IOException
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.List;
- import java.util.stream.Collectors;
/** 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);
