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/15 10:09:35 UTC
(iotdb) branch DefaultOrderByTime updated (b66e770e4e0 -> 9f659941bd9)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch DefaultOrderByTime
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from b66e770e4e0 temp save
add b18808abc92 IoTV2: Close receiver's executor to prevent request stuck when stopping dn (#15505)
add ed27d055866 [AINode] Support multi-column as input in built-in model inference
add 59c46cf4f86 Pipe: Fixed the bug that sorter may use wrong value when there are duplicated timestamps & Refactor (#15488)
add 06ccdd163d0 Load: fix memory leak when failed in 2nd phase (#15503)
new 9f659941bd9 resolve conflicts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ainode/core/manager/inference_manager.py | 4 +-
.../request/PipeTransferTabletRawReqV2.java | 2 +-
.../connector/protocol/opcua/OpcUaNameSpace.java | 2 +-
.../sorter/PipeTableModelTabletEventSorter.java | 142 +++++---------------
.../util/sorter/PipeTabletEventSorter.java | 146 +++++++++++++++------
.../sorter/PipeTreeModelTabletEventSorter.java | 60 +++------
.../pipeconsensus/PipeConsensusReceiver.java | 7 +
.../pipeconsensus/PipeConsensusReceiverAgent.java | 13 ++
.../protocol/thrift/IoTDBDataNodeReceiver.java | 6 +-
.../plan/scheduler/load/LoadTsFileScheduler.java | 14 +-
.../iotdb/db/service/DataNodeShutdownHook.java | 4 +
.../pipe/connector/PipeTabletEventSorterTest.java | 72 +++++-----
.../pipe/datastructure/pattern/TablePattern.java | 4 +-
13 files changed, 232 insertions(+), 244 deletions(-)
(iotdb) 01/01: resolve conflicts
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch DefaultOrderByTime
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9f659941bd9d9fe5ff93fdcbb5fc0f5f91753f29
Merge: b66e770e4e0 06ccdd163d0
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu May 15 18:09:24 2025 +0800
resolve conflicts
.../ainode/core/manager/inference_manager.py | 4 +-
.../request/PipeTransferTabletRawReqV2.java | 2 +-
.../connector/protocol/opcua/OpcUaNameSpace.java | 2 +-
.../sorter/PipeTableModelTabletEventSorter.java | 142 +++++---------------
.../util/sorter/PipeTabletEventSorter.java | 146 +++++++++++++++------
.../sorter/PipeTreeModelTabletEventSorter.java | 60 +++------
.../pipeconsensus/PipeConsensusReceiver.java | 7 +
.../pipeconsensus/PipeConsensusReceiverAgent.java | 13 ++
.../protocol/thrift/IoTDBDataNodeReceiver.java | 6 +-
.../plan/scheduler/load/LoadTsFileScheduler.java | 14 +-
.../iotdb/db/service/DataNodeShutdownHook.java | 4 +
.../pipe/connector/PipeTabletEventSorterTest.java | 72 +++++-----
.../pipe/datastructure/pattern/TablePattern.java | 4 +-
13 files changed, 232 insertions(+), 244 deletions(-)