This is an automated email from the ASF dual-hosted git repository.
yongzao 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 40b2b33964e [AINode] Fix bugs for SHOW LOADED MODELS (#16410)
40b2b33964e is described below
commit 40b2b33964e647f3bbcce4d5bc05fc6df2ed7653
Author: Yongzao <[email protected]>
AuthorDate: Sat Sep 13 19:46:18 2025 +0800
[AINode] Fix bugs for SHOW LOADED MODELS (#16410)
---
iotdb-core/ainode/iotdb/ainode/core/constant.py | 6 +--
iotdb-core/ainode/poetry.lock | 51 +---------------------
iotdb-core/ainode/pyproject.toml | 3 --
.../config/executor/ClusterConfigTaskExecutor.java | 2 +
.../thrift-ainode/src/main/thrift/ainode.thrift | 2 +-
.../src/main/thrift/confignode.thrift | 2 +-
6 files changed, 8 insertions(+), 58 deletions(-)
diff --git a/iotdb-core/ainode/iotdb/ainode/core/constant.py
b/iotdb-core/ainode/iotdb/ainode/core/constant.py
index 744c3e74976..f4547e99803 100644
--- a/iotdb-core/ainode/iotdb/ainode/core/constant.py
+++ b/iotdb-core/ainode/iotdb/ainode/core/constant.py
@@ -35,11 +35,11 @@ AINODE_SYSTEM_FILE_NAME = "system.properties"
# AINode cluster configuration
AINODE_CLUSTER_NAME = "defaultCluster"
-AINODE_TARGET_CONFIG_NODE_LIST = TEndPoint("127.0.0.1", 10910)
+AINODE_TARGET_CONFIG_NODE_LIST = TEndPoint("127.0.0.1", 10710)
AINODE_RPC_ADDRESS = "127.0.0.1"
-AINODE_RPC_PORT = 20810
+AINODE_RPC_PORT = 10810
AINODE_CLUSTER_INGRESS_ADDRESS = "127.0.0.1"
-AINODE_CLUSTER_INGRESS_PORT = 9667
+AINODE_CLUSTER_INGRESS_PORT = 6667
AINODE_CLUSTER_INGRESS_USERNAME = "root"
AINODE_CLUSTER_INGRESS_PASSWORD = "root"
AINODE_CLUSTER_INGRESS_TIME_ZONE = "UTC+8"
diff --git a/iotdb-core/ainode/poetry.lock b/iotdb-core/ainode/poetry.lock
index ee4750470ff..1cae5ebb469 100644
--- a/iotdb-core/ainode/poetry.lock
+++ b/iotdb-core/ainode/poetry.lock
@@ -20,26 +20,6 @@ typing-extensions = ">=4"
[package.extras]
tz = ["backports.zoneinfo ; python_version < \"3.9\""]
-[[package]]
-name = "apache-iotdb"
-version = "2.0.5"
-description = "Apache IoTDB client API"
-optional = false
-python-versions = ">=3.6"
-groups = ["main"]
-files = [
- {file = "apache_iotdb-2.0.5-py3-none-any.whl", hash =
"sha256:620f46dcc0db46b34969eaca3b56bb1513174f60867856cc99e50605324f0c73"},
- {file = "apache_iotdb-2.0.5.tar.gz", hash =
"sha256:f8facc1d83e40314bd0dcb1a47819f4c38ff33634413340602c9afc965028a38"},
-]
-
-[package.dependencies]
-numpy = ">=1.0.0"
-pandas = ">=1.0.0"
-sqlalchemy = ">=1.4"
-sqlalchemy-utils = ">=0.37.8"
-thrift = ">=0.14.1"
-tzlocal = ">=4.0"
-
[[package]]
name = "black"
version = "25.1.0"
@@ -1743,35 +1723,6 @@ postgresql-psycopgbinary = ["psycopg[binary] (>=3.0.7)"]
pymysql = ["pymysql"]
sqlcipher = ["sqlcipher3_binary"]
-[[package]]
-name = "sqlalchemy-utils"
-version = "0.42.0"
-description = "Various utility functions for SQLAlchemy."
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
- {file = "sqlalchemy_utils-0.42.0-py3-none-any.whl", hash =
"sha256:c8c0b7f00f4734f6f20e9a4d06b39d79d58c8629cba50924fcaeb20e28eb4f48"},
- {file = "sqlalchemy_utils-0.42.0.tar.gz", hash =
"sha256:6d1ecd3eed8b941f0faf8a531f5d5cee7cffa2598fcf8163de8c31c7a417a5e0"},
-]
-
-[package.dependencies]
-SQLAlchemy = ">=1.4"
-
-[package.extras]
-arrow = ["arrow (>=0.3.4)"]
-babel = ["Babel (>=1.3)"]
-color = ["colour (>=0.0.4)"]
-encrypted = ["cryptography (>=0.6)"]
-intervals = ["intervals (>=0.7.1)"]
-password = ["passlib (>=1.6,<2.0)"]
-pendulum = ["pendulum (>=2.0.5)"]
-phone = ["phonenumbers (>=5.9.2)"]
-test = ["Jinja2 (>=2.3)", "Pygments (>=1.2)", "docutils (>=0.10)", "flake8
(>=2.4.0)", "flexmock (>=0.9.7)", "isort (>=4.2.2)", "pg8000 (>=1.12.4)",
"psycopg (>=3.1.8)", "psycopg2 (>=2.5.1)", "psycopg2cffi (>=2.8.1)", "pymysql",
"pyodbc", "pytest (==7.4.4)", "python-dateutil (>=2.6)", "pytz (>=2014.2)"]
-test-all = ["Babel (>=1.3)", "Jinja2 (>=2.3)", "Pygments (>=1.2)", "arrow
(>=0.3.4)", "colour (>=0.0.4)", "cryptography (>=0.6)", "docutils (>=0.10)",
"flake8 (>=2.4.0)", "flexmock (>=0.9.7)", "furl (>=0.4.1)", "intervals
(>=0.7.1)", "isort (>=4.2.2)", "passlib (>=1.6,<2.0)", "pendulum (>=2.0.5)",
"pg8000 (>=1.12.4)", "phonenumbers (>=5.9.2)", "psycopg (>=3.1.8)", "psycopg2
(>=2.5.1)", "psycopg2cffi (>=2.8.1)", "pymysql", "pyodbc", "pytest (==7.4.4)",
"python-dateutil", "python-dateutil [...]
-timezone = ["python-dateutil"]
-url = ["furl (>=0.4.1)"]
-
[[package]]
name = "statsmodels"
version = "0.14.5"
@@ -2259,4 +2210,4 @@ zstd = ["zstandard (>=0.18.0)"]
[metadata]
lock-version = "2.1"
python-versions = ">=3.11,<=3.13.5"
-content-hash =
"8d31dadf57a2134038a78bf1918523e0c777c79791abf1b7757897dd80789f54"
+content-hash =
"8d55de66fc1204d82ecb4e7cfecf0b0d1828c9a939ee015e9a28bbd6e2592d28"
diff --git a/iotdb-core/ainode/pyproject.toml b/iotdb-core/ainode/pyproject.toml
index eff9404400d..6bda220fba6 100644
--- a/iotdb-core/ainode/pyproject.toml
+++ b/iotdb-core/ainode/pyproject.toml
@@ -90,9 +90,6 @@ psutil = "^7.0.0"
requests = "^2.32.5"
dynaconf = "^3.2.11"
thrift = ">=0.14.0"
-
-# ---- IoTDB ----
-apache-iotdb = ">=2.0.5"
tzlocal = "^5.3.1"
# ---- HF acceleration ----
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
index 0980a7294c4..cd5ddd30543 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
@@ -3508,6 +3508,8 @@ public class ClusterConfigTaskExecutor implements
IConfigTaskExecutor {
final TShowLoadedModelReq req = new TShowLoadedModelReq();
if (deviceIdList != null) {
req.setDeviceIdList(deviceIdList);
+ } else {
+ req.setDeviceIdList(new ArrayList<>());
}
final TShowLoadedModelResp resp = client.showLoadedModel(req);
if (resp.getStatus().getCode() !=
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
diff --git a/iotdb-protocol/thrift-ainode/src/main/thrift/ainode.thrift
b/iotdb-protocol/thrift-ainode/src/main/thrift/ainode.thrift
index c53b482ef77..e0680cd29b7 100644
--- a/iotdb-protocol/thrift-ainode/src/main/thrift/ainode.thrift
+++ b/iotdb-protocol/thrift-ainode/src/main/thrift/ainode.thrift
@@ -112,7 +112,7 @@ struct TShowModelsResp {
}
struct TShowLoadedModelsReq {
- 1: optional list<string> deviceIdList
+ 1: required list<string> deviceIdList
}
struct TShowLoadedModelsResp {
diff --git a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
index c25d7730277..37e5acd02a9 100644
--- a/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/iotdb-protocol/thrift-confignode/src/main/thrift/confignode.thrift
@@ -1073,7 +1073,7 @@ struct TShowModelResp {
}
struct TShowLoadedModelReq {
- 1: optional list<string> deviceIdList
+ 1: required list<string> deviceIdList
}
struct TShowLoadedModelResp {
