This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new b2a2462c9c4 [To dev/1.3] cpp session query timeout (#17403)
b2a2462c9c4 is described below
commit b2a2462c9c4629cbc0797fcfa472f9af2894dd79
Author: Hongzhi Gao <[email protected]>
AuthorDate: Tue Mar 31 18:26:04 2026 +0800
[To dev/1.3] cpp session query timeout (#17403)
Co-authored-by: Haonan <[email protected]>
---
.github/workflows/multi-language-client.yml | 6 +++---
docker/src/main/Dockerfile-1c1d | 4 +---
iotdb-client/client-cpp/src/main/IoTDBRpcDataSet.cpp | 1 +
iotdb-client/client-cpp/src/main/SessionConnection.cpp | 2 +-
iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py | 12 +++++++++---
iotdb-client/client-py/tests/integration/test_todf.py | 2 +-
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/multi-language-client.yml
b/.github/workflows/multi-language-client.yml
index b1374ae2795..a1fc44af61c 100644
--- a/.github/workflows/multi-language-client.yml
+++ b/.github/workflows/multi-language-client.yml
@@ -46,7 +46,7 @@ jobs:
fail-fast: false
max-parallel: 15
matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
+ os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os}}
steps:
@@ -120,7 +120,7 @@ jobs:
cd iotdb-client
git clone https://github.com/apache/iotdb-client-go.git
cd iotdb-client-go
- git checkout rc/1.3.3
+ git checkout dev/1.3
make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo
python:
@@ -128,7 +128,7 @@ jobs:
fail-fast: false
max-parallel: 15
matrix:
- python: [ '3.6', '3.x' ]
+ python: [ '3.x' ]
runs-on: ${{ (matrix.python == '3.6' && 'ubuntu-20.04') || 'ubuntu-latest'
}}
steps:
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d
index 996072066b7..4703a86f093 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-1c1d
@@ -34,9 +34,7 @@ RUN apt update \
&& sed -i 's/cn_internal_address=127.0.0.1/cn_internal_address=0.0.0.0/g'
/iotdb/conf/iotdb-system.properties \
&& sed -i
's/cn_seed_config_node=127.0.0.1:10710/cn_seed_config_node=0.0.0.0:10710/g'
/iotdb/conf/iotdb-system.properties \
&& sed -i
's/dn_seed_config_node=127.0.0.1:10710/dn_seed_config_node=0.0.0.0:10710/g'
/iotdb/conf/iotdb-system.properties \
- && sed -i 's/#
config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/config_node_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g'
/iotdb/conf/iotdb-system.properties \
- && sed -i 's/#
schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/schema_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g'
/iotdb/conf/iotdb-system.properties \
- && sed -i 's/#
data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus/data_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g'
/iotdb/conf/iotdb-system.properties \
+ && sed -i 's/dn_rpc_address=127.0.0.1/dn_rpc_address=0.0.0.0/g'
/iotdb/conf/iotdb-system.properties \
&& apt remove unzip -y \
&& apt autoremove -y \
&& apt purge --auto-remove -y \
diff --git a/iotdb-client/client-cpp/src/main/IoTDBRpcDataSet.cpp
b/iotdb-client/client-cpp/src/main/IoTDBRpcDataSet.cpp
index 607f812a88a..237bcb80358 100644
--- a/iotdb-client/client-cpp/src/main/IoTDBRpcDataSet.cpp
+++ b/iotdb-client/client-cpp/src/main/IoTDBRpcDataSet.cpp
@@ -188,6 +188,7 @@ bool IoTDBRpcDataSet::fetchResults() {
TSFetchResultsResp resp;
client_->fetchResultsV2(resp, req);
RpcUtils::verifySuccess(resp.status);
+ moreData_ = resp.moreData;
if (!resp.hasResultSet) {
close();
}
diff --git a/iotdb-client/client-cpp/src/main/SessionConnection.cpp
b/iotdb-client/client-cpp/src/main/SessionConnection.cpp
index e52ccd768a9..14032ae24c0 100644
--- a/iotdb-client/client-cpp/src/main/SessionConnection.cpp
+++ b/iotdb-client/client-cpp/src/main/SessionConnection.cpp
@@ -193,7 +193,7 @@ std::unique_ptr<SessionDataSet>
SessionConnection::executeQueryStatement(const s
return std::unique_ptr<SessionDataSet>(new SessionDataSet(sql,
resp.columns, resp.dataTypeList,
resp.columnNameIndexMap, resp.queryId, statementId,
client,
sessionId, resp.queryResult, resp.ignoreTimeStamp,
-
connectionTimeoutInMs, resp.moreData, fetchSize, zoneId));
+ timeoutInMs,
resp.moreData, fetchSize, zoneId));
}
std::unique_ptr<SessionDataSet> SessionConnection::executeRawDataQuery(const
std::vector<std::string>& paths,
diff --git a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
index 2249e1c7c0d..b68092f6a57 100644
--- a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
+++ b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
@@ -212,7 +212,10 @@ class IoTDBRpcDataSet(object):
data_array = np.array(data_array, dtype=object)
else:
raise RuntimeError("unsupported data type
{}.".format(data_type))
- if data_array.dtype.byteorder == ">":
+ if (
+ isinstance(data_array.dtype, np.dtype)
+ and data_array.dtype.byteorder == ">"
+ ):
data_array = data_array.byteswap().view(
data_array.dtype.newbyteorder("<")
)
@@ -355,7 +358,10 @@ class IoTDBRpcDataSet(object):
data_array = pd.Series(data_array).apply(parse_int_to_date)
else:
raise RuntimeError("unsupported data type
{}.".format(data_type))
- if data_array.dtype.byteorder == ">":
+ if (
+ isinstance(data_array.dtype, np.dtype)
+ and data_array.dtype.byteorder == ">"
+ ):
data_array = data_array.byteswap().view(
data_array.dtype.newbyteorder("<")
)
@@ -382,7 +388,7 @@ class IoTDBRpcDataSet(object):
or data_type == 10
or data_type == 9
):
- tmp_array = np.full(total_length, None,
dtype=data_array.dtype)
+ tmp_array = np.full(total_length, None)
bitmap_buffer = self.__query_data_set.bitmapList[location]
buffer = _to_bitbuffer(bitmap_buffer)
diff --git a/iotdb-client/client-py/tests/integration/test_todf.py
b/iotdb-client/client-py/tests/integration/test_todf.py
index 03e97974776..ca0887d1640 100644
--- a/iotdb-client/client-py/tests/integration/test_todf.py
+++ b/iotdb-client/client-py/tests/integration/test_todf.py
@@ -139,7 +139,7 @@ def test_with_null_query():
tmp_array = np.full(data_nums, np.nan, np.float32)
tmp_array = pd.Series(tmp_array).astype("boolean")
else:
- tmp_array = np.full(data_nums, None, dtype=data[ts_path].dtype)
+ tmp_array = np.full(data_nums, np.nan,
dtype=data[ts_path].dtype)
data_empty[ts_path] = tmp_array
df_input = pd.DataFrame(data_empty)
