This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/mysql-connector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 71e583303c3c0eed618d8870d3b5ba2b89da74d9 Merge: 8aca99dc2b2 5c4c297e63d Author: JackieTien97 <[email protected]> AuthorDate: Fri Jun 27 09:09:51 2025 +0800 fix conflicts .../main/java/org/apache/iotdb/SessionExample.java | 18 +- .../org/apache/iotdb/it/env/cluster/EnvUtils.java | 77 +++- .../it/env/cluster/config/MppDataNodeConfig.java | 12 + .../iotdb/it/env/cluster/env/AbstractEnv.java | 266 +++++++++--- .../it/env/cluster/node/AbstractNodeWrapper.java | 13 +- .../it/env/remote/config/RemoteDataNodeConfig.java | 10 + .../apache/iotdb/itbase/env/DataNodeConfig.java | 4 + .../org/apache/iotdb/ainode/it/AINodeBasicIT.java | 8 +- .../IoTDBRemoveConfigNodeITFramework.java | 2 +- .../IoTDBRemoveDataNodeNormalIT.java | 366 ++++++++++++++++- .../removedatanode/IoTDBRemoveDataNodeUtils.java | 178 ++++++++ ...work.java => IoTDBRemoveUnknownDataNodeIT.java} | 324 +++++++-------- .../confignode/it/utils/ConfigNodeTestUtils.java | 12 + .../iotdb/db/it/IoTDBCustomizedClusterIT.java | 271 +++++++++++++ .../relational/it/db/it/IoTDBWindowFunctionIT.java | 170 +++++++- .../relational/it/db/it/IoTDBWindowTVFIT.java | 175 ++++++++ .../it/query/recent/IoTDBTableAggregationIT.java | 181 ++++++--- .../query/view/recent/IoTDBTableViewQueryIT.java | 5 + ...oTDBTableViewQueryWithNotMatchedDataTypeIT.java | 3 +- .../recent/IoTDBTableViewWithTreeTTLQueryIT.java | 146 +++++++ .../relational/it/schema/IoTDBDatabaseIT.java | 30 +- .../iotdb/relational/it/schema/IoTDBTableIT.java | 72 ++-- .../org/apache/iotdb/session/it/SessionIT.java | 133 ++++-- .../org/apache/iotdb/subscription/it/Retry.java | 19 +- .../apache/iotdb/subscription/it/RetryRule.java | 69 ++++ ...oTDBSnapshotTSPatternDatasetPushConsumerIT.java | 8 + ...IoTDBSnapshotTSPatternTsfilePushConsumerIT.java | 8 + .../multi/IoTDBOneConsumerMultiTopicsTsfileIT.java | 7 + .../api/exception/UDFColumnNotFoundException.java | 15 +- .../api/exception/UDFTypeMismatchException.java | 13 +- .../table/argument/ScalarArgumentChecker.java | 8 + .../java/org/apache/iotdb/udf/api/type/Type.java | 10 + .../org/apache/iotdb/tool/common/Constants.java | 3 +- .../subscription/SubscriptionTableTsFile.java | 2 +- .../subscription/SubscriptionTreeTsFile.java | 2 +- iotdb-client/client-cpp/src/main/Common.h | 15 +- .../client-cpp/src/main/IoTDBRpcDataSet.cpp | 68 ++-- iotdb-client/client-cpp/src/main/IoTDBRpcDataSet.h | 42 +- iotdb-client/client-cpp/src/main/NodesSupplier.cpp | 16 +- .../client-cpp/src/main/SessionDataSet.cpp | 78 ++-- iotdb-client/client-cpp/src/main/SessionDataSet.h | 32 +- iotdb-client/client-cpp/src/test/cpp/sessionIT.cpp | 66 ++- .../src/test/cpp/sessionRelationalIT.cpp | 81 +++- .../java/org/apache/iotdb/isession/ISession.java | 10 +- .../apache/iotdb/isession/pool/ISessionPool.java | 4 + .../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 + .../java/org/apache/iotdb/session/Session.java | 254 ++++++------ .../apache/iotdb/session/SessionConnection.java | 63 ++- .../apache/iotdb/session/TableSessionBuilder.java | 7 +- .../org/apache/iotdb/session/pool/SessionPool.java | 27 ++ .../subscription/AbstractSubscriptionSession.java | 2 +- .../subscription/SubscriptionSessionWrapper.java | 4 +- .../base/AbstractSubscriptionProvider.java | 30 +- .../ainode/ainode/TimerXL/layers/Attn_Bias.py | 108 ----- .../ainode/TimerXL/layers/Attn_Projection.py | 127 ------ iotdb-core/ainode/ainode/TimerXL/layers/Embed.py | 290 -------------- .../ainode/TimerXL/layers/SelfAttention_Family.py | 207 ---------- .../ainode/TimerXL/layers/Transformer_EncDec.py | 329 --------------- .../ainode/ainode/TimerXL/models/timer_xl.py | 446 --------------------- iotdb-core/ainode/ainode/core/config.py | 19 +- iotdb-core/ainode/ainode/core/constant.py | 18 + iotdb-core/ainode/ainode/core/handler.py | 4 + .../ainode/{TimerXL => core/ingress}/__init__.py | 0 iotdb-core/ainode/ainode/core/ingress/dataset.py | 44 ++ iotdb-core/ainode/ainode/core/ingress/iotdb.py | 360 +++++++++++++++++ iotdb-core/ainode/ainode/core/log.py | 6 +- .../ainode/core/manager/inference_manager.py | 26 +- .../ainode/ainode/core/manager/model_manager.py | 58 ++- .../ainode/core/model/built_in_model_factory.py | 74 ++-- .../ainode/ainode/core/model/model_storage.py | 107 +++-- .../ainode/core/model/sundial/modeling_sundial.py | 22 +- .../layers => core/model/timerxl}/__init__.py | 0 .../model/timerxl}/configuration_timer.py | 30 +- .../modeling_timer.py} | 217 +++++----- .../core/model/timerxl/ts_generation_mixin.py | 366 +++++++++++++++++ iotdb-core/ainode/ainode/core/util/cache.py | 88 ++++ iotdb-core/ainode/poetry.lock | 138 ++++--- iotdb-core/ainode/pyproject.toml | 5 +- .../iotdb/confignode/manager/ConfigManager.java | 57 ++- .../iotdb/confignode/manager/ProcedureManager.java | 44 +- .../region/GreedyCopySetRegionGroupAllocator.java | 261 ++++++------ .../pipe/agent/task/PipeConfigNodeSubtask.java | 9 +- .../runtime/heartbeat/PipeHeartbeatParser.java | 2 + .../subscription/SubscriptionCoordinator.java | 3 +- .../iotdb/confignode/persistence/ModelInfo.java | 1 + .../partition/DatabasePartitionTable.java | 10 +- .../persistence/partition/PartitionInfo.java | 2 +- .../persistence/partition/RegionGroup.java | 6 +- .../confignode/persistence/pipe/PipeTaskInfo.java | 7 +- .../impl/node/RemoveDataNodesProcedure.java | 5 +- .../impl/pipe/runtime/PipeMetaSyncProcedure.java | 4 +- .../impl/pipe/task/AlterPipeProcedureV2.java | 16 +- .../impl/pipe/task/CreatePipeProcedureV2.java | 18 +- .../region/NotifyRegionMigrationProcedure.java | 2 +- .../procedure/impl/schema/SchemaUtils.java | 20 +- .../table/AbstractAlterOrDropTableProcedure.java | 23 +- .../impl/schema/table/CreateTableProcedure.java | 8 +- .../impl/schema/table/RenameTableProcedure.java | 6 +- .../iotdb/confignode/service/ConfigNode.java | 12 +- .../confignode/service/ConfigNodeShutdownHook.java | 3 + .../request/ConfigPhysicalPlanSerDeTest.java | 12 +- .../consensus/response/pipe/PipeTableRespTest.java | 6 +- .../GreedyCopySetRemoveNodeReplicaSelectTest.java | 40 +- .../agent/PipeConfigNodeSubtaskExecutorTest.java | 3 +- .../iotdb/confignode/persistence/PipeInfoTest.java | 4 +- .../consensus/iot/IoTConsensusServerImpl.java | 7 +- .../iotdb/consensus/iot/logdispatcher/Batch.java | 17 +- .../consensus/iot/logdispatcher/LogDispatcher.java | 11 +- .../consensus/iot/logdispatcher/SyncStatus.java | 9 +- .../apache/iotdb/consensus/pipe/PipeConsensus.java | 3 +- .../consensus/pipe/PipeConsensusServerImpl.java | 19 +- .../pipe/consensuspipe/ConsensusPipeConnector.java | 4 +- .../consensuspipe/ReplicateProgressManager.java | 2 +- .../pipe/metric/PipeConsensusSyncLagManager.java | 12 +- .../assembly/resources/conf/logback-datanode.xml | 6 +- .../apache/iotdb/db/auth/BasicAuthorityCache.java | 2 +- .../iotdb/db/auth/ClusterAuthorityFetcher.java | 5 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 - .../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 29 +- .../db/pipe/agent/task/PipeDataNodeTaskAgent.java | 24 ++ .../agent/task/connection/PipeEventCollector.java | 31 +- .../subtask/connector/PipeConnectorSubtask.java | 12 +- .../connector/PipeConnectorSubtaskManager.java | 14 + .../PipeRealtimePriorityBlockingQueue.java | 22 +- .../subtask/processor/PipeProcessorSubtask.java | 15 +- .../client/IoTDBDataNodeAsyncClientManager.java | 13 +- .../evolvable/batch/PipeTabletEventBatch.java | 20 +- .../batch/PipeTransferBatchReqBuilder.java | 54 +-- .../airgap/IoTDBDataRegionAirGapConnector.java | 2 +- .../pipeconsensus/PipeConsensusAsyncConnector.java | 41 +- .../handler/PipeConsensusDeleteEventHandler.java | 4 +- .../PipeConsensusTabletInsertionEventHandler.java | 5 +- .../PipeConsensusTsFileInsertionEventHandler.java | 10 +- .../async/IoTDBDataRegionAsyncConnector.java | 95 ++++- .../thrift/sync/IoTDBDataRegionSyncConnector.java | 21 +- .../protocol/websocket/WebSocketConnector.java | 13 +- .../util/builder/PipeTableModelTsFileBuilder.java | 1 + .../builder/PipeTableModelTsFileBuilderV2.java | 53 ++- .../util/builder/PipeTreeModelTsFileBuilder.java | 1 + .../util/builder/PipeTreeModelTsFileBuilderV2.java | 42 +- .../ReplicateProgressDataNodeManager.java | 21 +- .../statement/PipeStatementInsertionEvent.java | 2 +- .../tablet/PipeInsertNodeTabletInsertionEvent.java | 5 +- .../common/tsfile/PipeTsFileInsertionEvent.java | 69 +++- .../event/realtime/PipeRealtimeEventFactory.java | 50 +-- .../dataregion/IoTDBDataRegionExtractor.java | 25 +- ...oricalDataRegionTsFileAndDeletionExtractor.java | 19 +- .../PipeRealtimeDataRegionHybridExtractor.java | 5 + .../realtime/assigner/PipeDataRegionAssigner.java | 18 +- .../listener/PipeInsertionDataNodeListener.java | 11 +- .../PipeDataNodeRemainingEventAndTimeMetrics.java | 83 +++- .../PipeDataNodeRemainingEventAndTimeOperator.java | 48 ++- .../overview/PipeWALInsertNodeCacheMetrics.java | 94 +---- .../processor/aggregate/AggregateProcessor.java | 23 +- .../downsampling/DownSamplingProcessor.java | 25 +- .../pipeconsensus/PipeConsensusReceiver.java | 12 +- .../pipeconsensus/PipeConsensusReceiverAgent.java | 138 ++++--- .../protocol/thrift/IoTDBDataNodeReceiver.java | 63 +-- .../db/pipe/resource/memory/PipeMemoryManager.java | 8 +- .../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 4 +- .../protocol/rest/v2/handler/FastLastHandler.java | 71 ++++ .../rest/v2/handler/RequestValidationHandler.java | 8 + .../protocol/rest/v2/impl/RestApiServiceImpl.java | 230 ++++++++--- .../iotdb/db/protocol/session/SessionManager.java | 14 + .../protocol/thrift/impl/ClientRPCServiceImpl.java | 167 ++++++-- .../impl/DataNodeInternalRPCServiceImpl.java | 10 +- .../queryengine/execution/QueryStateMachine.java | 62 +-- .../execution/driver/DriverContext.java | 6 + .../exchange/source/LocalSourceHandle.java | 13 +- .../fragment/FakedFragmentInstanceContext.java | 106 +++++ .../fragment/FragmentInstanceContext.java | 26 +- .../fragment/FragmentInstanceManager.java | 8 +- .../execution/fragment/QueryContext.java | 2 +- .../execution/operator/EmptyDataOperator.java | 81 ++++ .../process/PatternRecognitionOperator.java | 6 + .../rowpattern/expression/ArithmeticOperator.java | 7 +- .../rowpattern/expression/ComparisonOperator.java | 8 +- .../process/rowpattern/expression/Computation.java | 9 +- .../rowpattern/expression/LogicalOperator.java | 4 +- .../expression/PatternExpressionComputation.java | 3 +- .../process/window/TableWindowOperator.java | 1 - .../window/partition/PartitionExecutor.java | 6 +- .../process/window/partition/frame/RangeFrame.java | 6 +- .../process/window/utils/RowComparator.java | 20 + .../schema/source/TableDeviceQuerySource.java | 23 +- .../execution/operator/source/SeriesScanUtil.java | 24 +- .../relational/AbstractAggTableScanOperator.java | 4 +- .../relational/LastQueryAggTableScanOperator.java | 10 +- .../execution/schedule/task/DriverTaskId.java | 3 +- .../iotdb/db/queryengine/plan/Coordinator.java | 13 + .../db/queryengine/plan/analyze/TypeProvider.java | 8 +- .../cache/schema/dualkeycache/IDualKeyCache.java | 5 + .../schema/dualkeycache/impl/DualKeyCacheImpl.java | 22 + .../plan/analyze/load/LoadTsFileAnalyzer.java | 9 +- .../queryengine/plan/execution/QueryExecution.java | 8 +- .../execution/config/TableConfigTaskVisitor.java | 17 +- .../execution/config/TreeConfigTaskVisitor.java | 1 - .../config/executor/ClusterConfigTaskExecutor.java | 8 +- .../config/executor/IConfigTaskExecutor.java | 4 +- .../config/metadata/ai/CreateTrainingTask.java | 32 +- .../metadata/relational/ShowCreateViewTask.java | 9 +- .../plan/planner/OperatorTreeGenerator.java | 12 +- .../plan/planner/TableOperatorGenerator.java | 91 ++++- .../queryengine/plan/planner/TreeModelPlanner.java | 2 +- .../SimpleFragmentParallelPlanner.java | 1 + .../plan/planner/distribution/SourceRewriter.java | 70 +++- .../memory/FakedMemoryReservationManager.java} | 19 +- .../plan/planner/plan/PlanFragment.java | 9 + .../planner/plan/node/process/AggregationNode.java | 3 +- .../plan/node/process/RawDataAggregationNode.java | 3 +- .../source/AlignedSeriesAggregationScanNode.java | 21 +- .../node/source/SeriesAggregationScanNode.java | 15 +- .../planner/plan/node/write/InsertRowNode.java | 9 +- .../planner/plan/node/write/InsertTabletNode.java | 17 + .../planner/plan/parameter/SeriesScanOptions.java | 46 ++- .../relational/analyzer/ExpressionAnalyzer.java | 24 +- .../relational/analyzer/StatementAnalyzer.java | 18 +- .../function/tvf/ForecastTableFunction.java | 36 +- .../metadata/fetcher/TableDeviceSchemaFetcher.java | 30 +- .../fetcher/TableDeviceSchemaValidator.java | 6 +- .../fetcher/cache/TableDeviceCacheEntry.java | 13 + .../fetcher/cache/TableDeviceSchemaCache.java | 6 + .../relational/metadata/fetcher/cache/TableId.java | 4 +- .../plan/relational/planner/QueryPlanner.java | 42 +- .../relational/planner/TableLogicalPlanner.java | 5 + .../plan/relational/planner/TableModelPlanner.java | 2 +- .../distribute/TableDistributedPlanGenerator.java | 31 +- .../distribute/TableModelQueryFragmentPlanner.java | 1 + .../optimizations/PushPredicateIntoTableScan.java | 3 +- .../planner/optimizations/SortElimination.java | 60 ++- .../optimizations/TransformSortToStreamSort.java | 33 +- .../planner/rowpattern/IrRowPattern.java | 40 +- .../plan/relational/sql/ast/CreateTraining.java | 58 +-- .../plan/relational/sql/ast/Identifier.java | 6 +- .../plan/relational/sql/parser/AstBuilder.java | 65 +-- .../plan/scheduler/ClusterScheduler.java | 11 +- .../scheduler/FixedRateFragInsStateTracker.java | 34 +- .../scheduler/FragmentInstanceDispatcherImpl.java | 108 ++++- .../plan/scheduler/IFragInstanceDispatcher.java | 6 +- .../scheduler/load/LoadTsFileDispatcherImpl.java | 4 +- .../plan/scheduler/load/LoadTsFileScheduler.java | 29 +- .../schemaengine/schemaregion/ISchemaRegion.java | 9 + .../schemaregion/impl/SchemaRegionMemoryImpl.java | 64 +-- .../schemaregion/impl/SchemaRegionPBTreeImpl.java | 10 + .../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 34 ++ .../schemaregion/utils/ResourceByPathUtils.java | 14 +- .../db/schemaengine/table/DataNodeTableCache.java | 42 +- .../iotdb/db/schemaengine/table/ITableCache.java | 10 +- .../java/org/apache/iotdb/db/service/DataNode.java | 13 +- .../iotdb/db/service/DataNodeShutdownHook.java | 36 +- .../db/storageengine/dataregion/DataRegion.java | 3 +- .../execute/utils/CompactionPathUtils.java | 3 +- .../memtable/AlignedWritableMemChunk.java | 13 +- .../dataregion/tsfile/TsFileResourceList.java | 2 +- .../dataregion/utils/TsFileResourceUtils.java | 5 +- .../storageengine/dataregion/wal/WALManager.java | 11 +- .../dataregion/wal/buffer/WALEntry.java | 5 + .../wal/checkpoint/CheckpointManager.java | 4 +- .../dataregion/wal/io/WALInputStream.java | 97 +++-- .../file/AbstractTsFileRecoverPerformer.java | 2 +- .../dataregion/wal/utils/WALEntryPosition.java | 15 +- .../dataregion/wal/utils/WALInsertNodeCache.java | 114 +----- .../dataregion/wal/utils/WALPrintTool.java | 75 ++++ .../agent/SubscriptionBrokerAgent.java | 55 +++ .../broker/SubscriptionPrefetchingQueue.java | 12 +- .../batch/SubscriptionPipeTsFileEventBatch.java | 31 +- .../receiver/SubscriptionReceiverV1.java | 34 ++ .../SchemaRegionSimpleRecoverTest.java | 4 +- ...nAlignedTreeDeviceViewScanOperatorTreeTest.java | 43 +- .../distribution/AggregationAlignByDeviceTest.java | 57 +++ .../plan/relational/analyzer/AnalyzerTest.java | 5 +- .../plan/relational/analyzer/JoinTest.java | 52 +++ .../analyzer/RowPatternRecognitionTest.java | 32 ++ .../plan/relational/analyzer/SubQueryTest.java | 24 ++ .../relational/analyzer/TableFunctionTest.java | 82 ++++ .../plan/relational/analyzer/TreeViewTest.java | 4 +- .../fetcher/cache/TableDeviceSchemaCacheTest.java | 12 +- .../planner/assertions/PlanMatchPattern.java | 4 + .../security/encrypt/MessageDigestEncryptTest.java | 12 +- .../storageengine/dataregion/DataRegionTest.java | 4 +- .../TableModelCompactionWithTTLTest.java | 4 +- .../compaction/utils/CompactionUtilsTest.java | 57 +++ .../dataregion/wal/node/WALEntryHandlerTest.java | 2 +- .../wal/node/WalDeleteOutdatedNewTest.java | 2 +- .../file/UnsealedTsFileRecoverPerformerTest.java | 4 +- .../wal/utils/WALInsertNodeCacheTest.java | 50 +-- .../org/apache/iotdb/metrics/utils/MetricInfo.java | 3 +- .../conf/iotdb-system.properties.template | 2 +- .../commons/auth/authorizer/BasicAuthorizer.java | 42 +- .../apache/iotdb/commons/client/ClientManager.java | 5 + .../iotdb/commons/client/ClientPoolFactory.java | 27 ++ .../iotdb/commons/client/IClientManager.java | 3 + .../iotdb/commons/client/ainode/AINodeClient.java | 4 +- .../commons/concurrent/IoTDBThreadPoolFactory.java | 28 ++ .../iotdb/commons/concurrent/ThreadName.java | 6 +- .../apache/iotdb/commons/conf/CommonConfig.java | 182 ++++++--- .../iotdb/commons/enums/PipeRateAverage.java | 2 + ...utException.java => PortOccupiedException.java} | 13 +- .../commons/exception/QueryTimeoutException.java | 4 + .../org/apache/iotdb/commons/path/PartialPath.java | 12 + .../agent/runtime/PipePeriodicalJobExecutor.java | 33 ++ .../commons/pipe/agent/task/PipeTaskAgent.java | 3 + .../commons/pipe/agent/task/meta/PipeMeta.java | 6 +- .../pipe/agent/task/meta/PipeRuntimeMeta.java | 51 ++- .../commons/pipe/agent/task/meta/PipeTaskMeta.java | 142 ++++++- .../task/progress/PipeEventCommitManager.java | 11 - .../iotdb/commons/pipe/config/PipeConfig.java | 57 ++- .../iotdb/commons/pipe/config/PipeDescriptor.java | 57 ++- .../config/constant/PipeConnectorConstant.java | 5 +- .../thrift/request/PipeTransferCompressedReq.java | 15 + .../iotdb/commons/pipe/event/EnrichedEvent.java | 4 +- .../security/encrypt/AsymmetricEncrypt.java | 23 +- .../security/encrypt/MessageDigestEncrypt.java | 10 +- .../iotdb/commons/service/metric/enums/Metric.java | 3 + .../relational/tvf/VariationTableFunction.java | 196 +++++++-- .../udf/builtin/relational/tvf/WindowTVFUtils.java | 6 +- .../org/apache/iotdb/commons/utils/AuthUtils.java | 22 +- .../apache/iotdb/commons/utils/StatusUtils.java | 14 + .../iotdb/commons/pipe/task/PipeMetaDeSerTest.java | 22 +- .../db/relational/grammar/sql/RelationalSql.g4 | 24 +- .../openapi/src/main/openapi3/iotdb_rest_v2.yaml | 25 ++ .../src/main/thrift/confignode.thrift | 11 +- .../src/main/thrift/iotconsensus.thrift | 1 + .../thrift-datanode/src/main/thrift/client.thrift | 13 + .../src/main/thrift/datanode.thrift | 1 + pom.xml | 4 +- .../__init__.py => scripts/tools/wal/print-wal.sh | 35 ++ scripts/tools/windows/wal/print-wal.bat | 67 ++++ 328 files changed, 8540 insertions(+), 4347 deletions(-) diff --cc pom.xml index 7632de34dd9,0f2cc724f15..624d6bad129 --- a/pom.xml +++ b/pom.xml @@@ -175,8 -175,7 +175,8 @@@ <thrift.version>0.14.1</thrift.version> <xz.version>1.9</xz.version> <zstd-jni.version>1.5.6-3</zstd-jni.version> - <tsfile.version>2.1.0-250521-SNAPSHOT</tsfile.version> + <tsfile.version>2.1.0-250616-SNAPSHOT</tsfile.version> + <mysql.jdbc.version>9.3.0</mysql.jdbc.version> </properties> <!-- if we claim dependencies in dependencyManagement, then we do not claim
