Skip to content

[AINode] Update AINodeClient for DataNode to borrow #16647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CRZbulabula merged 14 commits into from
Nov 17, 2025
Merged

[AINode] Update AINodeClient for DataNode to borrow #16647

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
72e766a
[AINode] Update AINodeClient and ClusterConfigTaskExecutor
Alchuang22-dev Oct 23, 2025
81bb272
[AINode] Update ClusterConfigTaskExecutor for datanode to fetch AINod…
Alchuang22-dev Oct 30, 2025
d35b32f
[AINode] Update apis which have modelId
Alchuang22-dev Oct 31, 2025
0fe9f11
revert
Alchuang22-dev Oct 31, 2025
769294f
[AINode] : revert due to IDEA collapse
Alchuang22-dev Oct 31, 2025
ee36498
[AINode] Move ainode cache to AINodeClient
Alchuang22-dev Nov 2, 2025
1f517f0
[AINode] Move loadmodel() method to AINodeClient
Alchuang22-dev Nov 6, 2025
6ba848f
[AINode] Optimize directory of ainode and confignode
Alchuang22-dev Nov 13, 2025
d579c34
[AINode] Revert to master branch
Alchuang22-dev Nov 14, 2025
18cb394
[AINode] Revert ClientPoolFactory
Alchuang22-dev Nov 15, 2025
f8f0d54
[AINode] Refix AINodeClientManager
Alchuang22-dev Nov 16, 2025
892b603
[AINode] Revert Poetry.lock and apply spotless
Alchuang22-dev Nov 16, 2025
d320fcb
[AINode] Revert Poetry.lock
Alchuang22-dev Nov 16, 2025
c967ddf
[AINode] Simplify getAINodeLocation()
Alchuang22-dev Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
Expand All @@ -35,6 +34,7 @@
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.isession.ISession;
import org.apache.iotdb.isession.ITableSession;
import org.apache.iotdb.isession.SessionConfig;
Expand Down Expand Up @@ -181,7 +181,7 @@ protected void initEnvironment(

clientManager =
new IClientManager.Factory<TEndPoint, SyncConfigNodeIServiceClient>()
.createClientManager(new ClientPoolFactory.SyncConfigNodeIServiceClientPoolFactory());
.createClientManager(new ConfigNodeClientManager.ClientPoolFactory.SyncConfigNodeIServiceClientPoolFactory());

final String testClassName = getTestClassName();

Expand Down
4 changes: 2 additions & 2 deletions integration-test/src/main/java/org/apache/iotdb/it/env/remote/env/RemoteServerEnv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
package org.apache.iotdb.it.env.remote.env;

import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.isession.ISession;
import org.apache.iotdb.isession.ITableSession;
import org.apache.iotdb.isession.SessionConfig;
Expand Down Expand Up @@ -84,7 +84,7 @@ public void initClusterEnvironment() {
}
clientManager =
new IClientManager.Factory<TEndPoint, SyncConfigNodeIServiceClient>()
.createClientManager(new ClientPoolFactory.SyncConfigNodeIServiceClientPoolFactory());
.createClientManager(new ConfigNodeClientManager.ClientPoolFactory.SyncConfigNodeIServiceClientPoolFactory());
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions iotdb-core/ainode/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions ...rc/main/java/org/apache/iotdb/confignode/client/async/AsyncAINodeHeartbeatClientPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

import org.apache.iotdb.ainode.rpc.thrift.TAIHeartbeatReq;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.ainode.AsyncAINodeServiceClient;
import org.apache.iotdb.confignode.client.async.handlers.heartbeat.AINodeHeartbeatHandler;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.db.protocol.client.ainode.AsyncAINodeServiceClient;

public class AsyncAINodeHeartbeatClientPool {

Expand All @@ -34,7 +34,8 @@ private AsyncAINodeHeartbeatClientPool() {
clientManager =
new IClientManager.Factory<TEndPoint, AsyncAINodeServiceClient>()
.createClientManager(
new ClientPoolFactory.AsyncAINodeHeartbeatServiceClientPoolFactory());
new ConfigNodeClientManager.ClientPoolFactory
.AsyncAINodeHeartbeatServiceClientPoolFactory());
}

public void getAINodeHeartBeat(
Expand Down
5 changes: 3 additions & 2 deletions ...ain/java/org/apache/iotdb/confignode/client/async/AsyncConfigNodeHeartbeatClientPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
package org.apache.iotdb.confignode.client.async;

import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.async.AsyncConfigNodeInternalServiceClient;
import org.apache.iotdb.confignode.client.async.handlers.heartbeat.ConfigNodeHeartbeatHandler;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeHeartbeatReq;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;

public class AsyncConfigNodeHeartbeatClientPool {

Expand All @@ -34,7 +34,8 @@ private AsyncConfigNodeHeartbeatClientPool() {
clientManager =
new IClientManager.Factory<TEndPoint, AsyncConfigNodeInternalServiceClient>()
.createClientManager(
new ClientPoolFactory.AsyncConfigNodeHeartbeatServiceClientPoolFactory());
new ConfigNodeClientManager.ClientPoolFactory
.AsyncConfigNodeHeartbeatServiceClientPoolFactory());
}

/**
Expand Down
5 changes: 3 additions & 2 deletions .../main/java/org/apache/iotdb/confignode/client/async/AsyncDataNodeHeartbeatClientPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
package org.apache.iotdb.confignode.client.async;

import org.apache.iotdb.common.rpc.thrift.TEndPoint;
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.audit.DataNodeWriteAuditLogHandler;
import org.apache.iotdb.confignode.client.async.handlers.heartbeat.DataNodeHeartbeatHandler;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.mpp.rpc.thrift.TAuditLogReq;
import org.apache.iotdb.mpp.rpc.thrift.TDataNodeHeartbeatReq;

Expand All @@ -37,7 +37,8 @@ private AsyncDataNodeHeartbeatClientPool() {
clientManager =
new IClientManager.Factory<TEndPoint, AsyncDataNodeInternalServiceClient>()
.createClientManager(
new ClientPoolFactory.AsyncDataNodeHeartbeatServiceClientPoolFactory());
new ConfigNodeClientManager.ClientPoolFactory
.AsyncDataNodeHeartbeatServiceClientPoolFactory());
}

/**
Expand Down
6 changes: 4 additions & 2 deletions ...gnode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncConfigNodeClientPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
import org.apache.iotdb.common.rpc.thrift.TNodeLocations;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.common.rpc.thrift.TSetConfigurationReq;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.confignode.client.CnToCnNodeRequestType;
import org.apache.iotdb.confignode.rpc.thrift.TAddConsensusGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRegisterReq;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;

Expand All @@ -54,7 +54,9 @@ public class SyncConfigNodeClientPool {
private SyncConfigNodeClientPool() {
clientManager =
new IClientManager.Factory<TEndPoint, SyncConfigNodeIServiceClient>()
.createClientManager(new ClientPoolFactory.SyncConfigNodeIServiceClientPoolFactory());
.createClientManager(
new ConfigNodeClientManager.ClientPoolFactory
.SyncConfigNodeIServiceClientPoolFactory());
configNodeLeader = new TEndPoint();
}

Expand Down
5 changes: 3 additions & 2 deletions ...fignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.ClientPoolFactory;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
import org.apache.iotdb.commons.exception.UncheckedStartupException;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.mpp.rpc.thrift.TCleanDataNodeCacheReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreateDataRegionReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreatePeerReq;
Expand Down Expand Up @@ -73,7 +73,8 @@ private SyncDataNodeClientPool() {
clientManager =
new IClientManager.Factory<TEndPoint, SyncDataNodeInternalServiceClient>()
.createClientManager(
new ClientPoolFactory.SyncDataNodeInternalServiceClientPoolFactory());
new ConfigNodeClientManager.ClientPoolFactory
.SyncDataNodeInternalServiceClientPoolFactory());
buildActionMap();
checkActionMapCompleteness();
}
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/apache/iotdb/confignode/consensus/request/read/model/ShowModelPlan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

package org.apache.iotdb.confignode.consensus.request.read.model;

import org.apache.iotdb.ainode.rpc.thrift.TShowModelsReq;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
import org.apache.iotdb.confignode.consensus.request.read.ConfigPhysicalReadPlan;
import org.apache.iotdb.confignode.rpc.thrift.TShowModelReq;

import java.util.Objects;

Expand All @@ -33,7 +33,7 @@ public ShowModelPlan() {
super(ConfigPhysicalPlanType.ShowModel);
}

public ShowModelPlan(final TShowModelReq showModelReq) {
public ShowModelPlan(final TShowModelsReq showModelReq) {
super(ConfigPhysicalPlanType.ShowModel);
if (showModelReq.isSetModelId()) {
this.modelName = showModelReq.getModelId();
Expand Down
Loading
Loading