This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch object_type in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7d6fcfde35bb45c5e3d69830c2bd9b7db8115294 Merge: cb9ea5056b6 e6bc39f4da5 Author: JackieTien97 <[email protected]> AuthorDate: Fri Jul 11 14:05:21 2025 +0800 resolve conflicts RELEASE_NOTES.md | 22 +++++ .../confignode/it/IoTDBConfigNodeSnapshot2IT.java | 47 ++++++++++ .../confignode/it/IoTDBConfigNodeSnapshotIT.java | 5 +- .../db/it/IoTDBMultiTAGsWithAttributesTableIT.java | 8 +- .../view/recent/IoTDBNullValueTableViewIT.java | 14 ++- iotdb-core/ainode/ainode/core/config.py | 3 +- iotdb-core/ainode/ainode/core/constant.py | 3 + iotdb-core/ainode/ainode/core/exception.py | 5 + iotdb-core/ainode/ainode/core/handler.py | 5 +- .../ainode/core/manager/inference_manager.py | 8 +- .../ainode/ainode/core/manager/model_manager.py | 9 +- .../ainode/core/model/built_in_model_factory.py | 2 +- .../ainode/ainode/core/model/model_storage.py | 103 +++++++++++++++------ .../core/model/sundial/ts_generation_mixin.py | 5 + .../rpc/DataNodeAsyncRequestRPCHandler.java | 2 +- .../handlers/rpc/PipeHeartbeatRPCHandler.java | 2 +- .../iotdb/confignode/manager/ConfigManager.java | 18 ++++ .../apache/iotdb/confignode/manager/IManager.java | 3 + .../iotdb/confignode/manager/ModelManager.java | 7 +- .../pipe/agent/task/PipeConfigNodeTaskAgent.java | 22 ++--- .../runtime/heartbeat/PipeHeartbeatScheduler.java | 2 +- .../iotdb/confignode/persistence/TriggerInfo.java | 3 - .../iotdb/confignode/persistence/UDFInfo.java | 3 - .../procedure/impl/model/DropModelProcedure.java | 57 ++++++------ .../thrift/ConfigNodeRPCServiceProcessor.java | 6 ++ .../db/pipe/agent/task/PipeDataNodeTaskAgent.java | 85 +++++++++++------ .../subtask/processor/PipeProcessorSubtask.java | 4 +- .../async/IoTDBDataRegionAsyncConnector.java | 2 +- .../event/common/heartbeat/PipeHeartbeatEvent.java | 6 +- .../statement/PipeStatementInsertionEvent.java | 6 +- .../tablet/PipeInsertNodeTabletInsertionEvent.java | 6 +- .../common/tablet/PipeRawTabletInsertionEvent.java | 6 +- .../common/tsfile/PipeTsFileInsertionEvent.java | 6 +- .../dataregion/IoTDBDataRegionExtractor.java | 4 +- .../PipeRealtimeDataRegionHybridExtractor.java | 5 +- .../schemaregion/IoTDBSchemaRegionExtractor.java | 4 +- .../iotdb/db/pipe/metric/PipeDataNodeMetrics.java | 6 +- .../PipeDataNodeRemainingEventAndTimeOperator.java | 18 +++- ...ics.java => PipeDataNodeSinglePipeMetrics.java} | 15 ++- .../iotdb/db/protocol/client/ConfigNodeClient.java | 8 ++ .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../execution/exchange/SharedTsBlockQueue.java | 2 +- .../queryengine/execution/exchange/sink/ISink.java | 4 +- .../execution/exchange/sink/LocalSinkChannel.java | 14 +-- .../execution/exchange/sink/ShuffleSinkHandle.java | 40 +++++--- .../execution/exchange/sink/SinkChannel.java | 10 +- .../fragment/FragmentInstanceExecution.java | 44 +++++++-- .../AbstractSeriesAggregationScanOperator.java | 70 ++++++++++---- .../source/AbstractSeriesScanOperator.java | 46 ++++++--- .../execution/operator/source/SeriesScanUtil.java | 73 +++++++++++---- .../relational/AbstractAggTableScanOperator.java | 75 ++++++++++----- .../AbstractDefaultAggTableScanOperator.java | 4 +- .../relational/AbstractMergeSortJoinOperator.java | 14 +++ .../relational/AbstractTableScanOperator.java | 16 +++- .../InformationSchemaContentSupplierFactory.java | 4 +- .../relational/LastQueryAggTableScanOperator.java | 4 +- .../execution/config/sys/pipe/ShowPipeTask.java | 4 +- .../plan/relational/planner/QueryPlanner.java | 2 +- .../metadata/view/CreateLogicalViewStatement.java | 13 ++- .../iotdb/db/service/DataNodeShutdownHook.java | 36 ++++++- .../utils/reader/SeriesDataBlockReader.java | 20 +++- .../apache/iotdb/db/utils/ErrorHandlingUtils.java | 3 +- .../iotdb/db/utils/sort/FileSpillerReader.java | 4 +- .../queryengine/execution/exchange/StubSink.java | 6 +- .../process/TableStreamSortOperatorTest.java | 11 +-- .../AlignedSeriesScanLimitOffsetPushDownTest.java | 97 +++++++++---------- .../AlignedSeriesScanPredicatePushDownTest.java | 47 +++++----- ...gleColumnSeriesScanLimitOffsetPushDownTest.java | 48 +++++----- .../read/reader/series/SeriesReaderTestUtil.java | 17 ++++ .../series/SeriesScanLimitOffsetPushDownTest.java | 60 ++++++------ .../series/SeriesScanPredicatePushDownTest.java | 40 ++++---- .../iotdb/commons/client/ainode/AINodeClient.java | 5 +- .../apache/iotdb/commons/conf/CommonConfig.java | 24 ++++- .../commons/pipe/agent/task/PipeTaskAgent.java | 2 +- .../iotdb/commons/pipe/config/PipeConfig.java | 7 +- .../iotdb/commons/pipe/config/PipeDescriptor.java | 7 +- .../commons/pipe/resource/log/PipeLogManager.java | 2 +- .../commons/pipe/resource/log/PipeLogStatus.java | 4 +- .../apache/iotdb/commons/utils/StatusUtils.java | 1 - iotdb-doap.rdf | 8 ++ .../thrift-ainode/src/main/thrift/ainode.thrift | 6 +- .../thrift-commons/src/main/thrift/common.thrift | 7 ++ .../src/main/thrift/confignode.thrift | 3 + .../src/main/thrift/datanode.thrift | 9 +- 84 files changed, 990 insertions(+), 470 deletions(-)
