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 <[email protected]> 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(-)
