You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2025/05/26 03:57:50 UTC
(iotdb) 02/03: Merge remote-tracking branch 'origin/master' into queryStuckCausedByStop
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch queryStuckCausedByStop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 31c6d89f90468d9706fb11bbf61a30dc3f42b2db
Merge: d37a689c524 d3099ff1eb8
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon May 26 11:56:13 2025 +0800
Merge remote-tracking branch 'origin/master' into queryStuckCausedByStop
.../service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
.../iotdb/db/pipe/resource/memory/InsertNodeMemoryEstimator.java | 4 ++++
.../plan/planner/plan/AbstractFragmentParallelPlanner.java | 5 ++++-
.../relational/metadata/fetcher/cache/TreeDeviceNormalSchema.java | 2 +-
.../src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java | 3 ++-
5 files changed, 12 insertions(+), 3 deletions(-)