This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new fdda945f178 Rename THeartbeat to TDataNodeHeart (#11603)
fdda945f178 is described below
commit fdda945f17883441387950ac7a8b17d610f08a9a
Author: Li Yu Heng <[email protected]>
AuthorDate: Fri Nov 24 23:32:42 2023 +0800
Rename THeartbeat to TDataNodeHeart (#11603)
* fix bug of show cluster
* all done
---
.../confignode/client/async/AsyncDataNodeHeartbeatClientPool.java | 4 ++--
.../client/async/handlers/heartbeat/DataNodeHeartbeatHandler.java | 6 +++---
.../confignode/manager/load/cache/node/NodeHeartbeatSample.java | 7 ++++---
.../iotdb/confignode/manager/load/cache/node/NodeStatistics.java | 4 ++--
.../iotdb/confignode/manager/load/service/HeartbeatService.java | 8 ++++----
.../manager/load/balancer/router/priority/GreedyPriorityTest.java | 4 ++--
.../load/balancer/router/priority/LeaderPriorityBalancerTest.java | 4 ++--
.../apache/iotdb/confignode/manager/load/cache/NodeCacheTest.java | 8 ++++----
.../java/org/apache/iotdb/db/pipe/agent/task/PipeTaskAgent.java | 6 +++---
.../db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java | 8 ++++----
.../main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java | 6 +++---
iotdb-protocol/thrift-datanode/src/main/thrift/datanode.thrift | 8 ++++----
12 files changed, 37 insertions(+), 36 deletions(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeHeartbeatClientPool.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeHeartbeatClientPool.java
index 8f946171a79..8d67d150efb 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeHeartbeatClientPool.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeHeartbeatClientPool.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import
org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient;
import
org.apache.iotdb.confignode.client.async.handlers.heartbeat.DataNodeHeartbeatHandler;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatReq;
/** Asynchronously send RPC requests to DataNodes. See queryengine.thrift for
more details. */
public class AsyncDataNodeHeartbeatClientPool {
@@ -44,7 +44,7 @@ public class AsyncDataNodeHeartbeatClientPool {
* @param endPoint The specific DataNode
*/
public void getDataNodeHeartBeat(
- TEndPoint endPoint, THeartbeatReq req, DataNodeHeartbeatHandler handler)
{
+ TEndPoint endPoint, TDataNodeHeartbeatReq req, DataNodeHeartbeatHandler
handler) {
try {
clientManager.borrowClient(endPoint).getDataNodeHeartBeat(req, handler);
} catch (Exception ignore) {
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/heartbeat/DataNodeHeartbeatHandler.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/heartbeat/DataNodeHeartbeatHandler.java
index 90ce2c347e4..3b77709dab6 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/heartbeat/DataNodeHeartbeatHandler.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/heartbeat/DataNodeHeartbeatHandler.java
@@ -27,7 +27,7 @@ import
org.apache.iotdb.confignode.manager.load.cache.LoadCache;
import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
import
org.apache.iotdb.confignode.manager.load.cache.region.RegionHeartbeatSample;
import org.apache.iotdb.confignode.manager.pipe.runtime.PipeRuntimeCoordinator;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.thrift.async.AsyncMethodCallback;
@@ -35,7 +35,7 @@ import org.apache.thrift.async.AsyncMethodCallback;
import java.util.Map;
import java.util.function.Consumer;
-public class DataNodeHeartbeatHandler implements
AsyncMethodCallback<THeartbeatResp> {
+public class DataNodeHeartbeatHandler implements
AsyncMethodCallback<TDataNodeHeartbeatResp> {
private final int nodeId;
@@ -71,7 +71,7 @@ public class DataNodeHeartbeatHandler implements
AsyncMethodCallback<THeartbeatR
}
@Override
- public void onComplete(THeartbeatResp heartbeatResp) {
+ public void onComplete(TDataNodeHeartbeatResp heartbeatResp) {
long receiveTime = System.currentTimeMillis();
// Update NodeCache
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeHeartbeatSample.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeHeartbeatSample.java
index f1db9e82a48..f24654e6126 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeHeartbeatSample.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeHeartbeatSample.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.confignode.manager.load.cache.node;
import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeHeartbeatResp;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.apache.iotdb.mpp.rpc.thrift.TLoadSample;
public class NodeHeartbeatSample {
@@ -44,7 +44,7 @@ public class NodeHeartbeatSample {
}
/** Constructor for DataNode sample. */
- public NodeHeartbeatSample(THeartbeatResp heartbeatResp, long
receiveTimestamp) {
+ public NodeHeartbeatSample(TDataNodeHeartbeatResp heartbeatResp, long
receiveTimestamp) {
this.sendTimestamp = heartbeatResp.getHeartbeatTimestamp();
this.receiveTimestamp = receiveTimestamp;
@@ -98,6 +98,7 @@ public class NodeHeartbeatSample {
public static NodeHeartbeatSample generateDefaultSample(NodeStatus status) {
long currentTime = System.currentTimeMillis();
return new NodeHeartbeatSample(
- new THeartbeatResp(currentTime,
status.getStatus()).setStatusReason(null), currentTime);
+ new TDataNodeHeartbeatResp(currentTime,
status.getStatus()).setStatusReason(null),
+ currentTime);
}
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeStatistics.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeStatistics.java
index 10399b8c78d..58b8d8a0113 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeStatistics.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/node/NodeStatistics.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.confignode.manager.load.cache.node;
import org.apache.iotdb.commons.cluster.NodeStatus;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.io.IOException;
@@ -106,7 +106,7 @@ public class NodeStatistics {
public NodeHeartbeatSample convertToNodeHeartbeatSample() {
long currentTime = System.currentTimeMillis();
return new NodeHeartbeatSample(
- new THeartbeatResp(currentTime,
status.getStatus()).setStatusReason(statusReason),
+ new TDataNodeHeartbeatResp(currentTime,
status.getStatus()).setStatusReason(statusReason),
currentTime);
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java
index 97de40fb314..6e733f0b6d6 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java
@@ -36,7 +36,7 @@ import
org.apache.iotdb.confignode.manager.load.cache.LoadCache;
import
org.apache.iotdb.confignode.manager.load.cache.node.ConfigNodeHeartbeatCache;
import org.apache.iotdb.confignode.manager.node.NodeManager;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeHeartbeatReq;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatReq;
import org.apache.iotdb.tsfile.utils.Pair;
import org.slf4j.Logger;
@@ -119,9 +119,9 @@ public class HeartbeatService {
});
}
- private THeartbeatReq genHeartbeatReq() {
+ private TDataNodeHeartbeatReq genHeartbeatReq() {
/* Generate heartbeat request */
- THeartbeatReq heartbeatReq = new THeartbeatReq();
+ TDataNodeHeartbeatReq heartbeatReq = new TDataNodeHeartbeatReq();
heartbeatReq.setHeartbeatTimestamp(System.currentTimeMillis());
// Always sample RegionGroups' leadership as the Region heartbeat
heartbeatReq.setNeedJudgeLeader(true);
@@ -184,7 +184,7 @@ public class HeartbeatService {
* @param registeredDataNodes DataNodes that registered in cluster
*/
private void pingRegisteredDataNodes(
- THeartbeatReq heartbeatReq, List<TDataNodeConfiguration>
registeredDataNodes) {
+ TDataNodeHeartbeatReq heartbeatReq, List<TDataNodeConfiguration>
registeredDataNodes) {
// Send heartbeat requests
for (TDataNodeConfiguration dataNodeInfo : registeredDataNodes) {
DataNodeHeartbeatHandler handler =
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/GreedyPriorityTest.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/GreedyPriorityTest.java
index 64eae9a0cfb..defe02aa50d 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/GreedyPriorityTest.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/GreedyPriorityTest.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.confignode.manager.load.cache.node.BaseNodeCache;
import
org.apache.iotdb.confignode.manager.load.cache.node.DataNodeHeartbeatCache;
import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.junit.Assert;
import org.junit.Test;
@@ -69,7 +69,7 @@ public class GreedyPriorityTest {
.get(i)
.cacheHeartbeatSample(
new NodeHeartbeatSample(
- new THeartbeatResp(currentTimeMillis,
statuses[i].getStatus()),
+ new TDataNodeHeartbeatResp(currentTimeMillis,
statuses[i].getStatus()),
currentTimeMillis));
}
nodeCacheMap.values().forEach(BaseNodeCache::periodicUpdate);
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/LeaderPriorityBalancerTest.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/LeaderPriorityBalancerTest.java
index 99d0e88795d..f3d0e0b3eb6 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/LeaderPriorityBalancerTest.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/priority/LeaderPriorityBalancerTest.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.confignode.manager.load.cache.node.BaseNodeCache;
import
org.apache.iotdb.confignode.manager.load.cache.node.DataNodeHeartbeatCache;
import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.junit.Assert;
import org.junit.Test;
@@ -67,7 +67,7 @@ public class LeaderPriorityBalancerTest {
.get(i)
.cacheHeartbeatSample(
new NodeHeartbeatSample(
- new THeartbeatResp(currentTimeMillis,
NodeStatus.Running.getStatus()),
+ new TDataNodeHeartbeatResp(currentTimeMillis,
NodeStatus.Running.getStatus()),
currentTimeMillis));
}
}
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/cache/NodeCacheTest.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/cache/NodeCacheTest.java
index b51fe0fdde1..94d6c33d05e 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/cache/NodeCacheTest.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/cache/NodeCacheTest.java
@@ -22,7 +22,7 @@ import org.apache.iotdb.commons.cluster.NodeStatus;
import
org.apache.iotdb.confignode.manager.load.cache.node.ConfigNodeHeartbeatCache;
import
org.apache.iotdb.confignode.manager.load.cache.node.DataNodeHeartbeatCache;
import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.junit.Assert;
import org.junit.Test;
@@ -41,7 +41,7 @@ public class NodeCacheTest {
long currentTime = System.currentTimeMillis() - 2000;
dataNodeHeartbeatCache.forceUpdate(
new NodeHeartbeatSample(
- new THeartbeatResp(currentTime, NodeStatus.Running.getStatus()),
currentTime));
+ new TDataNodeHeartbeatResp(currentTime,
NodeStatus.Running.getStatus()), currentTime));
Assert.assertEquals(NodeStatus.Running,
dataNodeHeartbeatCache.getNodeStatus());
Assert.assertEquals(0, dataNodeHeartbeatCache.getLoadScore());
@@ -49,7 +49,7 @@ public class NodeCacheTest {
currentTime += 2000;
dataNodeHeartbeatCache.forceUpdate(
new NodeHeartbeatSample(
- new THeartbeatResp(currentTime, NodeStatus.ReadOnly.getStatus()),
currentTime));
+ new TDataNodeHeartbeatResp(currentTime,
NodeStatus.ReadOnly.getStatus()), currentTime));
Assert.assertEquals(NodeStatus.ReadOnly,
dataNodeHeartbeatCache.getNodeStatus());
Assert.assertEquals(Long.MAX_VALUE, dataNodeHeartbeatCache.getLoadScore());
}
@@ -61,7 +61,7 @@ public class NodeCacheTest {
long currentTime = System.currentTimeMillis();
dataNodeHeartbeatCache.cacheHeartbeatSample(
new NodeHeartbeatSample(
- new THeartbeatResp(currentTime, NodeStatus.Running.getStatus()),
currentTime));
+ new TDataNodeHeartbeatResp(currentTime,
NodeStatus.Running.getStatus()), currentTime));
Assert.assertTrue(dataNodeHeartbeatCache.periodicUpdate());
Assert.assertEquals(NodeStatus.Running,
dataNodeHeartbeatCache.getNodeStatus());
Assert.assertEquals(0, dataNodeHeartbeatCache.getLoadScore());
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeTaskAgent.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeTaskAgent.java
index bd26b0a0fe4..1ab5eb7cc81 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeTaskAgent.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeTaskAgent.java
@@ -38,7 +38,7 @@ import org.apache.iotdb.db.pipe.task.PipeTask;
import org.apache.iotdb.db.pipe.task.PipeTaskBuilder;
import org.apache.iotdb.db.pipe.task.PipeTaskManager;
import org.apache.iotdb.db.utils.DateTimeUtils;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatReq;
import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatResp;
import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaRespExceptionMessage;
@@ -856,7 +856,7 @@ public class PipeTaskAgent {
///////////////////////// Heartbeat /////////////////////////
- public synchronized void collectPipeMetaList(THeartbeatResp resp) throws
TException {
+ public synchronized void collectPipeMetaList(TDataNodeHeartbeatResp resp)
throws TException {
// Try the lock instead of directly acquire it to prevent the block of the
cluster heartbeat
// 10s is the half of the HEARTBEAT_TIMEOUT_TIME defined in class
BaseNodeCache in ConfigNode
if (!tryReadLockWithTimeOut(10)) {
@@ -869,7 +869,7 @@ public class PipeTaskAgent {
}
}
- private void collectPipeMetaListInternal(THeartbeatResp resp) throws
TException {
+ private void collectPipeMetaListInternal(TDataNodeHeartbeatResp resp) throws
TException {
// Do nothing if data node is removing or removed, or request does not
need pipe meta list
if (PipeAgent.runtime().isShutdown()) {
return;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java
index 9be8f8b3336..237575913b9 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -149,6 +149,8 @@ import org.apache.iotdb.mpp.rpc.thrift.TCreatePeerReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreatePipePluginInstanceReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreateSchemaRegionReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreateTriggerInstanceReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.apache.iotdb.mpp.rpc.thrift.TDeactivateTemplateReq;
import org.apache.iotdb.mpp.rpc.thrift.TDeleteDataForDeleteSchemaReq;
import org.apache.iotdb.mpp.rpc.thrift.TDeleteTimeSeriesReq;
@@ -164,8 +166,6 @@ import
org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListResp;
import org.apache.iotdb.mpp.rpc.thrift.TFireTriggerReq;
import org.apache.iotdb.mpp.rpc.thrift.TFireTriggerResp;
import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceInfoResp;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatReq;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
import org.apache.iotdb.mpp.rpc.thrift.TInactiveTriggerInstanceReq;
import org.apache.iotdb.mpp.rpc.thrift.TInvalidateCacheReq;
import org.apache.iotdb.mpp.rpc.thrift.TInvalidateMatchedSchemaCacheReq;
@@ -1119,8 +1119,8 @@ public class DataNodeInternalRPCServiceImpl implements
IDataNodeRPCService.Iface
}
@Override
- public THeartbeatResp getDataNodeHeartBeat(THeartbeatReq req) throws
TException {
- THeartbeatResp resp = new THeartbeatResp();
+ public TDataNodeHeartbeatResp getDataNodeHeartBeat(TDataNodeHeartbeatReq
req) throws TException {
+ TDataNodeHeartbeatResp resp = new TDataNodeHeartbeatResp();
// Judging leader if necessary
if (req.isNeedJudgeLeader()) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
index 6efd0b2d23b..a8a12431cf5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
@@ -44,8 +44,8 @@ import
org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionParams;
import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionLoader;
import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionParams;
import org.apache.iotdb.db.schemaengine.template.ClusterTemplateManager;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatReq;
-import org.apache.iotdb.mpp.rpc.thrift.THeartbeatResp;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatResp;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -379,7 +379,7 @@ public class SchemaEngine {
* @param req heartbeat request
* @param resp heartbeat response
*/
- public void updateAndFillSchemaCountMap(THeartbeatReq req, THeartbeatResp
resp) {
+ public void updateAndFillSchemaCountMap(TDataNodeHeartbeatReq req,
TDataNodeHeartbeatResp resp) {
// update DataNodeSchemaQuotaManager
schemaQuotaManager.updateRemain(
req.getTimeSeriesQuotaRemain(),
diff --git a/iotdb-protocol/thrift-datanode/src/main/thrift/datanode.thrift
b/iotdb-protocol/thrift-datanode/src/main/thrift/datanode.thrift
index c3333fe4d1c..8a73d64e0c3 100644
--- a/iotdb-protocol/thrift-datanode/src/main/thrift/datanode.thrift
+++ b/iotdb-protocol/thrift-datanode/src/main/thrift/datanode.thrift
@@ -240,7 +240,7 @@ struct TInvalidatePermissionCacheReq {
2: required string roleName
}
-struct THeartbeatReq {
+struct TDataNodeHeartbeatReq {
1: required i64 heartbeatTimestamp
2: required bool needJudgeLeader
3: required bool needSamplingLoad
@@ -259,7 +259,7 @@ struct TDataNodeActivation {
3: required i64 sensorNumRemain
}
-struct THeartbeatResp {
+struct TDataNodeHeartbeatResp {
1: required i64 heartbeatTimestamp
2: required string status
3: optional string statusReason
@@ -569,9 +569,9 @@ service IDataNodeRPCService {
/**
* ConfigNode will ask DataNode for heartbeat in every few seconds.
*
- * @param ConfigNode will send the latest config_node_list and load balancing
policies in THeartbeatReq
+ * @param ConfigNode will send the latest config_node_list and load balancing
policies in TDataNodeHeartbeatReq
**/
- THeartbeatResp getDataNodeHeartBeat(THeartbeatReq req)
+ TDataNodeHeartbeatResp getDataNodeHeartBeat(TDataNodeHeartbeatReq req)
/**
* ConfigNode will ask DataNode to update region cache
