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/08/11 12:21:08 UTC
(iotdb) 28/47: Pipe: Change the name of the Extractor plugin to Source &&Change the name of the Connector plugin to Sink (#16034)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch rc/2.0.5
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ec98d74c33af5bf6e75fd614fe2c110d93252a92
Author: Zhenyu Luo <lu...@gmail.com>
AuthorDate: Mon Jul 28 09:43:38 2025 +0800
Pipe: Change the name of the Extractor plugin to Source &&Change the name of the Connector plugin to Sink (#16034)
* update extractor plugin name
* update connector plugin name
* fix
* fix
* fix
* spotless
(cherry picked from commit 9a6d3f5c7d32cb021b284ac268242ed96f8fd3fb)
---
.../manual/basic/IoTDBPipePermissionIT.java | 2 +-
...PipeExtractorIT.java => IoTDBPipeSourceIT.java} | 2 +-
...sionIT.java => IoTDBPipeSinkCompressionIT.java} | 2 +-
...arallelIT.java => IoTDBPipeSinkParallelIT.java} | 2 +-
...arallelIT.java => IoTDBPipeSinkParallelIT.java} | 2 +-
...PipeExtractorIT.java => IoTDBPipeSourceIT.java} | 2 +-
...sionIT.java => IoTDBPipeSinkCompressionIT.java} | 2 +-
.../relational/it/schema/IoTDBDatabaseIT.java | 4 +-
.../iotdb/tool/tsfile/ImportTsFileRemotely.java | 20 +-
.../response/pipe/task/PipeTableResp.java | 2 +-
.../iotdb/confignode/manager/ConfigManager.java | 2 +-
.../agent/plugin/PipeConfigNodePluginAgent.java | 12 +-
...r.java => PipeConfigRegionSinkConstructor.java} | 42 ++---
...java => PipeConfigRegionSourceConstructor.java} | 19 +-
.../receiver/IoTDBConfigNodeReceiverAgent.java | 4 +-
.../agent/runtime/PipeConfigNodeRuntimeAgent.java | 2 +-
.../agent/runtime/PipeConfigRegionListener.java | 4 +-
.../pipe/agent/task/PipeConfigNodeSubtask.java | 21 +--
.../pipe/agent/task/PipeConfigNodeTaskAgent.java | 6 +-
.../pipe/agent/task/PipeConfigNodeTaskBuilder.java | 2 +-
.../runtime/heartbeat/PipeHeartbeatParser.java | 4 +-
.../manager/pipe/metric/PipeConfigNodeMetrics.java | 12 +-
.../PipeConfigNodeRemainingTimeMetrics.java | 4 +-
.../PipeConfigNodeRemainingTimeOperator.java | 8 +-
...trics.java => PipeConfigRegionSinkMetrics.java} | 12 +-
.../source/PipeConfigNodeListenerMetrics.java | 2 +-
...ics.java => PipeConfigRegionSourceMetrics.java} | 27 ++-
.../receiver/protocol/IoTDBConfigNodeReceiver.java | 26 +--
.../client/IoTDBConfigNodeSyncClientManager.java | 10 +-
.../PipeTransferConfigNodeHandshakeV1Req.java | 6 +-
.../PipeTransferConfigNodeHandshakeV2Req.java | 6 +-
.../payload/PipeTransferConfigPlanReq.java | 10 +-
.../PipeTransferConfigSnapshotPieceReq.java | 6 +-
.../payload/PipeTransferConfigSnapshotSealReq.java | 6 +-
.../protocol/IoTDBConfigRegionAirGapSink.java} | 29 ++-
.../protocol/IoTDBConfigRegionSink.java} | 30 +--
.../ConfigRegionListeningFilter.java | 2 +-
.../ConfigRegionListeningQueue.java | 2 +-
.../IoTDBConfigRegionSource.java} | 12 +-
...ConfigPhysicalPlanTablePatternParseVisitor.java | 2 +-
...nfigPhysicalPlanTablePrivilegeParseVisitor.java | 2 +-
...peConfigPhysicalPlanTableScopeParseVisitor.java | 2 +-
...eConfigPhysicalPlanTreePatternParseVisitor.java | 2 +-
...ipeConfigPhysicalPlanTreeScopeParseVisitor.java | 2 +-
.../persistence/pipe/PipePluginInfo.java | 8 +-
.../confignode/persistence/pipe/PipeTaskInfo.java | 8 +-
.../impl/pipe/AbstractOperatePipeProcedureV2.java | 2 +-
.../impl/pipe/runtime/PipeMetaSyncProcedure.java | 15 +-
.../impl/pipe/task/AlterPipeProcedureV2.java | 20 +-
.../impl/pipe/task/CreatePipeProcedureV2.java | 70 ++++---
.../pipe/util/PipeExternalSourceLoadBalancer.java | 10 +-
.../response/pipe/PipePluginTableRespTest.java | 4 +-
.../agent/PipeConfigNodeSubtaskExecutorTest.java | 4 +-
.../IoTDBConfigRegionSinkTest.java} | 16 +-
.../PipeConfigNodeThriftRequestTest.java | 10 +-
.../IoTDBConfigRegionSourceTest.java} | 22 +--
...ipeConfigPhysicalPlanScopeParseVisitorTest.java | 6 +-
...igPhysicalPlanTablePatternParseVisitorTest.java | 8 +-
...figPhysicalPlanTreePatternParseVisitorTest.java | 44 ++---
.../pipe/consensuspipe/ConsensusPipeManager.java | 32 ++--
...usPipeConnector.java => ConsensusPipeSink.java} | 2 +-
.../pipe/metric/PipeConsensusSyncLagManager.java | 21 +--
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 2 +-
.../schemaregion/SchemaExecutionVisitor.java | 2 +-
.../schemaregion/SchemaRegionStateMachine.java | 2 +-
.../dataregion/PipeDataRegionPluginAgent.java | 14 +-
...tor.java => PipeDataRegionSinkConstructor.java} | 83 ++++-----
...r.java => PipeDataRegionSourceConstructor.java} | 25 ++-
.../schemaregion/PipeSchemaRegionPluginAgent.java | 12 +-
...r.java => PipeSchemaRegionSinkConstructor.java} | 42 ++---
...java => PipeSchemaRegionSourceConstructor.java} | 19 +-
.../db/pipe/agent/runtime/PipeAgentLauncher.java | 2 +-
.../agent/runtime/PipeDataNodeRuntimeAgent.java | 2 +-
.../runtime/PipeSchemaRegionListenerManager.java | 2 +-
.../db/pipe/agent/task/PipeDataNodeTaskAgent.java | 112 ++++++-----
.../agent/task/builder/PipeDataNodeBuilder.java | 4 +-
.../task/builder/PipeDataNodeTaskBuilder.java | 73 ++++----
.../agent/task/connection/PipeEventCollector.java | 8 +-
...kExecutor.java => PipeSinkSubtaskExecutor.java} | 6 +-
.../task/execution/PipeSubtaskExecutorManager.java | 6 +-
...kConnectorStage.java => PipeTaskSinkStage.java} | 26 +--
...xtractorStage.java => PipeTaskSourceStage.java} | 6 +-
.../PipeRealtimePriorityBlockingQueue.java | 2 +-
.../PipeSinkSubtask.java} | 64 +++----
.../PipeSinkSubtaskLifeCycle.java} | 37 ++--
.../PipeSinkSubtaskManager.java} | 70 +++----
.../consensus/PipeConsensusSubtaskExecutor.java | 4 +-
...rMetrics.java => PipeConsensusSinkMetrics.java} | 12 +-
.../tsfile/PipeCompactedTsFileInsertionEvent.java | 2 +-
.../common/tsfile/PipeTsFileInsertionEvent.java | 2 +-
.../db/pipe/event/realtime/PipeRealtimeEvent.java | 6 +-
.../event/realtime/PipeRealtimeEventFactory.java | 2 +-
.../iotdb/db/pipe/metric/PipeDataNodeMetrics.java | 24 +--
.../PipeDataNodeRemainingEventAndTimeOperator.java | 12 +-
.../overview/PipeDataNodeSinglePipeMetrics.java | 8 +-
.../overview/PipeTsFileToTabletsMetrics.java | 4 +-
.../schema/PipeSchemaRegionListenerMetrics.java | 2 +-
...trics.java => PipeSchemaRegionSinkMetrics.java} | 33 ++--
...ics.java => PipeSchemaRegionSourceMetrics.java} | 25 ++-
...Metrics.java => PipeDataRegionSinkMetrics.java} | 56 +++---
.../db/pipe/metric/source/PipeAssignerMetrics.java | 2 +-
...trics.java => PipeDataRegionSourceMetrics.java} | 48 +++--
.../twostage/exchange/payload/CombineRequest.java | 4 +-
.../payload/FetchCombineResultRequest.java | 4 +-
.../receiver/TwoStageAggregateReceiver.java | 6 +-
.../exchange/sender/TwoStageAggregateSender.java | 2 +-
.../protocol/airgap/IoTDBAirGapReceiver.java | 6 +-
.../legacy/IoTDBLegacyPipeReceiverAgent.java | 4 +-
.../pipeconsensus/PipeConsensusReceiver.java | 22 +--
.../pipeconsensus/PipeConsensusReceiverAgent.java | 2 +-
.../protocol/thrift/IoTDBDataNodeReceiver.java | 48 ++---
.../thrift/IoTDBDataNodeReceiverAgent.java | 6 +-
...leStatementDataTypeConvertExecutionVisitor.java | 2 +-
...eeStatementDataTypeConvertExecutionVisitor.java | 2 +-
.../resource/tsfile/PipeCompactionManager.java | 16 +-
.../client/IoTDBDataNodeAsyncClientManager.java | 16 +-
.../IoTDBDataNodeCacheLeaderClientManager.java | 2 +-
.../client/IoTDBDataNodeSyncClientManager.java | 12 +-
.../evolvable/batch/PipeTabletEventBatch.java | 6 +-
.../evolvable/batch/PipeTabletEventPlainBatch.java | 10 +-
.../batch/PipeTabletEventTsFileBatch.java | 18 +-
.../batch/PipeTransferBatchReqBuilder.java | 38 ++--
.../PipeTransferDataNodeHandshakeV1Req.java | 6 +-
.../PipeTransferDataNodeHandshakeV2Req.java | 6 +-
.../evolvable/request/PipeTransferPlanNodeReq.java | 10 +-
.../PipeTransferSchemaSnapshotPieceReq.java | 6 +-
.../request/PipeTransferSchemaSnapshotSealReq.java | 6 +-
.../request/PipeTransferTabletBatchReq.java | 8 +-
.../request/PipeTransferTabletBatchReqV2.java | 8 +-
.../request/PipeTransferTabletBinaryReq.java | 10 +-
.../request/PipeTransferTabletBinaryReqV2.java | 12 +-
.../request/PipeTransferTabletInsertNodeReq.java | 12 +-
.../request/PipeTransferTabletInsertNodeReqV2.java | 12 +-
.../request/PipeTransferTabletRawReq.java | 12 +-
.../request/PipeTransferTabletRawReqV2.java | 16 +-
.../request/PipeTransferTsFilePieceReq.java | 6 +-
.../request/PipeTransferTsFilePieceWithModReq.java | 6 +-
.../request/PipeTransferTsFileSealReq.java | 6 +-
.../request/PipeTransferTsFileSealWithModReq.java | 6 +-
.../payload/legacy/DeletionPipeData.java | 2 +-
.../payload/legacy/PipeData.java | 2 +-
.../payload/legacy/TsFilePipeData.java | 2 +-
.../protocol/airgap/IoTDBDataNodeAirGapSink.java} | 12 +-
.../airgap/IoTDBDataRegionAirGapSink.java} | 50 +++--
.../airgap/IoTDBSchemaRegionAirGapSink.java} | 21 +--
.../protocol/legacy/IoTDBLegacyPipeSink.java} | 62 +++----
.../protocol/opcda/OpcDaHeader.java | 2 +-
.../protocol/opcda/OpcDaServerHandle.java | 12 +-
.../protocol/opcda/OpcDaSink.java} | 18 +-
.../protocol/opcua/OpcUaKeyStoreLoader.java | 2 +-
.../protocol/opcua/OpcUaNameSpace.java | 6 +-
.../protocol/opcua/OpcUaServerBuilder.java | 17 +-
.../protocol/opcua/OpcUaSink.java} | 72 ++++----
.../pipeconsensus/PipeConsensusAsyncSink.java} | 108 +++++------
.../pipeconsensus/PipeConsensusSyncSink.java} | 66 ++++---
.../handler/PipeConsensusDeleteEventHandler.java | 14 +-
.../PipeConsensusTabletBatchEventHandler.java | 20 +-
.../PipeConsensusTabletInsertNodeEventHandler.java | 10 +-
.../PipeConsensusTabletInsertionEventHandler.java | 16 +-
.../PipeConsensusTsFileInsertionEventHandler.java | 24 +--
.../builder/PipeConsensusAsyncBatchReqBuilder.java | 2 +-
.../builder/PipeConsensusSyncBatchReqBuilder.java | 2 +-
.../PipeConsensusTransferBatchReqBuilder.java | 24 +--
.../request/PipeConsensusDeleteNodeReq.java | 6 +-
.../request/PipeConsensusTabletBatchReq.java | 2 +-
.../request/PipeConsensusTabletBinaryReq.java | 6 +-
.../request/PipeConsensusTabletInsertNodeReq.java | 6 +-
.../request/PipeConsensusTsFilePieceReq.java | 6 +-
.../PipeConsensusTsFilePieceWithModReq.java | 6 +-
.../request/PipeConsensusTsFileSealReq.java | 6 +-
.../request/PipeConsensusTsFileSealWithModReq.java | 6 +-
.../thrift/async/IoTDBDataRegionAsyncSink.java} | 103 +++++------
.../PipeTransferTabletBatchEventHandler.java | 10 +-
.../PipeTransferTabletInsertNodeEventHandler.java | 6 +-
.../PipeTransferTabletInsertionEventHandler.java | 6 +-
.../handler/PipeTransferTabletRawEventHandler.java | 6 +-
.../handler/PipeTransferTrackableHandler.java | 8 +-
.../async/handler/PipeTransferTsFileHandler.java | 18 +-
.../thrift/sync/IoTDBDataNodeSyncSink.java} | 10 +-
.../thrift/sync/IoTDBDataRegionSyncSink.java} | 68 ++++---
.../thrift/sync/IoTDBSchemaRegionSink.java} | 24 +--
.../websocket/WebSocketConnectorServer.java | 18 +-
.../protocol/websocket/WebSocketSink.java} | 18 +-
.../protocol/writeback/WriteBackSink.java} | 51 +++--
.../util/builder/PipeTableModelTsFileBuilder.java | 2 +-
.../builder/PipeTableModelTsFileBuilderV2.java | 2 +-
.../util/builder/PipeTreeModelTsFileBuilder.java | 2 +-
.../util/builder/PipeTreeModelTsFileBuilderV2.java | 2 +-
.../util/builder/PipeTsFileBuilder.java | 2 +-
.../util/cacher/LeaderCacheUtils.java | 2 +-
.../sorter/PipeTableModelTabletEventSorter.java | 2 +-
.../util/sorter/PipeTabletEventSorter.java | 2 +-
.../sorter/PipeTreeModelTabletEventSorter.java | 2 +-
.../dataregion/DataRegionListeningFilter.java | 2 +-
.../dataregion/DataRegionWatermarkInjector.java | 2 +-
.../dataregion/IoTDBDataRegionSource.java} | 205 ++++++++++-----------
.../PipeHistoricalDataRegionSource.java} | 4 +-
...storicalDataRegionTsFileAndDeletionSource.java} | 88 ++++-----
.../PipeRealtimeDataRegionHeartbeatSource.java} | 8 +-
.../PipeRealtimeDataRegionHybridSource.java} | 28 ++-
.../realtime/PipeRealtimeDataRegionLogSource.java} | 19 +-
.../realtime/PipeRealtimeDataRegionSource.java} | 91 +++++----
.../PipeRealtimeDataRegionTsFileSource.java} | 18 +-
.../realtime/assigner/DisruptorQueue.java | 2 +-
.../assigner/DisruptorQueueExceptionHandler.java | 2 +-
.../realtime/assigner/PipeDataRegionAssigner.java | 14 +-
.../PipeTsFileEpochProgressIndexKeeper.java | 2 +-
.../dataregion/realtime/epoch/TsFileEpoch.java | 14 +-
.../realtime/epoch/TsFileEpochManager.java | 2 +-
.../realtime/epoch/TsFileEpochStateMigrator.java | 2 +-
.../listener/PipeInsertionDataNodeListener.java | 10 +-
.../listener/PipeTimePartitionListener.java | 15 +-
.../matcher/CachedSchemaPatternMatcher.java | 48 ++---
.../realtime/matcher/PipeDataRegionMatcher.java | 10 +-
.../mqtt/MQTTPublishHandler.java | 8 +-
.../mqtt/MQTTSource.java} | 48 +++--
.../schemaregion/IoTDBSchemaRegionSource.java} | 12 +-
.../PipePlanTablePatternParseVisitor.java | 2 +-
.../PipePlanTablePrivilegeParseVisitor.java | 2 +-
.../PipePlanTreePatternParseVisitor.java | 2 +-
.../schemaregion/PipeStatementToPlanVisitor.java | 2 +-
.../schemaregion/SchemaRegionListeningFilter.java | 2 +-
.../schemaregion/SchemaRegionListeningQueue.java | 2 +-
.../execution/config/TableConfigTaskVisitor.java | 55 +++---
.../config/executor/ClusterConfigTaskExecutor.java | 33 ++--
.../execution/config/sys/pipe/AlterPipeTask.java | 18 +-
.../execution/config/sys/pipe/CreatePipeTask.java | 18 +-
.../config/sys/pipe/PipeFunctionSupport.java | 4 +-
.../plan/node/pipe/PipeOperateSchemaQueueNode.java | 2 +-
.../db/storageengine/dataregion/DataRegion.java | 2 +-
.../dataregion/memtable/TsFileProcessor.java | 2 +-
...leStatementDataTypeConvertExecutionVisitor.java | 2 +-
...eeStatementDataTypeConvertExecutionVisitor.java | 2 +-
.../load/limiter/LoadTsFileRateLimiter.java | 2 +-
.../rescon/memory/TimePartitionManager.java | 2 +-
.../agent/SubscriptionBrokerAgent.java | 4 +-
.../batch/SubscriptionPipeTsFileEventBatch.java | 2 +-
.../execution/SubscriptionSubtaskExecutor.java | 4 +-
...orStage.java => SubscriptionTaskSinkStage.java} | 26 +--
...orSubtask.java => SubscriptionSinkSubtask.java} | 8 +-
....java => SubscriptionSinkSubtaskLifeCycle.java} | 22 +--
...er.java => SubscriptionSinkSubtaskManager.java} | 70 ++++---
.../agent/plugin/PipeDataNodePluginAgentTest.java | 20 +-
...rTest.java => PipeSinkSubtaskExecutorTest.java} | 10 +-
.../db/pipe/consensus/DeletionResourceTest.java | 12 +-
.../pattern/CachedSchemaPatternMatcherTest.java | 29 ++-
.../PipeDataNodeThriftRequestTest.java | 34 ++--
.../pipe/{connector => sink}/PipeReceiverTest.java | 6 +-
.../PipeSinkTest.java} | 34 ++--
.../PipeStatementTablePatternParseVisitorTest.java | 2 +-
.../PipeStatementTreePatternParseVisitorTest.java | 2 +-
.../PipeTabletEventSorterTest.java | 6 +-
.../IoTDBDataRegionSourceTest.java} | 30 ++-
.../PipePlanTablePatternParseVisitorTest.java | 12 +-
.../PipePlanTreePatternParseVisitorTest.java | 34 ++--
.../PipeRealtimeExtractTest.java | 43 +++--
.../SchemaRegionListeningQueueTest.java | 2 +-
...sensusRetryWithIncreasingIntervalException.java | 2 +-
.../exception/pipe/PipeRuntimeExceptionType.java | 4 +-
....java => PipeRuntimeSinkCriticalException.java} | 24 ++-
...untimeSinkRetryTimesConfigurableException.java} | 6 +-
.../commons/pipe/agent/plugin/PipePluginAgent.java | 16 +-
.../agent/plugin/builtin/BuiltinPipePlugin.java | 97 +++++-----
.../PlaceholderSink.java} | 6 +-
.../donothing/DoNothingSink.java} | 4 +-
.../iotdb/airgap/IoTDBAirGapSink.java} | 6 +-
.../iotdb/consensus/PipeConsensusAsyncSink.java} | 6 +-
.../iotdb/thrift/IoTDBLegacyPipeSink.java} | 6 +-
.../iotdb/thrift/IoTDBThriftAsyncSink.java} | 4 +-
.../iotdb/thrift/IoTDBThriftSink.java} | 6 +-
.../iotdb/thrift/IoTDBThriftSslSink.java} | 6 +-
.../iotdb/thrift/IoTDBThriftSyncSink.java} | 4 +-
.../opcda/OpcDaSink.java} | 6 +-
.../opcua/OpcUaSink.java} | 6 +-
.../websocket/WebSocketSink.java} | 6 +-
.../writeback/WriteBackSink.java} | 6 +-
.../donothing/DoNothingSource.java} | 4 +-
.../iotdb/IoTDBSource.java} | 4 +-
.../mqtt/MQTTSource.java} | 4 +-
...orConstructor.java => PipeSinkConstructor.java} | 11 +-
...Constructor.java => PipeSourceConstructor.java} | 11 +-
.../commons/pipe/agent/task/PipeTaskAgent.java | 12 +-
.../pipe/agent/task/meta/PipeRuntimeMeta.java | 6 +-
.../pipe/agent/task/meta/PipeStaticMeta.java | 5 +-
.../commons/pipe/agent/task/meta/PipeTaskMeta.java | 4 +-
...orSubtask.java => PipeAbstractSinkSubtask.java} | 16 +-
.../agent/task/subtask/PipeReportableSubtask.java | 6 +-
...onnectorConstant.java => PipeSinkConstant.java} | 4 +-
...ractorConstant.java => PipeSourceConstant.java} | 4 +-
...nt.java => PipeTaskSinkRuntimeEnvironment.java} | 4 +-
.../options/PipeInclusionOptions.java | 12 +-
.../datastructure/pattern/IoTDBTreePattern.java | 4 +-
.../datastructure/pattern/PrefixTreePattern.java | 4 +-
.../pipe/datastructure/pattern/TablePattern.java | 32 ++--
.../pipe/datastructure/pattern/TreePattern.java | 28 +--
.../datastructure/visibility/VisibilityUtils.java | 16 +-
.../commons/pipe/receiver/IoTDBFileReceiver.java | 32 ++--
.../iotdb/commons/pipe/receiver/IoTDBReceiver.java | 4 +-
.../pipe/receiver/PipeReceiverStatusHandler.java | 12 +-
.../client/IoTDBClientManager.java | 2 +-
.../client/IoTDBSyncClient.java | 8 +-
.../client/IoTDBSyncClientManager.java | 14 +-
.../compressor/PipeCompressor.java | 2 +-
.../compressor/PipeCompressorConfig.java | 2 +-
.../compressor/PipeCompressorFactory.java | 14 +-
.../compressor/PipeGZIPCompressor.java | 2 +-
.../compressor/PipeLZ4Compressor.java | 2 +-
.../compressor/PipeLZMA2Compressor.java | 2 +-
.../compressor/PipeSnappyCompressor.java | 2 +-
.../compressor/PipeZSTDCompressor.java | 2 +-
.../limiter/GlobalRPCRateLimiter.java | 2 +-
.../limiter/GlobalRateLimiter.java | 2 +-
.../limiter/PipeEndPointRateLimiter.java | 2 +-
.../limiter/TsFileSendRateLimiter.java | 2 +-
.../payload/airgap/AirGapELanguageConstant.java | 2 +-
.../payload/airgap/AirGapOneByteResponse.java | 2 +-
.../airgap/AirGapPseudoTPipeTransferRequest.java | 2 +-
.../request/PipeConsensusRequestType.java | 2 +-
.../request/PipeConsensusRequestVersion.java | 2 +-
.../request/PipeConsensusTransferFilePieceReq.java | 2 +-
.../request/PipeConsensusTransferFileSealReq.java | 2 +-
.../PipeConsensusTransferFileSealWithModReq.java | 2 +-
.../PipeConsensusTransferFilePieceResp.java | 2 +-
.../common/PipeTransferHandshakeConstant.java | 2 +-
.../thrift/common/PipeTransferSliceReqHandler.java | 8 +-
.../thrift/request/IoTDBSinkRequestVersion.java} | 6 +-
.../payload/thrift/request/PipeRequestType.java | 2 +-
.../thrift/request/PipeTransferCompressedReq.java | 10 +-
.../thrift/request/PipeTransferFilePieceReq.java | 6 +-
.../thrift/request/PipeTransferFileSealReqV1.java | 6 +-
.../thrift/request/PipeTransferFileSealReqV2.java | 6 +-
.../thrift/request/PipeTransferHandshakeV1Req.java | 6 +-
.../thrift/request/PipeTransferHandshakeV2Req.java | 6 +-
.../thrift/request/PipeTransferSliceReq.java | 4 +-
.../thrift/response/PipeTransferFilePieceResp.java | 2 +-
.../protocol/IoTDBAirGapSink.java} | 28 +--
.../protocol/IoTDBSink.java} | 200 ++++++++++----------
.../protocol/IoTDBSslSyncSink.java} | 30 +--
.../IoTDBNonDataRegionSource.java} | 10 +-
.../IoTDBSource.java} | 58 +++---
.../commons/subscription/meta/topic/TopicMeta.java | 6 +-
.../exception/pipe/PipeRuntimeExceptionTest.java | 9 +-
.../pipe/plugin/builtin/BuiltinPipePluginTest.java | 16 +-
.../iotdb/commons/pipe/task/PipeMetaDeSerTest.java | 4 +-
344 files changed, 2483 insertions(+), 2591 deletions(-)
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipePermissionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipePermissionIT.java
index f991b9bb78e..7a3f90e687a 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipePermissionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipePermissionIT.java
@@ -209,7 +209,7 @@ public class IoTDBPipePermissionIT extends AbstractPipeTableModelDualManualIT {
try {
TableModelUtils.createDataBaseAndTable(receiverEnv, "test", "test");
- } catch (final Exception ignore) {
+ } catch (final Exception | Error ignore) {
// Ignore because the db/table may be transferred because sender user may see these
}
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeExtractorIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSourceIT.java
similarity index 99%
rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeExtractorIT.java
rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSourceIT.java
index 8a1b1de07b6..1b43ce561c0 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeExtractorIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeSourceIT.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.fail;
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2DualTableManualBasic.class})
-public class IoTDBPipeExtractorIT extends AbstractPipeTableModelDualManualIT {
+public class IoTDBPipeSourceIT extends AbstractPipeTableModelDualManualIT {
@Before
public void setUp() {
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorCompressionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeSinkCompressionIT.java
similarity index 99%
rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorCompressionIT.java
rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeSinkCompressionIT.java
index 0534f046f3a..6747b3016e1 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorCompressionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeSinkCompressionIT.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.fail;
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2DualTableManualEnhanced.class})
-public class IoTDBPipeConnectorCompressionIT extends AbstractPipeTableModelDualManualIT {
+public class IoTDBPipeSinkCompressionIT extends AbstractPipeTableModelDualManualIT {
@Override
@Before
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorParallelIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeSinkParallelIT.java
similarity index 98%
rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorParallelIT.java
rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeSinkParallelIT.java
index 3b82b15d2e4..889985312a2 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeConnectorParallelIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeSinkParallelIT.java
@@ -45,7 +45,7 @@ import java.util.function.Consumer;
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2DualTableManualEnhanced.class})
-public class IoTDBPipeConnectorParallelIT extends AbstractPipeTableModelDualManualIT {
+public class IoTDBPipeSinkParallelIT extends AbstractPipeTableModelDualManualIT {
@Override
@Before
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeConnectorParallelIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSinkParallelIT.java
similarity index 97%
rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeConnectorParallelIT.java
rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSinkParallelIT.java
index 45169c41630..fcb40dcbae2 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeConnectorParallelIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSinkParallelIT.java
@@ -43,7 +43,7 @@ import java.util.Set;
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2DualTreeAutoBasic.class})
-public class IoTDBPipeConnectorParallelIT extends AbstractPipeDualTreeModelAutoIT {
+public class IoTDBPipeSinkParallelIT extends AbstractPipeDualTreeModelAutoIT {
@Override
@Before
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeExtractorIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSourceIT.java
similarity index 99%
rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeExtractorIT.java
rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSourceIT.java
index 5cf086b2db6..060f96f36a9 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeExtractorIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBPipeSourceIT.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.fail;
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2DualTreeAutoBasic.class})
-public class IoTDBPipeExtractorIT extends AbstractPipeDualTreeModelAutoIT {
+public class IoTDBPipeSourceIT extends AbstractPipeDualTreeModelAutoIT {
@Before
public void setUp() {
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConnectorCompressionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeSinkCompressionIT.java
similarity index 99%
rename from integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConnectorCompressionIT.java
rename to integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeSinkCompressionIT.java
index f978cbfe909..9cdeb224151 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeConnectorCompressionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeSinkCompressionIT.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.fail;
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2DualTreeAutoEnhanced.class})
-public class IoTDBPipeConnectorCompressionIT extends AbstractPipeDualTreeModelAutoIT {
+public class IoTDBPipeSinkCompressionIT extends AbstractPipeDualTreeModelAutoIT {
@Override
@Before
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
index 9ddeebac476..f755f95b43e 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
@@ -569,7 +569,7 @@ public class IoTDBDatabaseIT {
"select * from pipe_plugins where plugin_name = 'IOTDB-THRIFT-SINK'"),
"plugin_name,plugin_type,class_name,plugin_jar,",
Collections.singleton(
- "IOTDB-THRIFT-SINK,Builtin,org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBThriftConnector,null,"));
+ "IOTDB-THRIFT-SINK,Builtin,org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.iotdb.thrift.IoTDBThriftSink,null,"));
TestUtils.assertResultSetEqual(
statement.executeQuery(
@@ -668,7 +668,7 @@ public class IoTDBDatabaseIT {
"select * from pipe_plugins where plugin_name = 'IOTDB-THRIFT-SINK'"),
"plugin_name,plugin_type,class_name,plugin_jar,",
Collections.singleton(
- "IOTDB-THRIFT-SINK,Builtin,org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBThriftConnector,null,"));
+ "IOTDB-THRIFT-SINK,Builtin,org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.iotdb.thrift.IoTDBThriftSink,null,"));
statement.execute("create topic tp with ('start-time'='2025-01-13T10:03:19.229+08:00')");
TestUtils.assertResultSetEqual(
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/ImportTsFileRemotely.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/ImportTsFileRemotely.java
index 97b335afe2a..d842b9803af 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/ImportTsFileRemotely.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/ImportTsFileRemotely.java
@@ -24,16 +24,16 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.property.ThriftClientProperty;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.common.PipeTransferHandshakeConstant;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.response.PipeTransferFilePieceResp;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFileSealReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClient;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.common.PipeTransferHandshakeConstant;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.response.PipeTransferFilePieceResp;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
import org.apache.iotdb.isession.SessionConfig;
import org.apache.iotdb.pipe.api.exception.PipeConnectionException;
import org.apache.iotdb.pipe.api.exception.PipeException;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java
index 4d854be05a3..37c3d1bd03b 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTemporaryMetaInCoordinator;
import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
-import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningFilter;
+import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningFilter;
import org.apache.iotdb.confignode.rpc.thrift.TGetAllPipeInfoResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index b76ad38c2ba..609649941d4 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -56,7 +56,7 @@ import org.apache.iotdb.commons.model.ModelStatus;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.path.PathPatternUtil;
-import org.apache.iotdb.commons.pipe.connector.payload.airgap.AirGapPseudoTPipeTransferRequest;
+import org.apache.iotdb.commons.pipe.sink.payload.airgap.AirGapPseudoTPipeTransferRequest;
import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.commons.schema.table.AlterOrDropTableOperationType;
import org.apache.iotdb.commons.schema.table.TreeViewSchema;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigNodePluginAgent.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigNodePluginAgent.java
index 7593dbd79b7..8ddbb73398c 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigNodePluginAgent.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigNodePluginAgent.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.confignode.manager.pipe.agent.plugin;
import org.apache.iotdb.commons.pipe.agent.plugin.PipePluginAgent;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeConnectorConstructor;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeExtractorConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeProcessorConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSourceConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper;
public class PipeConfigNodePluginAgent extends PipePluginAgent {
@@ -32,9 +32,9 @@ public class PipeConfigNodePluginAgent extends PipePluginAgent {
}
@Override
- protected PipeExtractorConstructor createPipeExtractorConstructor(
+ protected PipeSourceConstructor createPipeExtractorConstructor(
PipePluginMetaKeeper pipePluginMetaKeeper) {
- return new PipeConfigRegionExtractorConstructor();
+ return new PipeConfigRegionSourceConstructor();
}
@Override
@@ -44,8 +44,8 @@ public class PipeConfigNodePluginAgent extends PipePluginAgent {
}
@Override
- protected PipeConnectorConstructor createPipeConnectorConstructor(
+ protected PipeSinkConstructor createPipeConnectorConstructor(
PipePluginMetaKeeper pipePluginMetaKeeper) {
- return new PipeConfigRegionConnectorConstructor();
+ return new PipeConfigRegionSinkConstructor();
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionConnectorConstructor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionSinkConstructor.java
similarity index 70%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionConnectorConstructor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionSinkConstructor.java
index 74a34e503be..c7222e9a1bc 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionConnectorConstructor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionSinkConstructor.java
@@ -20,56 +20,50 @@
package org.apache.iotdb.confignode.manager.pipe.agent.plugin;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
-import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.donothing.DoNothingConnector;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeConnectorConstructor;
-import org.apache.iotdb.confignode.manager.pipe.connector.protocol.IoTDBConfigRegionAirGapConnector;
-import org.apache.iotdb.confignode.manager.pipe.connector.protocol.IoTDBConfigRegionConnector;
+import org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.donothing.DoNothingSink;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
+import org.apache.iotdb.confignode.manager.pipe.sink.protocol.IoTDBConfigRegionAirGapSink;
+import org.apache.iotdb.confignode.manager.pipe.sink.protocol.IoTDBConfigRegionSink;
import org.apache.iotdb.pipe.api.PipeConnector;
-class PipeConfigRegionConnectorConstructor extends PipeConnectorConstructor {
+class PipeConfigRegionSinkConstructor extends PipeSinkConstructor {
@Override
protected void initConstructors() {
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName(),
- IoTDBConfigRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName(), IoTDBConfigRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_SSL_CONNECTOR.getPipePluginName(),
- IoTDBConfigRegionConnector::new);
+ IoTDBConfigRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_SYNC_CONNECTOR.getPipePluginName(),
- IoTDBConfigRegionConnector::new);
+ IoTDBConfigRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName(),
- IoTDBConfigRegionConnector::new);
+ IoTDBConfigRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName(),
- IoTDBConfigRegionAirGapConnector::new);
+ IoTDBConfigRegionAirGapSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingConnector::new);
+ BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName(), IoTDBConfigRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName(), IoTDBConfigRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK.getPipePluginName(),
- IoTDBConfigRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK.getPipePluginName(), IoTDBConfigRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(),
- IoTDBConfigRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(), IoTDBConfigRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_SINK.getPipePluginName(),
- IoTDBConfigRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_SINK.getPipePluginName(), IoTDBConfigRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(),
- IoTDBConfigRegionAirGapConnector::new);
+ BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(), IoTDBConfigRegionAirGapSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingConnector::new);
+ BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingSink::new);
}
@Override
public PipeConnector reflectPluginByKey(String pluginKey) {
// TODO: support constructing plugin by reflection
- return (PipeConnector)
- pluginConstructors.getOrDefault(pluginKey, DoNothingConnector::new).get();
+ return (PipeConnector) pluginConstructors.getOrDefault(pluginKey, DoNothingSink::new).get();
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionExtractorConstructor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionSourceConstructor.java
similarity index 75%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionExtractorConstructor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionSourceConstructor.java
index e4e6fb0caa7..79982ba2824 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionExtractorConstructor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionSourceConstructor.java
@@ -20,30 +20,29 @@
package org.apache.iotdb.confignode.manager.pipe.agent.plugin;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
-import org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.donothing.DoNothingExtractor;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeExtractorConstructor;
-import org.apache.iotdb.confignode.manager.pipe.extractor.IoTDBConfigRegionExtractor;
+import org.apache.iotdb.commons.pipe.agent.plugin.builtin.source.donothing.DoNothingSource;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSourceConstructor;
+import org.apache.iotdb.confignode.manager.pipe.source.IoTDBConfigRegionSource;
import org.apache.iotdb.pipe.api.PipeExtractor;
-class PipeConfigRegionExtractorConstructor extends PipeExtractorConstructor {
+class PipeConfigRegionSourceConstructor extends PipeSourceConstructor {
@Override
protected void initConstructors() {
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_EXTRACTOR.getPipePluginName(), DoNothingExtractor::new);
+ BuiltinPipePlugin.DO_NOTHING_EXTRACTOR.getPipePluginName(), DoNothingSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName(), IoTDBConfigRegionExtractor::new);
+ BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName(), IoTDBConfigRegionSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_SOURCE.getPipePluginName(), DoNothingExtractor::new);
+ BuiltinPipePlugin.DO_NOTHING_SOURCE.getPipePluginName(), DoNothingSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_SOURCE.getPipePluginName(), IoTDBConfigRegionExtractor::new);
+ BuiltinPipePlugin.IOTDB_SOURCE.getPipePluginName(), IoTDBConfigRegionSource::new);
}
@Override
public PipeExtractor reflectPluginByKey(String pluginKey) {
// TODO: support constructing plugin by reflection
- return (PipeExtractor)
- pluginConstructors.getOrDefault(pluginKey, DoNothingExtractor::new).get();
+ return (PipeExtractor) pluginConstructors.getOrDefault(pluginKey, DoNothingSource::new).get();
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/receiver/IoTDBConfigNodeReceiverAgent.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/receiver/IoTDBConfigNodeReceiverAgent.java
index fce5367398f..5f6b0db8e50 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/receiver/IoTDBConfigNodeReceiverAgent.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/receiver/IoTDBConfigNodeReceiverAgent.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.confignode.manager.pipe.agent.receiver;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
import org.apache.iotdb.commons.pipe.receiver.IoTDBReceiver;
import org.apache.iotdb.commons.pipe.receiver.IoTDBReceiverAgent;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.manager.pipe.receiver.protocol.IoTDBConfigNodeReceiver;
@@ -37,7 +37,7 @@ public class IoTDBConfigNodeReceiverAgent extends IoTDBReceiverAgent {
@Override
protected void initConstructors() {
RECEIVER_CONSTRUCTORS.put(
- IoTDBConnectorRequestVersion.VERSION_1.getVersion(), IoTDBConfigNodeReceiver::new);
+ IoTDBSinkRequestVersion.VERSION_1.getVersion(), IoTDBConfigNodeReceiver::new);
}
@Override
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigNodeRuntimeAgent.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigNodeRuntimeAgent.java
index b89e401d5c7..372b0334a24 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigNodeRuntimeAgent.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigNodeRuntimeAgent.java
@@ -30,8 +30,8 @@ import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.commons.service.IService;
import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent;
-import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningQueue;
import org.apache.iotdb.confignode.manager.pipe.resource.PipeConfigNodeCopiedFileDirStartupCleaner;
+import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningQueue;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import org.slf4j.Logger;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigRegionListener.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigRegionListener.java
index 7c8bcca9f36..278e133494b 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigRegionListener.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/runtime/PipeConfigRegionListener.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.confignode.manager.pipe.agent.runtime;
import org.apache.iotdb.commons.exception.IllegalPathException;
-import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningFilter;
-import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningQueue;
+import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningFilter;
+import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningQueue;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtask.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtask.java
index 4a0437dae95..0d6d3fea9d6 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtask.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtask.java
@@ -23,17 +23,17 @@ import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager;
-import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeAbstractConnectorSubtask;
+import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeAbstractSinkSubtask;
import org.apache.iotdb.commons.pipe.config.constant.PipeProcessorConstant;
import org.apache.iotdb.commons.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration;
-import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskConnectorRuntimeEnvironment;
import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskExtractorRuntimeEnvironment;
import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskProcessorRuntimeEnvironment;
+import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSinkRuntimeEnvironment;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.commons.pipe.event.ProgressReportEvent;
import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent;
-import org.apache.iotdb.confignode.manager.pipe.extractor.IoTDBConfigRegionExtractor;
-import org.apache.iotdb.confignode.manager.pipe.metric.sink.PipeConfigRegionConnectorMetrics;
+import org.apache.iotdb.confignode.manager.pipe.metric.sink.PipeConfigRegionSinkMetrics;
+import org.apache.iotdb.confignode.manager.pipe.source.IoTDBConfigRegionSource;
import org.apache.iotdb.pipe.api.PipeExtractor;
import org.apache.iotdb.pipe.api.PipeProcessor;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;
@@ -48,7 +48,7 @@ import java.util.Map;
import static org.apache.iotdb.db.protocol.client.ConfigNodeInfo.CONFIG_REGION_ID;
-public class PipeConfigNodeSubtask extends PipeAbstractConnectorSubtask {
+public class PipeConfigNodeSubtask extends PipeAbstractSinkSubtask {
private static final Logger LOGGER = LoggerFactory.getLogger(PipeConfigNodeSubtask.class);
@@ -79,7 +79,7 @@ public class PipeConfigNodeSubtask extends PipeAbstractConnectorSubtask {
initProcessor(processorAttributes);
initConnector(connectorAttributes);
- PipeConfigRegionConnectorMetrics.getInstance().register(this);
+ PipeConfigRegionSinkMetrics.getInstance().register(this);
PipeEventCommitManager.getInstance()
.register(pipeName, creationTime, CONFIG_REGION_ID.getId(), pipeName + "_" + creationTime);
}
@@ -144,8 +144,7 @@ public class PipeConfigNodeSubtask extends PipeAbstractConnectorSubtask {
// 3. Customize connector
final PipeTaskRuntimeConfiguration runtimeConfiguration =
new PipeTaskRuntimeConfiguration(
- new PipeTaskConnectorRuntimeEnvironment(
- pipeName, creationTime, CONFIG_REGION_ID.getId()));
+ new PipeTaskSinkRuntimeEnvironment(pipeName, creationTime, CONFIG_REGION_ID.getId()));
outputPipeConnector.customize(connectorParameters, runtimeConfiguration);
// 4. Handshake
@@ -164,7 +163,7 @@ public class PipeConfigNodeSubtask extends PipeAbstractConnectorSubtask {
}
/**
- * Try to consume an {@link Event} by the {@link IoTDBConfigRegionExtractor}.
+ * Try to consume an {@link Event} by the {@link IoTDBConfigRegionSource}.
*
* @return {@code true} if the {@link Event} is consumed successfully, {@code false} if no more
* {@link Event} can be consumed
@@ -187,7 +186,7 @@ public class PipeConfigNodeSubtask extends PipeAbstractConnectorSubtask {
if (!(event instanceof ProgressReportEvent)) {
outputPipeConnector.transfer(event);
- PipeConfigRegionConnectorMetrics.getInstance().markConfigEvent(taskID);
+ PipeConfigRegionSinkMetrics.getInstance().markConfigEvent(taskID);
}
decreaseReferenceCountAndReleaseLastEvent(event, true);
@@ -224,7 +223,7 @@ public class PipeConfigNodeSubtask extends PipeAbstractConnectorSubtask {
PipeEventCommitManager.getInstance()
.deregister(pipeName, creationTime, CONFIG_REGION_ID.getId());
- PipeConfigRegionConnectorMetrics.getInstance().deregister(taskID);
+ PipeConfigRegionSinkMetrics.getInstance().deregister(taskID);
try {
extractor.close();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskAgent.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskAgent.java
index b79fd8da94f..3f66d8aa7c0 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskAgent.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskAgent.java
@@ -31,10 +31,10 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent;
-import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningFilter;
import org.apache.iotdb.confignode.manager.pipe.metric.overview.PipeConfigNodeRemainingTimeMetrics;
-import org.apache.iotdb.confignode.manager.pipe.metric.source.PipeConfigRegionExtractorMetrics;
+import org.apache.iotdb.confignode.manager.pipe.metric.source.PipeConfigRegionSourceMetrics;
import org.apache.iotdb.confignode.manager.pipe.resource.PipeConfigNodeResourceManager;
+import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningFilter;
import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatReq;
import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaRespExceptionMessage;
import org.apache.iotdb.pipe.api.exception.PipeException;
@@ -225,7 +225,7 @@ public class PipeConfigNodeTaskAgent extends PipeTaskAgent {
final PipeStaticMeta staticMeta = pipeMeta.getStaticMeta();
final long remainingEventCount =
- PipeConfigRegionExtractorMetrics.getInstance()
+ PipeConfigRegionSourceMetrics.getInstance()
.getRemainingEventCount(staticMeta.getPipeName(), staticMeta.getCreationTime());
final double estimatedRemainingTime =
PipeConfigNodeRemainingTimeMetrics.getInstance()
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskBuilder.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskBuilder.java
index 6a6b6f34d3a..bab8badcb59 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskBuilder.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskBuilder.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
-import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningFilter;
+import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningFilter;
import java.util.HashMap;
import java.util.Map;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeatParser.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeatParser.java
index bb046102283..56f1a0492de 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeatParser.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeatParser.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.confignode.manager.pipe.coordinator.runtime.heartbeat;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorCriticalException;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException;
+import org.apache.iotdb.commons.exception.pipe.PipeRuntimeSinkCriticalException;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
@@ -254,7 +254,7 @@ public class PipeHeartbeatParser {
pipeName);
}
- if (exception instanceof PipeRuntimeConnectorCriticalException) {
+ if (exception instanceof PipeRuntimeSinkCriticalException) {
((PipeTableResp) pipeTaskInfo.get().showPipes())
.filter(true, pipeName).getAllPipeMeta().stream()
.filter(pipeMeta -> !pipeMeta.getStaticMeta().getPipeName().equals(pipeName))
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetrics.java
index 2f3010f9c10..912e6ae25aa 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetrics.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetrics.java
@@ -26,9 +26,9 @@ import org.apache.iotdb.confignode.manager.pipe.metric.overview.PipeProcedureMet
import org.apache.iotdb.confignode.manager.pipe.metric.overview.PipeTaskInfoMetrics;
import org.apache.iotdb.confignode.manager.pipe.metric.overview.PipeTemporaryMetaInCoordinatorMetrics;
import org.apache.iotdb.confignode.manager.pipe.metric.receiver.PipeConfigNodeReceiverMetrics;
-import org.apache.iotdb.confignode.manager.pipe.metric.sink.PipeConfigRegionConnectorMetrics;
+import org.apache.iotdb.confignode.manager.pipe.metric.sink.PipeConfigRegionSinkMetrics;
import org.apache.iotdb.confignode.manager.pipe.metric.source.PipeConfigNodeListenerMetrics;
-import org.apache.iotdb.confignode.manager.pipe.metric.source.PipeConfigRegionExtractorMetrics;
+import org.apache.iotdb.confignode.manager.pipe.metric.source.PipeConfigRegionSourceMetrics;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
@@ -47,8 +47,8 @@ public class PipeConfigNodeMetrics implements IMetricSet {
PipeProcedureMetrics.getInstance().bindTo(metricService);
pipeTaskInfoMetrics.bindTo(metricService);
PipeConfigNodeListenerMetrics.getInstance().bindTo(metricService);
- PipeConfigRegionExtractorMetrics.getInstance().bindTo(metricService);
- PipeConfigRegionConnectorMetrics.getInstance().bindTo(metricService);
+ PipeConfigRegionSourceMetrics.getInstance().bindTo(metricService);
+ PipeConfigRegionSinkMetrics.getInstance().bindTo(metricService);
PipeConfigNodeRemainingTimeMetrics.getInstance().bindTo(metricService);
PipeTemporaryMetaInCoordinatorMetrics.getInstance().bindTo(metricService);
PipeConfigNodeReceiverMetrics.getInstance().bindTo(metricService);
@@ -60,8 +60,8 @@ public class PipeConfigNodeMetrics implements IMetricSet {
PipeProcedureMetrics.getInstance().unbindFrom(metricService);
pipeTaskInfoMetrics.unbindFrom(metricService);
PipeConfigNodeListenerMetrics.getInstance().unbindFrom(metricService);
- PipeConfigRegionExtractorMetrics.getInstance().unbindFrom(metricService);
- PipeConfigRegionConnectorMetrics.getInstance().unbindFrom(metricService);
+ PipeConfigRegionSourceMetrics.getInstance().unbindFrom(metricService);
+ PipeConfigRegionSinkMetrics.getInstance().unbindFrom(metricService);
PipeConfigNodeRemainingTimeMetrics.getInstance().unbindFrom(metricService);
PipeTemporaryMetaInCoordinatorMetrics.getInstance().unbindFrom(metricService);
PipeConfigNodeReceiverMetrics.getInstance().unbindFrom(metricService);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeMetrics.java
index 7cbdc4eecc3..bd4f42042a1 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeMetrics.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeMetrics.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.confignode.manager.pipe.metric.overview;
import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.confignode.manager.pipe.extractor.IoTDBConfigRegionExtractor;
+import org.apache.iotdb.confignode.manager.pipe.source.IoTDBConfigRegionSource;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -99,7 +99,7 @@ public class PipeConfigNodeRemainingTimeMetrics implements IMetricSet {
//////////////////////////// register & deregister (pipe integration) ////////////////////////////
- public void register(final IoTDBConfigRegionExtractor extractor) {
+ public void register(final IoTDBConfigRegionSource extractor) {
// The metric is global thus the regionId is omitted
final String pipeID = extractor.getPipeName() + "_" + extractor.getCreationTime();
remainingTimeOperatorMap
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeOperator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeOperator.java
index 0b2f79ecfb1..c27e4cd898b 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeOperator.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeOperator.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.commons.enums.PipeRateAverage;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
import org.apache.iotdb.commons.pipe.metric.PipeRemainingOperator;
import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtask;
-import org.apache.iotdb.confignode.manager.pipe.extractor.IoTDBConfigRegionExtractor;
+import org.apache.iotdb.confignode.manager.pipe.source.IoTDBConfigRegionSource;
import com.codahale.metrics.Clock;
import com.codahale.metrics.ExponentialMovingAverages;
@@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicReference;
class PipeConfigNodeRemainingTimeOperator extends PipeRemainingOperator {
- private final Set<IoTDBConfigRegionExtractor> configRegionExtractors =
+ private final Set<IoTDBConfigRegionSource> configRegionExtractors =
Collections.newSetFromMap(new ConcurrentHashMap<>());
private final AtomicReference<Meter> configRegionCommitMeter = new AtomicReference<>(null);
@@ -62,7 +62,7 @@ class PipeConfigNodeRemainingTimeOperator extends PipeRemainingOperator {
// Do not calculate heartbeat event
final long totalConfigRegionWriteEventCount =
configRegionExtractors.stream()
- .map(IoTDBConfigRegionExtractor::getUnTransferredEventCount)
+ .map(IoTDBConfigRegionSource::getUnTransferredEventCount)
.reduce(Long::sum)
.orElse(0L);
@@ -94,7 +94,7 @@ class PipeConfigNodeRemainingTimeOperator extends PipeRemainingOperator {
//////////////////////////// Register & deregister (pipe integration) ////////////////////////////
- void register(final IoTDBConfigRegionExtractor extractor) {
+ void register(final IoTDBConfigRegionSource extractor) {
configRegionExtractors.add(extractor);
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/sink/PipeConfigRegionConnectorMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/sink/PipeConfigRegionSinkMetrics.java
similarity index 92%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/sink/PipeConfigRegionConnectorMetrics.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/sink/PipeConfigRegionSinkMetrics.java
index 85952fbb008..aa3661440fa 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/sink/PipeConfigRegionConnectorMetrics.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/sink/PipeConfigRegionSinkMetrics.java
@@ -36,10 +36,9 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-public class PipeConfigRegionConnectorMetrics implements IMetricSet {
+public class PipeConfigRegionSinkMetrics implements IMetricSet {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeConfigRegionConnectorMetrics.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeConfigRegionSinkMetrics.class);
@SuppressWarnings("java:S3077")
private volatile AbstractMetricService metricService;
@@ -140,19 +139,18 @@ public class PipeConfigRegionConnectorMetrics implements IMetricSet {
private static class PipeConfigNodeSubtaskMetricsHolder {
- private static final PipeConfigRegionConnectorMetrics INSTANCE =
- new PipeConfigRegionConnectorMetrics();
+ private static final PipeConfigRegionSinkMetrics INSTANCE = new PipeConfigRegionSinkMetrics();
private PipeConfigNodeSubtaskMetricsHolder() {
// Empty constructor
}
}
- public static PipeConfigRegionConnectorMetrics getInstance() {
+ public static PipeConfigRegionSinkMetrics getInstance() {
return PipeConfigNodeSubtaskMetricsHolder.INSTANCE;
}
- private PipeConfigRegionConnectorMetrics() {
+ private PipeConfigRegionSinkMetrics() {
// Empty constructor
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigNodeListenerMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigNodeListenerMetrics.java
index 5c0cc6b0117..5cfc1a0f622 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigNodeListenerMetrics.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigNodeListenerMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.confignode.manager.pipe.metric.source;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent;
-import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningQueue;
+import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningQueue;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionExtractorMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionSourceMetrics.java
similarity index 82%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionExtractorMetrics.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionSourceMetrics.java
index aedf3057acc..7219dcac67f 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionExtractorMetrics.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionSourceMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.confignode.manager.pipe.metric.source;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.confignode.manager.pipe.extractor.IoTDBConfigRegionExtractor;
+import org.apache.iotdb.confignode.manager.pipe.source.IoTDBConfigRegionSource;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -35,14 +35,13 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-public class PipeConfigRegionExtractorMetrics implements IMetricSet {
+public class PipeConfigRegionSourceMetrics implements IMetricSet {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeConfigRegionExtractorMetrics.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeConfigRegionSourceMetrics.class);
private volatile AbstractMetricService metricService;
- private final Map<String, IoTDBConfigRegionExtractor> extractorMap = new ConcurrentHashMap<>();
+ private final Map<String, IoTDBConfigRegionSource> extractorMap = new ConcurrentHashMap<>();
//////////////////////////// bindTo & unbindFrom (metric framework) ////////////////////////////
@@ -57,12 +56,12 @@ public class PipeConfigRegionExtractorMetrics implements IMetricSet {
}
private void createAutoGauge(final String taskID) {
- final IoTDBConfigRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBConfigRegionSource extractor = extractorMap.get(taskID);
metricService.createAutoGauge(
Metric.UNTRANSFERRED_CONFIG_COUNT.toString(),
MetricLevel.IMPORTANT,
extractorMap.get(taskID),
- IoTDBConfigRegionExtractor::getUnTransferredEventCount,
+ IoTDBConfigRegionSource::getUnTransferredEventCount,
Tag.NAME.toString(),
extractor.getPipeName(),
Tag.CREATION_TIME.toString(),
@@ -83,7 +82,7 @@ public class PipeConfigRegionExtractorMetrics implements IMetricSet {
}
private void removeAutoGauge(final String taskID) {
- final IoTDBConfigRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBConfigRegionSource extractor = extractorMap.get(taskID);
// Pending event count
metricService.remove(
MetricType.AUTO_GAUGE,
@@ -96,7 +95,7 @@ public class PipeConfigRegionExtractorMetrics implements IMetricSet {
//////////////////////////// pipe integration ////////////////////////////
- public void register(final IoTDBConfigRegionExtractor extractor) {
+ public void register(final IoTDBConfigRegionSource extractor) {
final String taskID = extractor.getTaskID();
extractorMap.putIfAbsent(taskID, extractor);
if (Objects.nonNull(metricService)) {
@@ -121,7 +120,7 @@ public class PipeConfigRegionExtractorMetrics implements IMetricSet {
public long getRemainingEventCount(final String pipeName, final long creationTime) {
final String taskID = pipeName + "_" + creationTime;
- final IoTDBConfigRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBConfigRegionSource extractor = extractorMap.get(taskID);
// Do not print log to allow collection when config region extractor does not exists
if (Objects.isNull(extractor)) {
return 0;
@@ -133,19 +132,19 @@ public class PipeConfigRegionExtractorMetrics implements IMetricSet {
private static class PipeConfigRegionExtractorMetricsHolder {
- private static final PipeConfigRegionExtractorMetrics INSTANCE =
- new PipeConfigRegionExtractorMetrics();
+ private static final PipeConfigRegionSourceMetrics INSTANCE =
+ new PipeConfigRegionSourceMetrics();
private PipeConfigRegionExtractorMetricsHolder() {
// Empty constructor
}
}
- public static PipeConfigRegionExtractorMetrics getInstance() {
+ public static PipeConfigRegionSourceMetrics getInstance() {
return PipeConfigRegionExtractorMetricsHolder.INSTANCE;
}
- private PipeConfigRegionExtractorMetrics() {
+ private PipeConfigRegionSourceMetrics() {
// Empty constructor
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
index 6ed7abb2b65..5d00996ec61 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
@@ -26,15 +26,15 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.commons.pipe.connector.payload.airgap.AirGapPseudoTPipeTransferRequest;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferCompressedReq;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV1;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV2;
import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
import org.apache.iotdb.commons.pipe.receiver.IoTDBFileReceiver;
import org.apache.iotdb.commons.pipe.receiver.PipeReceiverStatusHandler;
+import org.apache.iotdb.commons.pipe.sink.payload.airgap.AirGapPseudoTPipeTransferRequest;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferCompressedReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV1;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV2;
import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.table.TreeViewSchema;
import org.apache.iotdb.commons.schema.table.TsTable;
@@ -78,16 +78,16 @@ import org.apache.iotdb.confignode.consensus.request.write.template.CommitSetSch
import org.apache.iotdb.confignode.consensus.request.write.template.ExtendSchemaTemplatePlan;
import org.apache.iotdb.confignode.consensus.request.write.trigger.DeleteTriggerInTablePlan;
import org.apache.iotdb.confignode.manager.ConfigManager;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigNodeHandshakeV1Req;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigNodeHandshakeV2Req;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigPlanReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotPieceReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotSealReq;
import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionSnapshotEvent;
-import org.apache.iotdb.confignode.manager.pipe.extractor.IoTDBConfigRegionExtractor;
import org.apache.iotdb.confignode.manager.pipe.metric.receiver.PipeConfigNodeReceiverMetrics;
import org.apache.iotdb.confignode.manager.pipe.receiver.visitor.PipeConfigPhysicalPlanExceptionVisitor;
import org.apache.iotdb.confignode.manager.pipe.receiver.visitor.PipeConfigPhysicalPlanTSStatusVisitor;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigNodeHandshakeV1Req;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigNodeHandshakeV2Req;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigPlanReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotPieceReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotSealReq;
+import org.apache.iotdb.confignode.manager.pipe.source.IoTDBConfigRegionSource;
import org.apache.iotdb.confignode.persistence.schema.CNPhysicalPlanGenerator;
import org.apache.iotdb.confignode.persistence.schema.CNSnapshotFileType;
import org.apache.iotdb.confignode.persistence.schema.ConfigNodeSnapshotParser;
@@ -1052,10 +1052,10 @@ public class IoTDBConfigNodeReceiver extends IoTDBFileReceiver {
parameters.get(ColumnHeaderConstant.TABLE_NAME));
final List<TSStatus> results = new ArrayList<>();
while (generator.hasNext()) {
- IoTDBConfigRegionExtractor.parseConfigPlan(generator.next(), treePattern, tablePattern)
+ IoTDBConfigRegionSource.parseConfigPlan(generator.next(), treePattern, tablePattern)
.filter(
configPhysicalPlan ->
- IoTDBConfigRegionExtractor.isTypeListened(
+ IoTDBConfigRegionSource.isTypeListened(
configPhysicalPlan, executionTypes, treePattern, tablePattern))
.ifPresent(
configPhysicalPlan ->
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/client/IoTDBConfigNodeSyncClientManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/client/IoTDBConfigNodeSyncClientManager.java
similarity index 85%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/client/IoTDBConfigNodeSyncClientManager.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/client/IoTDBConfigNodeSyncClientManager.java
index a1bc26252b5..8b6fb03f047 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/client/IoTDBConfigNodeSyncClientManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/client/IoTDBConfigNodeSyncClientManager.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.client;
+package org.apache.iotdb.confignode.manager.pipe.sink.client;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClientManager;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferHandshakeV2Req;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigNodeHandshakeV1Req;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigNodeHandshakeV2Req;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClientManager;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferHandshakeV2Req;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigNodeHandshakeV1Req;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigNodeHandshakeV2Req;
import org.apache.iotdb.confignode.service.ConfigNode;
import java.io.IOException;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigNodeHandshakeV1Req.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigNodeHandshakeV1Req.java
similarity index 90%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigNodeHandshakeV1Req.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigNodeHandshakeV1Req.java
index c161081782c..bc45cd8c5d1 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigNodeHandshakeV1Req.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigNodeHandshakeV1Req.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.payload;
+package org.apache.iotdb.confignode.manager.pipe.sink.payload;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferHandshakeV1Req;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferHandshakeV1Req;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigNodeHandshakeV2Req.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigNodeHandshakeV2Req.java
similarity index 90%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigNodeHandshakeV2Req.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigNodeHandshakeV2Req.java
index f19b94ffed2..57c572dbf17 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigNodeHandshakeV2Req.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigNodeHandshakeV2Req.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.payload;
+package org.apache.iotdb.confignode.manager.pipe.sink.payload;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferHandshakeV2Req;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferHandshakeV2Req;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigPlanReq.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigPlanReq.java
similarity index 86%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigPlanReq.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigPlanReq.java
index ee9140bfb4f..4bbaf77da23 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigPlanReq.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigPlanReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.payload;
+package org.apache.iotdb.confignode.manager.pipe.sink.payload;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -42,7 +42,7 @@ public class PipeTransferConfigPlanReq extends TPipeTransferReq {
public static PipeTransferConfigPlanReq toTPipeTransferReq(IConsensusRequest consensusRequest) {
final PipeTransferConfigPlanReq req = new PipeTransferConfigPlanReq();
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_CONFIG_PLAN.getType();
req.body = consensusRequest.serializeToByteBuffer();
@@ -64,7 +64,7 @@ public class PipeTransferConfigPlanReq extends TPipeTransferReq {
public static byte[] toTPipeTransferBytes(IConsensusRequest consensusRequest) throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(PipeRequestType.TRANSFER_CONFIG_PLAN.getType(), outputStream);
return BytesUtils.concatByteArray(
byteArrayOutputStream.toByteArray(), consensusRequest.serializeToByteBuffer().array());
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotPieceReq.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigSnapshotPieceReq.java
similarity index 90%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotPieceReq.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigSnapshotPieceReq.java
index 1be784d1a5e..b05f98518cb 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotPieceReq.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigSnapshotPieceReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.payload;
+package org.apache.iotdb.confignode.manager.pipe.sink.payload;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotSealReq.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigSnapshotSealReq.java
similarity index 95%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotSealReq.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigSnapshotSealReq.java
index 1794f227774..1162e8ade94 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotSealReq.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigSnapshotSealReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.payload;
+package org.apache.iotdb.confignode.manager.pipe.sink.payload;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV2;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV2;
import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.persistence.schema.CNSnapshotFileType;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionAirGapConnector.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/protocol/IoTDBConfigRegionAirGapSink.java
similarity index 89%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionAirGapConnector.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/protocol/IoTDBConfigRegionAirGapSink.java
index 9e9976bc3dc..5f32bae8c27 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionAirGapConnector.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/protocol/IoTDBConfigRegionAirGapSink.java
@@ -17,20 +17,20 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.protocol;
+package org.apache.iotdb.confignode.manager.pipe.sink.protocol;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.common.PipeTransferHandshakeConstant;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBAirGapConnector;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigNodeHandshakeV1Req;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigNodeHandshakeV2Req;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigPlanReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotPieceReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotSealReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.common.PipeTransferHandshakeConstant;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBAirGapSink;
import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionSnapshotEvent;
import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionWritePlanEvent;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigNodeHandshakeV1Req;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigNodeHandshakeV2Req;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigPlanReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotPieceReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotSealReq;
import org.apache.iotdb.confignode.service.ConfigNode;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.pipe.api.annotation.TableModel;
@@ -52,10 +52,9 @@ import java.util.Objects;
@TreeModel
@TableModel
-public class IoTDBConfigRegionAirGapConnector extends IoTDBAirGapConnector {
+public class IoTDBConfigRegionAirGapSink extends IoTDBAirGapSink {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(IoTDBConfigRegionAirGapConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConfigRegionAirGapSink.class);
@Override
protected byte[] generateHandShakeV1Payload() throws IOException {
@@ -156,14 +155,14 @@ public class IoTDBConfigRegionAirGapConnector extends IoTDBAirGapConnector {
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeConfigRegionWritePlanEvent.increaseReferenceCount(
- IoTDBConfigRegionAirGapConnector.class.getName())) {
+ IoTDBConfigRegionAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeConfigRegionWritePlanEvent);
} finally {
pipeConfigRegionWritePlanEvent.decreaseReferenceCount(
- IoTDBConfigRegionAirGapConnector.class.getName(), false);
+ IoTDBConfigRegionAirGapSink.class.getName(), false);
}
}
@@ -197,14 +196,14 @@ public class IoTDBConfigRegionAirGapConnector extends IoTDBAirGapConnector {
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeConfigRegionSnapshotEvent.increaseReferenceCount(
- IoTDBConfigRegionAirGapConnector.class.getName())) {
+ IoTDBConfigRegionAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeConfigRegionSnapshotEvent);
} finally {
pipeConfigRegionSnapshotEvent.decreaseReferenceCount(
- IoTDBConfigRegionAirGapConnector.class.getName(), false);
+ IoTDBConfigRegionAirGapSink.class.getName(), false);
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionConnector.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/protocol/IoTDBConfigRegionSink.java
similarity index 90%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionConnector.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/protocol/IoTDBConfigRegionSink.java
index 351887d2cfc..e846410b5e7 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionConnector.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/protocol/IoTDBConfigRegionSink.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector.protocol;
+package org.apache.iotdb.confignode.manager.pipe.sink.protocol;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClientManager;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBSslSyncConnector;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClient;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClientManager;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSslSyncSink;
import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.manager.pipe.connector.client.IoTDBConfigNodeSyncClientManager;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigPlanReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotPieceReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotSealReq;
import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionSnapshotEvent;
import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionWritePlanEvent;
+import org.apache.iotdb.confignode.manager.pipe.sink.client.IoTDBConfigNodeSyncClientManager;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigPlanReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotPieceReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotSealReq;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -56,9 +56,9 @@ import java.util.Objects;
@TreeModel
@TableModel
-public class IoTDBConfigRegionConnector extends IoTDBSslSyncConnector {
+public class IoTDBConfigRegionSink extends IoTDBSslSyncSink {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConfigRegionConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConfigRegionSink.class);
@Override
protected IoTDBSyncClientManager constructClient(
@@ -136,14 +136,14 @@ public class IoTDBConfigRegionConnector extends IoTDBSslSyncConnector {
final PipeConfigRegionWritePlanEvent pipeConfigRegionWritePlanEvent) throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeConfigRegionWritePlanEvent.increaseReferenceCount(
- IoTDBConfigRegionConnector.class.getName())) {
+ IoTDBConfigRegionSink.class.getName())) {
return;
}
try {
doTransfer(pipeConfigRegionWritePlanEvent);
} finally {
pipeConfigRegionWritePlanEvent.decreaseReferenceCount(
- IoTDBConfigRegionConnector.class.getName(), false);
+ IoTDBConfigRegionSink.class.getName(), false);
}
}
@@ -197,14 +197,14 @@ public class IoTDBConfigRegionConnector extends IoTDBSslSyncConnector {
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeConfigRegionSnapshotEvent.increaseReferenceCount(
- IoTDBConfigRegionConnector.class.getName())) {
+ IoTDBConfigRegionSink.class.getName())) {
return;
}
try {
doTransfer(pipeConfigRegionSnapshotEvent);
} finally {
pipeConfigRegionSnapshotEvent.decreaseReferenceCount(
- IoTDBConfigRegionConnector.class.getName(), false);
+ IoTDBConfigRegionSink.class.getName(), false);
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/ConfigRegionListeningFilter.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningFilter.java
similarity index 99%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/ConfigRegionListeningFilter.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningFilter.java
index 40000a67f70..d251705aca9 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/ConfigRegionListeningFilter.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/ConfigRegionListeningQueue.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningQueue.java
similarity index 99%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/ConfigRegionListeningQueue.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningQueue.java
index d352dc34f3d..94ea7a54dde 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/ConfigRegionListeningQueue.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningQueue.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.user.LocalFileUserAccessor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/IoTDBConfigRegionExtractor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/IoTDBConfigRegionSource.java
similarity index 97%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/IoTDBConfigRegionExtractor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/IoTDBConfigRegionSource.java
index e8ffe69d2d6..685e7b08451 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/IoTDBConfigRegionExtractor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/IoTDBConfigRegionSource.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.auth.entity.PrivilegeUnion;
@@ -31,7 +31,7 @@ import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeL
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent;
import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent;
-import org.apache.iotdb.commons.pipe.extractor.IoTDBNonDataRegionExtractor;
+import org.apache.iotdb.commons.pipe.source.IoTDBNonDataRegionSource;
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
@@ -43,7 +43,7 @@ import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent;
import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionSnapshotEvent;
import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionWritePlanEvent;
import org.apache.iotdb.confignode.manager.pipe.metric.overview.PipeConfigNodeRemainingTimeMetrics;
-import org.apache.iotdb.confignode.manager.pipe.metric.source.PipeConfigRegionExtractorMetrics;
+import org.apache.iotdb.confignode.manager.pipe.metric.source.PipeConfigRegionSourceMetrics;
import org.apache.iotdb.confignode.persistence.schema.CNPhysicalPlanGenerator;
import org.apache.iotdb.confignode.persistence.schema.ConfigNodeSnapshotParser;
import org.apache.iotdb.confignode.service.ConfigNode;
@@ -65,7 +65,7 @@ import java.util.Set;
@TreeModel
@TableModel
-public class IoTDBConfigRegionExtractor extends IoTDBNonDataRegionExtractor {
+public class IoTDBConfigRegionSource extends IoTDBNonDataRegionSource {
public static final PipeConfigPhysicalPlanTreePatternParseVisitor TREE_PATTERN_PARSE_VISITOR =
new PipeConfigPhysicalPlanTreePatternParseVisitor();
@@ -97,7 +97,7 @@ public class IoTDBConfigRegionExtractor extends IoTDBNonDataRegionExtractor {
super.customize(parameters, configuration);
listenedTypeSet = ConfigRegionListeningFilter.parseListeningPlanTypeSet(parameters);
- PipeConfigRegionExtractorMetrics.getInstance().register(this);
+ PipeConfigRegionSourceMetrics.getInstance().register(this);
PipeConfigNodeRemainingTimeMetrics.getInstance().register(this);
}
@@ -337,7 +337,7 @@ public class IoTDBConfigRegionExtractor extends IoTDBNonDataRegionExtractor {
super.close();
if (Objects.nonNull(taskID)) {
- PipeConfigRegionExtractorMetrics.getInstance().deregister(taskID);
+ PipeConfigRegionSourceMetrics.getInstance().deregister(taskID);
PipeConfigNodeRemainingTimeMetrics.getInstance().deregister(pipeName + "_" + creationTime);
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePatternParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePatternParseVisitor.java
similarity index 99%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePatternParseVisitor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePatternParseVisitor.java
index 3eeb24598b9..7d121a58422 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePatternParseVisitor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePatternParseVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
import org.apache.iotdb.commons.utils.PathUtils;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePrivilegeParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePrivilegeParseVisitor.java
similarity index 99%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePrivilegeParseVisitor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePrivilegeParseVisitor.java
index 458e61fac44..40ab6d7a096 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePrivilegeParseVisitor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePrivilegeParseVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.auth.entity.PrivilegeUnion;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTableScopeParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTableScopeParseVisitor.java
similarity index 98%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTableScopeParseVisitor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTableScopeParseVisitor.java
index e5673c0dafd..e94511fd41e 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTableScopeParseVisitor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTableScopeParseVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreePatternParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreePatternParseVisitor.java
similarity index 99%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreePatternParseVisitor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreePatternParseVisitor.java
index 156cc67cf44..992b74ca0e5 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreePatternParseVisitor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreePatternParseVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.path.PartialPath;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreeScopeParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreeScopeParseVisitor.java
similarity index 98%
rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreeScopeParseVisitor.java
rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreeScopeParseVisitor.java
index 175b836532f..a1459c0f596 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreeScopeParseVisitor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreeScopeParseVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java
index c4971e7f737..280a891b598 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipePluginInfo.java
@@ -26,9 +26,9 @@ import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta;
import org.apache.iotdb.commons.pipe.agent.plugin.service.PipePluginClassLoader;
import org.apache.iotdb.commons.pipe.agent.plugin.service.PipePluginClassLoaderManager;
import org.apache.iotdb.commons.pipe.agent.plugin.service.PipePluginExecutableManager;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
import org.apache.iotdb.commons.pipe.config.constant.PipeProcessorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.pipe.datastructure.visibility.VisibilityUtils;
import org.apache.iotdb.commons.snapshot.SnapshotProcessor;
import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
@@ -167,7 +167,7 @@ public class PipePluginInfo implements SnapshotProcessor {
final PipeParameters extractorParameters = new PipeParameters(extractorAttributes);
final String extractorPluginName =
extractorParameters.getStringOrDefault(
- Arrays.asList(PipeExtractorConstant.EXTRACTOR_KEY, PipeExtractorConstant.SOURCE_KEY),
+ Arrays.asList(PipeSourceConstant.EXTRACTOR_KEY, PipeSourceConstant.SOURCE_KEY),
IOTDB_EXTRACTOR.getPipePluginName());
if (!pipePluginMetaKeeper.containsPipePlugin(extractorPluginName)) {
final String exceptionMessage =
@@ -194,7 +194,7 @@ public class PipePluginInfo implements SnapshotProcessor {
final PipeParameters connectorParameters = new PipeParameters(connectorAttributes);
final String connectorPluginName =
connectorParameters.getStringOrDefault(
- Arrays.asList(PipeConnectorConstant.CONNECTOR_KEY, PipeConnectorConstant.SINK_KEY),
+ Arrays.asList(PipeSinkConstant.CONNECTOR_KEY, PipeSinkConstant.SINK_KEY),
IOTDB_THRIFT_CONNECTOR.getPipePluginName());
if (!pipePluginMetaKeeper.containsPipePlugin(connectorPluginName)) {
final String exceptionMessage =
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
index 30333c66768..293636a047e 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfo.java
@@ -34,9 +34,9 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTemporaryMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTemporaryMetaInCoordinator;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeType;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
import org.apache.iotdb.commons.pipe.config.constant.PipeProcessorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.snapshot.SnapshotProcessor;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleLeaderChangePlan;
@@ -399,7 +399,7 @@ public class PipeTaskInfo implements SnapshotProcessor {
PipeParameters extractorParameters = pipeMeta.getStaticMeta().getExtractorParameters();
final String extractorPluginName =
extractorParameters.getStringOrDefault(
- Arrays.asList(PipeExtractorConstant.EXTRACTOR_KEY, PipeExtractorConstant.SOURCE_KEY),
+ Arrays.asList(PipeSourceConstant.EXTRACTOR_KEY, PipeSourceConstant.SOURCE_KEY),
BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName());
if (pluginName.equals(extractorPluginName)) {
String exceptionMessage =
@@ -423,7 +423,7 @@ public class PipeTaskInfo implements SnapshotProcessor {
PipeParameters connectorParameters = pipeMeta.getStaticMeta().getConnectorParameters();
final String connectorPluginName =
connectorParameters.getStringOrDefault(
- Arrays.asList(PipeConnectorConstant.CONNECTOR_KEY, PipeConnectorConstant.SINK_KEY),
+ Arrays.asList(PipeSinkConstant.CONNECTOR_KEY, PipeSinkConstant.SINK_KEY),
IOTDB_THRIFT_CONNECTOR.getPipePluginName());
if (pluginName.equals(connectorPluginName)) {
String exceptionMessage =
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
index 7a3a899e1bf..bca1b74b29b 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/AbstractOperatePipeProcedureV2.java
@@ -32,7 +32,7 @@ import org.apache.iotdb.confignode.procedure.state.ProcedureLockState;
import org.apache.iotdb.confignode.procedure.state.pipe.task.OperatePipeTaskState;
import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.confignode.service.ConfigNode;
-import org.apache.iotdb.db.pipe.extractor.dataregion.DataRegionListeningFilter;
+import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter;
import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaResp;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java
index 43b1660681e..ab67185dacd 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeMetaSyncProcedure.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleMetaChangePlan;
import org.apache.iotdb.confignode.persistence.pipe.PipeTaskInfo;
import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv;
@@ -53,9 +53,9 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTERNAL_EXTRACTOR_PARALLELISM_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTERNAL_EXTRACTOR_PARALLELISM_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTERNAL_SOURCE_PARALLELISM_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTERNAL_EXTRACTOR_PARALLELISM_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTERNAL_EXTRACTOR_PARALLELISM_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTERNAL_SOURCE_PARALLELISM_KEY;
public class PipeMetaSyncProcedure extends AbstractOperatePipeProcedureV2 {
@@ -130,10 +130,9 @@ public class PipeMetaSyncProcedure extends AbstractOperatePipeProcedureV2 {
.getExtractorParameters()
.getStringOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTERNAL_EXTRACTOR_BALANCE_STRATEGY_KEY,
- PipeExtractorConstant.EXTERNAL_SOURCE_BALANCE_STRATEGY_KEY),
- PipeExtractorConstant
- .EXTERNAL_EXTRACTOR_BALANCE_PROPORTION_STRATEGY));
+ PipeSourceConstant.EXTERNAL_EXTRACTOR_BALANCE_STRATEGY_KEY,
+ PipeSourceConstant.EXTERNAL_SOURCE_BALANCE_STRATEGY_KEY),
+ PipeSourceConstant.EXTERNAL_EXTRACTOR_BALANCE_PROPORTION_STRATEGY));
final int parallelism =
pipeMeta
.getStaticMeta()
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
index a1305e99d28..2f9c36932d9 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/AlterPipeProcedureV2.java
@@ -25,8 +25,8 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
@@ -102,17 +102,17 @@ public class AlterPipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
final boolean checkSource =
new PipeParameters(alterPipeRequest.getExtractorAttributes())
.hasAnyAttributes(
- PipeExtractorConstant.EXTRACTOR_IOTDB_USER_KEY,
- PipeExtractorConstant.SOURCE_IOTDB_USER_KEY,
- PipeExtractorConstant.EXTRACTOR_IOTDB_USERNAME_KEY,
- PipeExtractorConstant.SOURCE_IOTDB_USERNAME_KEY);
+ PipeSourceConstant.EXTRACTOR_IOTDB_USER_KEY,
+ PipeSourceConstant.SOURCE_IOTDB_USER_KEY,
+ PipeSourceConstant.EXTRACTOR_IOTDB_USERNAME_KEY,
+ PipeSourceConstant.SOURCE_IOTDB_USERNAME_KEY);
final boolean checkSink =
new PipeParameters(alterPipeRequest.getConnectorAttributes())
.hasAnyAttributes(
- PipeConnectorConstant.CONNECTOR_IOTDB_USER_KEY,
- PipeConnectorConstant.SINK_IOTDB_USER_KEY,
- PipeConnectorConstant.CONNECTOR_IOTDB_USERNAME_KEY,
- PipeConnectorConstant.SINK_IOTDB_USERNAME_KEY);
+ PipeSinkConstant.CONNECTOR_IOTDB_USER_KEY,
+ PipeSinkConstant.SINK_IOTDB_USER_KEY,
+ PipeSinkConstant.CONNECTOR_IOTDB_USERNAME_KEY,
+ PipeSinkConstant.SINK_IOTDB_USERNAME_KEY);
pipeTaskInfo.get().checkAndUpdateRequestBeforeAlterPipe(alterPipeRequest);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
index 130d964f240..004a3ab47fb 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java
@@ -31,8 +31,8 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeType;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.write.pipe.task.CreatePipePlanV2;
@@ -67,11 +67,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicReference;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTERNAL_EXTRACTOR_PARALLELISM_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTERNAL_EXTRACTOR_PARALLELISM_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTERNAL_SOURCE_PARALLELISM_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_CONSENSUS_GROUP_ID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_CONSENSUS_SENDER_DATANODE_ID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTERNAL_EXTRACTOR_PARALLELISM_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTERNAL_EXTRACTOR_PARALLELISM_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTERNAL_SOURCE_PARALLELISM_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_CONSENSUS_GROUP_ID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_CONSENSUS_SENDER_DATANODE_ID_KEY;
public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
@@ -162,8 +162,7 @@ public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
final String pluginName =
extractorParameters
.getStringOrDefault(
- Arrays.asList(
- PipeExtractorConstant.EXTRACTOR_KEY, PipeExtractorConstant.SOURCE_KEY),
+ Arrays.asList(PipeSourceConstant.EXTRACTOR_KEY, PipeSourceConstant.SOURCE_KEY),
BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName())
.toLowerCase();
@@ -172,29 +171,29 @@ public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
return;
}
- if (extractorParameters.hasAttribute(PipeExtractorConstant.EXTRACTOR_IOTDB_USER_KEY)
- || extractorParameters.hasAttribute(PipeExtractorConstant.SOURCE_IOTDB_USER_KEY)
- || extractorParameters.hasAttribute(PipeExtractorConstant.EXTRACTOR_IOTDB_USERNAME_KEY)
- || extractorParameters.hasAttribute(PipeExtractorConstant.SOURCE_IOTDB_USERNAME_KEY)) {
+ if (extractorParameters.hasAttribute(PipeSourceConstant.EXTRACTOR_IOTDB_USER_KEY)
+ || extractorParameters.hasAttribute(PipeSourceConstant.SOURCE_IOTDB_USER_KEY)
+ || extractorParameters.hasAttribute(PipeSourceConstant.EXTRACTOR_IOTDB_USERNAME_KEY)
+ || extractorParameters.hasAttribute(PipeSourceConstant.SOURCE_IOTDB_USERNAME_KEY)) {
final String hashedPassword =
env.getConfigManager()
.getPermissionManager()
.login4Pipe(
extractorParameters.getStringByKeys(
- PipeExtractorConstant.EXTRACTOR_IOTDB_USER_KEY,
- PipeExtractorConstant.SOURCE_IOTDB_USER_KEY,
- PipeExtractorConstant.EXTRACTOR_IOTDB_USERNAME_KEY,
- PipeExtractorConstant.SOURCE_IOTDB_USERNAME_KEY),
+ PipeSourceConstant.EXTRACTOR_IOTDB_USER_KEY,
+ PipeSourceConstant.SOURCE_IOTDB_USER_KEY,
+ PipeSourceConstant.EXTRACTOR_IOTDB_USERNAME_KEY,
+ PipeSourceConstant.SOURCE_IOTDB_USERNAME_KEY),
extractorParameters.getStringByKeys(
- PipeExtractorConstant.EXTRACTOR_IOTDB_PASSWORD_KEY,
- PipeExtractorConstant.SOURCE_IOTDB_PASSWORD_KEY));
+ PipeSourceConstant.EXTRACTOR_IOTDB_PASSWORD_KEY,
+ PipeSourceConstant.SOURCE_IOTDB_PASSWORD_KEY));
if (Objects.isNull(hashedPassword)) {
throw new PipeException("Authentication failed.");
}
extractorParameters.addOrReplaceEquivalentAttributes(
new PipeParameters(
Collections.singletonMap(
- PipeExtractorConstant.SOURCE_IOTDB_PASSWORD_KEY, hashedPassword)));
+ PipeSourceConstant.SOURCE_IOTDB_PASSWORD_KEY, hashedPassword)));
}
}
@@ -205,7 +204,7 @@ public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
final String pluginName =
connectorParameters
.getStringOrDefault(
- Arrays.asList(PipeConnectorConstant.CONNECTOR_KEY, PipeConnectorConstant.SINK_KEY),
+ Arrays.asList(PipeSinkConstant.CONNECTOR_KEY, PipeSinkConstant.SINK_KEY),
BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName())
.toLowerCase();
@@ -214,29 +213,28 @@ public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
return;
}
- if (connectorParameters.hasAttribute(PipeConnectorConstant.CONNECTOR_IOTDB_USER_KEY)
- || connectorParameters.hasAttribute(PipeConnectorConstant.SINK_IOTDB_USER_KEY)
- || connectorParameters.hasAttribute(PipeConnectorConstant.CONNECTOR_IOTDB_USERNAME_KEY)
- || connectorParameters.hasAttribute(PipeConnectorConstant.SINK_IOTDB_USERNAME_KEY)) {
+ if (connectorParameters.hasAttribute(PipeSinkConstant.CONNECTOR_IOTDB_USER_KEY)
+ || connectorParameters.hasAttribute(PipeSinkConstant.SINK_IOTDB_USER_KEY)
+ || connectorParameters.hasAttribute(PipeSinkConstant.CONNECTOR_IOTDB_USERNAME_KEY)
+ || connectorParameters.hasAttribute(PipeSinkConstant.SINK_IOTDB_USERNAME_KEY)) {
final String hashedPassword =
env.getConfigManager()
.getPermissionManager()
.login4Pipe(
connectorParameters.getStringByKeys(
- PipeConnectorConstant.CONNECTOR_IOTDB_USER_KEY,
- PipeConnectorConstant.SINK_IOTDB_USER_KEY,
- PipeConnectorConstant.CONNECTOR_IOTDB_USERNAME_KEY,
- PipeConnectorConstant.SINK_IOTDB_USERNAME_KEY),
+ PipeSinkConstant.CONNECTOR_IOTDB_USER_KEY,
+ PipeSinkConstant.SINK_IOTDB_USER_KEY,
+ PipeSinkConstant.CONNECTOR_IOTDB_USERNAME_KEY,
+ PipeSinkConstant.SINK_IOTDB_USERNAME_KEY),
connectorParameters.getStringByKeys(
- PipeConnectorConstant.CONNECTOR_IOTDB_PASSWORD_KEY,
- PipeConnectorConstant.SINK_IOTDB_PASSWORD_KEY));
+ PipeSinkConstant.CONNECTOR_IOTDB_PASSWORD_KEY,
+ PipeSinkConstant.SINK_IOTDB_PASSWORD_KEY));
if (Objects.isNull(hashedPassword)) {
throw new PipeException("Authentication failed.");
}
connectorParameters.addOrReplaceEquivalentAttributes(
new PipeParameters(
- Collections.singletonMap(
- PipeConnectorConstant.SINK_IOTDB_PASSWORD_KEY, hashedPassword)));
+ Collections.singletonMap(PipeSinkConstant.SINK_IOTDB_PASSWORD_KEY, hashedPassword)));
}
}
@@ -281,9 +279,9 @@ public class CreatePipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
.getExtractorParameters()
.getStringOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTERNAL_EXTRACTOR_BALANCE_STRATEGY_KEY,
- PipeExtractorConstant.EXTERNAL_SOURCE_BALANCE_STRATEGY_KEY),
- PipeExtractorConstant.EXTERNAL_EXTRACTOR_BALANCE_PROPORTION_STRATEGY));
+ PipeSourceConstant.EXTERNAL_EXTRACTOR_BALANCE_STRATEGY_KEY,
+ PipeSourceConstant.EXTERNAL_SOURCE_BALANCE_STRATEGY_KEY),
+ PipeSourceConstant.EXTERNAL_EXTRACTOR_BALANCE_PROPORTION_STRATEGY));
final int parallelism =
pipeStaticMeta
.getExtractorParameters()
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/util/PipeExternalSourceLoadBalancer.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/util/PipeExternalSourceLoadBalancer.java
index 426cc6afbef..06215ba46d1 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/util/PipeExternalSourceLoadBalancer.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/util/PipeExternalSourceLoadBalancer.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.confignode.manager.ConfigManager;
import org.apache.iotdb.pipe.api.exception.PipeException;
@@ -56,7 +56,7 @@ public class PipeExternalSourceLoadBalancer {
public PipeExternalSourceLoadBalancer(final String balanceStrategy) {
switch (balanceStrategy) {
- case PipeExtractorConstant.EXTERNAL_EXTRACTOR_BALANCE_PROPORTION_STRATEGY:
+ case PipeSourceConstant.EXTERNAL_EXTRACTOR_BALANCE_PROPORTION_STRATEGY:
this.strategy = new ProportionalBalanceStrategy();
break;
default:
@@ -99,9 +99,9 @@ public class PipeExternalSourceLoadBalancer {
.getExtractorParameters()
.getBooleanOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTERNAL_EXTRACTOR_SINGLE_INSTANCE_PER_NODE_KEY,
- PipeExtractorConstant.EXTERNAL_SOURCE_SINGLE_INSTANCE_PER_NODE_KEY),
- PipeExtractorConstant.EXTERNAL_EXTRACTOR_SINGLE_INSTANCE_PER_NODE_DEFAULT_VALUE)) {
+ PipeSourceConstant.EXTERNAL_EXTRACTOR_SINGLE_INSTANCE_PER_NODE_KEY,
+ PipeSourceConstant.EXTERNAL_SOURCE_SINGLE_INSTANCE_PER_NODE_KEY),
+ PipeSourceConstant.EXTERNAL_EXTRACTOR_SINGLE_INSTANCE_PER_NODE_DEFAULT_VALUE)) {
final List<Integer> runningDataNodes =
configManager.getLoadManager().filterDataNodeThroughStatus(NodeStatus.Running).stream()
.sorted()
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipePluginTableRespTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipePluginTableRespTest.java
index 2dc09056bea..64551f79203 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipePluginTableRespTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipePluginTableRespTest.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.confignode.consensus.response.pipe;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.iotdb.IoTDBExtractor;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.donothing.DoNothingProcessor;
+import org.apache.iotdb.commons.pipe.agent.plugin.builtin.source.iotdb.IoTDBSource;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta;
import org.apache.iotdb.confignode.consensus.response.pipe.plugin.PipePluginTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TGetPipePluginTableResp;
@@ -41,7 +41,7 @@ public class PipePluginTableRespTest {
public void testConvertToThriftResponse() throws IOException {
TSStatus status = new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
List<PipePluginMeta> pipePluginMetaList = new ArrayList<>();
- pipePluginMetaList.add(new PipePluginMeta("iotdb-extractor", IoTDBExtractor.class.getName()));
+ pipePluginMetaList.add(new PipePluginMeta("iotdb-extractor", IoTDBSource.class.getName()));
pipePluginMetaList.add(
new PipePluginMeta("do-nothing-processor", DoNothingProcessor.class.getName()));
PipePluginTableResp pipePluginTableResp =
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/agent/PipeConfigNodeSubtaskExecutorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/agent/PipeConfigNodeSubtaskExecutorTest.java
index f2fa5b0205a..36ebac63286 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/agent/PipeConfigNodeSubtaskExecutorTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/agent/PipeConfigNodeSubtaskExecutorTest.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskExecutor;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeSubtask;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtask;
import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtaskExecutor;
@@ -58,7 +58,7 @@ public class PipeConfigNodeSubtaskExecutorTest {
new HashMap<String, String>() {
{
put(
- PipeConnectorConstant.CONNECTOR_KEY,
+ PipeSinkConstant.CONNECTOR_KEY,
BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName());
}
},
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/connector/IoTDBConfigRegionConnectorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/sink/IoTDBConfigRegionSinkTest.java
similarity index 72%
rename from iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/connector/IoTDBConfigRegionConnectorTest.java
rename to iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/sink/IoTDBConfigRegionSinkTest.java
index 3e438d0816e..b88862c4cae 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/connector/IoTDBConfigRegionConnectorTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/sink/IoTDBConfigRegionSinkTest.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector;
+package org.apache.iotdb.confignode.manager.pipe.sink;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.confignode.manager.pipe.connector.protocol.IoTDBConfigRegionConnector;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
+import org.apache.iotdb.confignode.manager.pipe.sink.protocol.IoTDBConfigRegionSink;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
@@ -30,21 +30,21 @@ import org.junit.Test;
import java.util.HashMap;
-public class IoTDBConfigRegionConnectorTest {
+public class IoTDBConfigRegionSinkTest {
@Test
public void testIoTDBSchemaConnector() {
- try (IoTDBConfigRegionConnector connector = new IoTDBConfigRegionConnector()) {
+ try (IoTDBConfigRegionSink connector = new IoTDBConfigRegionSink()) {
connector.validate(
new PipeParameterValidator(
new PipeParameters(
new HashMap<String, String>() {
{
put(
- PipeConnectorConstant.CONNECTOR_KEY,
+ PipeSinkConstant.CONNECTOR_KEY,
BuiltinPipePlugin.IOTDB_LEGACY_PIPE_CONNECTOR.getPipePluginName());
- put(PipeConnectorConstant.CONNECTOR_IOTDB_IP_KEY, "127.0.0.1");
- put(PipeConnectorConstant.CONNECTOR_IOTDB_PORT_KEY, "6668");
+ put(PipeSinkConstant.CONNECTOR_IOTDB_IP_KEY, "127.0.0.1");
+ put(PipeSinkConstant.CONNECTOR_IOTDB_PORT_KEY, "6668");
}
})));
} catch (Exception e) {
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/connector/PipeConfigNodeThriftRequestTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/sink/PipeConfigNodeThriftRequestTest.java
similarity index 89%
rename from iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/connector/PipeConfigNodeThriftRequestTest.java
rename to iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/sink/PipeConfigNodeThriftRequestTest.java
index a18ba7a4bb4..0f729c7b4b0 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/connector/PipeConfigNodeThriftRequestTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/sink/PipeConfigNodeThriftRequestTest.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.connector;
+package org.apache.iotdb.confignode.manager.pipe.sink;
import org.apache.iotdb.confignode.consensus.request.write.cq.ActiveCQPlan;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigNodeHandshakeV1Req;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigPlanReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotPieceReq;
-import org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotSealReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigNodeHandshakeV1Req;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigPlanReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotPieceReq;
+import org.apache.iotdb.confignode.manager.pipe.sink.payload.PipeTransferConfigSnapshotSealReq;
import org.apache.iotdb.confignode.persistence.schema.CNSnapshotFileType;
import org.junit.Assert;
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/IoTDBConfigRegionExtractorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/IoTDBConfigRegionSourceTest.java
similarity index 64%
rename from iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/IoTDBConfigRegionExtractorTest.java
rename to iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/IoTDBConfigRegionSourceTest.java
index f3ccf42a0c2..15051d436d8 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/IoTDBConfigRegionExtractorTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/IoTDBConfigRegionSourceTest.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
@@ -28,27 +28,25 @@ import org.junit.Test;
import java.util.HashMap;
-public class IoTDBConfigRegionExtractorTest {
+public class IoTDBConfigRegionSourceTest {
@Test
public void testIoTDBConfigExtractor() {
- try (final IoTDBConfigRegionExtractor extractor = new IoTDBConfigRegionExtractor()) {
+ try (final IoTDBConfigRegionSource extractor = new IoTDBConfigRegionSource()) {
extractor.validate(
new PipeParameterValidator(
new PipeParameters(
new HashMap<String, String>() {
{
+ put(PipeSourceConstant.EXTRACTOR_HISTORY_ENABLE_KEY, Boolean.TRUE.toString());
put(
- PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_KEY,
+ PipeSourceConstant.EXTRACTOR_REALTIME_ENABLE_KEY,
Boolean.TRUE.toString());
put(
- PipeExtractorConstant.EXTRACTOR_REALTIME_ENABLE_KEY,
- Boolean.TRUE.toString());
- put(
- PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_KEY,
- PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_HYBRID_VALUE);
+ PipeSourceConstant.EXTRACTOR_REALTIME_MODE_KEY,
+ PipeSourceConstant.EXTRACTOR_REALTIME_MODE_HYBRID_VALUE);
put(
- PipeExtractorConstant.EXTRACTOR_INCLUSION_KEY,
- PipeExtractorConstant.EXTRACTOR_INCLUSION_DEFAULT_VALUE);
+ PipeSourceConstant.EXTRACTOR_INCLUSION_KEY,
+ PipeSourceConstant.EXTRACTOR_INCLUSION_DEFAULT_VALUE);
}
})));
} catch (final Exception e) {
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanScopeParseVisitorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanScopeParseVisitorTest.java
similarity index 96%
rename from iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanScopeParseVisitorTest.java
rename to iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanScopeParseVisitorTest.java
index 6e5e9870fbf..1a0ca3541ea 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanScopeParseVisitorTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanScopeParseVisitorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.path.PartialPath;
@@ -57,7 +57,7 @@ public class PipeConfigPhysicalPlanScopeParseVisitorTest {
.collect(Collectors.toList())),
false,
Collections.singletonList(new PartialPath(new String[] {"root", "**"}))),
- IoTDBConfigRegionExtractor.TREE_SCOPE_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_SCOPE_PARSE_VISITOR
.process(
new AuthorTreePlan(
type,
@@ -106,7 +106,7 @@ public class PipeConfigPhysicalPlanScopeParseVisitorTest {
.collect(Collectors.toList())),
true,
Collections.emptyList()),
- IoTDBConfigRegionExtractor.TABLE_SCOPE_PARSE_VISITOR
+ IoTDBConfigRegionSource.TABLE_SCOPE_PARSE_VISITOR
.process(
new AuthorRelationalPlan(
inputType, isUser ? "user" : "", isUser ? "" : "role", "", "", -1, true),
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePatternParseVisitorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePatternParseVisitorTest.java
similarity index 97%
rename from iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePatternParseVisitorTest.java
rename to iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePatternParseVisitorTest.java
index 2c19f6ce3e3..10bc2901272 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTablePatternParseVisitorTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTablePatternParseVisitorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
@@ -243,15 +243,15 @@ public class PipeConfigPhysicalPlanTablePatternParseVisitorTest {
final ConfigPhysicalPlan falseInput2) {
Assert.assertEquals(
trueInput,
- IoTDBConfigRegionExtractor.TABLE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TABLE_PATTERN_PARSE_VISITOR
.process(trueInput, tablePattern)
.orElseThrow(AssertionError::new));
Assert.assertFalse(
- IoTDBConfigRegionExtractor.TABLE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TABLE_PATTERN_PARSE_VISITOR
.process(falseInput1, tablePattern)
.isPresent());
Assert.assertFalse(
- IoTDBConfigRegionExtractor.TABLE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TABLE_PATTERN_PARSE_VISITOR
.process(falseInput2, tablePattern)
.isPresent());
}
diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreePatternParseVisitorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreePatternParseVisitorTest.java
similarity index 91%
rename from iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreePatternParseVisitorTest.java
rename to iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreePatternParseVisitorTest.java
index c46d0af40ff..6893cfa5523 100644
--- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanTreePatternParseVisitorTest.java
+++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigPhysicalPlanTreePatternParseVisitorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.manager.pipe.extractor;
+package org.apache.iotdb.confignode.manager.pipe.source;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
@@ -68,11 +68,11 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
createDatabasePlan,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitCreateDatabase(createDatabasePlan, prefixPathPattern)
.orElseThrow(AssertionError::new));
Assert.assertFalse(
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitCreateDatabase(createDatabasePlanToFilter, prefixPathPattern)
.isPresent());
}
@@ -88,11 +88,11 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
alterDatabasePlan,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitAlterDatabase(alterDatabasePlan, prefixPathPattern)
.orElseThrow(AssertionError::new));
Assert.assertFalse(
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitAlterDatabase(alterDatabasePlanToFilter, prefixPathPattern)
.isPresent());
}
@@ -104,11 +104,11 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
deleteDatabasePlan,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitDeleteDatabase(deleteDatabasePlan, prefixPathPattern)
.orElseThrow(AssertionError::new));
Assert.assertFalse(
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitDeleteDatabase(deleteDatabasePlanToFilter, prefixPathPattern)
.isPresent());
}
@@ -128,13 +128,13 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
createSchemaTemplatePlan,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitCreateSchemaTemplate(createSchemaTemplatePlan, prefixPathPattern)
.orElseThrow(AssertionError::new));
final CreateSchemaTemplatePlan parsedTemplatePlan =
(CreateSchemaTemplatePlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitCreateSchemaTemplate(createSchemaTemplatePlan, fullPathPattern)
.orElseThrow(AssertionError::new);
Assert.assertEquals(
@@ -153,12 +153,12 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
setSchemaTemplatePlanOnPrefix,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitCommitSetSchemaTemplate(setSchemaTemplatePlanOnPrefix, fullPathPattern)
.orElseThrow(AssertionError::new));
Assert.assertEquals(
setSchemaTemplatePlanOnFullPath,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitCommitSetSchemaTemplate(setSchemaTemplatePlanOnFullPath, fullPathPattern)
.orElseThrow(AssertionError::new));
}
@@ -172,12 +172,12 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
pipeUnsetSchemaTemplatePlanOnPrefix,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitPipeUnsetSchemaTemplate(pipeUnsetSchemaTemplatePlanOnPrefix, fullPathPattern)
.orElseThrow(AssertionError::new));
Assert.assertEquals(
pipeUnsetSchemaTemplatePlanOrFullPath,
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitPipeUnsetSchemaTemplate(pipeUnsetSchemaTemplatePlanOrFullPath, fullPathPattern)
.orElseThrow(AssertionError::new));
}
@@ -195,7 +195,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
final ExtendSchemaTemplatePlan parsedTemplatePlan =
(ExtendSchemaTemplatePlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitExtendSchemaTemplate(extendSchemaTemplatePlan, fullPathPattern)
.orElseThrow(AssertionError::new);
Assert.assertEquals(
@@ -220,7 +220,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
Collections.singletonList(new PartialPath("root.db.device.**")),
((AuthorTreePlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitGrantUser(
new AuthorTreePlan(
ConfigPhysicalPlanType.GrantUser,
@@ -242,7 +242,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
Collections.singletonList(new PartialPath("root.db.device.**")),
((AuthorTreePlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitRevokeUser(
new AuthorTreePlan(
ConfigPhysicalPlanType.RevokeUser,
@@ -264,7 +264,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
Collections.singletonList(new PartialPath("root.db.device.**")),
((AuthorTreePlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitGrantRole(
new AuthorTreePlan(
ConfigPhysicalPlanType.GrantRole,
@@ -286,7 +286,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Assert.assertEquals(
Collections.singletonList(new PartialPath("root.db.device.**")),
((AuthorTreePlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitRevokeRole(
new AuthorTreePlan(
ConfigPhysicalPlanType.RevokeRole,
@@ -313,7 +313,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Collections.singletonList(new PartialPath("root.db.device.s1")),
PathPatternTree.deserialize(
((PipeDeleteTimeSeriesPlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitPipeDeleteTimeSeries(
new PipeDeleteTimeSeriesPlan(patternTree.serialize()),
prefixPathPattern)
@@ -332,7 +332,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
Collections.singletonList(new PartialPath("root.db.device.s1")),
PathPatternTree.deserialize(
((PipeDeleteLogicalViewPlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitPipeDeleteLogicalView(
new PipeDeleteLogicalViewPlan(patternTree.serialize()),
prefixPathPattern)
@@ -356,7 +356,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
}
},
((PipeDeactivateTemplatePlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitPipeDeactivateTemplate(
new PipeDeactivateTemplatePlan(
new HashMap<PartialPath, List<Template>>() {
@@ -387,7 +387,7 @@ public class PipeConfigPhysicalPlanTreePatternParseVisitorTest {
public void testSetTTL() throws IllegalPathException {
final SetTTLPlan plan =
((SetTTLPlan)
- IoTDBConfigRegionExtractor.TREE_PATTERN_PARSE_VISITOR
+ IoTDBConfigRegionSource.TREE_PATTERN_PARSE_VISITOR
.visitTTL(
new SetTTLPlan(Arrays.asList("root", "db", "**"), Long.MAX_VALUE),
prefixPathPattern)
diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeManager.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeManager.java
index b4d832f3d34..b460e69809d 100644
--- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeManager.java
+++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeManager.java
@@ -31,23 +31,23 @@ import org.apache.commons.lang3.tuple.Triple;
import java.util.Map;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_CONSENSUS_GROUP_ID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_CONSENSUS_PIPE_NAME;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_IP_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PARALLEL_TASKS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PORT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_REALTIME_FIRST_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_CAPTURE_TABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_CAPTURE_TREE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_CONSENSUS_GROUP_ID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_CONSENSUS_RECEIVER_DATANODE_ID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_CONSENSUS_SENDER_DATANODE_ID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_INCLUSION_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_IOTDB_USER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_KEY;
import static org.apache.iotdb.commons.pipe.config.constant.PipeProcessorConstant.PROCESSOR_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_CONSENSUS_GROUP_ID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_CONSENSUS_PIPE_NAME;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_IP_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PARALLEL_TASKS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PORT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_REALTIME_FIRST_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_CAPTURE_TABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_CAPTURE_TREE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_CONSENSUS_GROUP_ID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_CONSENSUS_RECEIVER_DATANODE_ID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_CONSENSUS_SENDER_DATANODE_ID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_INCLUSION_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_IOTDB_USER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_KEY;
public class ConsensusPipeManager {
// Extract data.insert and data.delete to support deletion.
diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeConnector.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeSink.java
similarity index 95%
rename from iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeConnector.java
rename to iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeSink.java
index bf4cd02b2ec..9f387ddac03 100644
--- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeConnector.java
+++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeSink.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.consensus.pipe.consensuspipe;
-public interface ConsensusPipeConnector {
+public interface ConsensusPipeSink {
long getLeaderReplicateProgress();
long getFollowerApplyProgress();
diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/metric/PipeConsensusSyncLagManager.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/metric/PipeConsensusSyncLagManager.java
index 0539bece918..bd9a2fd73d3 100644
--- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/metric/PipeConsensusSyncLagManager.java
+++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/metric/PipeConsensusSyncLagManager.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.consensus.pipe.metric;
-import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeConnector;
import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeName;
+import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeSink;
import java.util.Map;
import java.util.Optional;
@@ -36,8 +36,7 @@ import java.util.concurrent.locks.ReentrantLock;
public class PipeConsensusSyncLagManager {
long syncLag = Long.MIN_VALUE;
ReentrantLock lock = new ReentrantLock();
- Map<ConsensusPipeName, ConsensusPipeConnector> consensusPipe2ConnectorMap =
- new ConcurrentHashMap<>();
+ Map<ConsensusPipeName, ConsensusPipeSink> consensusPipe2ConnectorMap = new ConcurrentHashMap<>();
/**
* pinnedCommitIndex - currentReplicateProgress. If res <= 0, indicating that replication is
@@ -47,8 +46,8 @@ public class PipeConsensusSyncLagManager {
ConsensusPipeName consensusPipeName, long pinnedCommitIndex) {
return Optional.ofNullable(consensusPipe2ConnectorMap.get(consensusPipeName))
.map(
- consensusPipeConnector ->
- Math.max(pinnedCommitIndex - consensusPipeConnector.getFollowerApplyProgress(), 0L))
+ consensusPipeSink ->
+ Math.max(pinnedCommitIndex - consensusPipeSink.getFollowerApplyProgress(), 0L))
.orElse(0L);
}
@@ -59,9 +58,9 @@ public class PipeConsensusSyncLagManager {
public long getSyncLagForSpecificConsensusPipe(ConsensusPipeName consensusPipeName) {
return Optional.ofNullable(consensusPipe2ConnectorMap.get(consensusPipeName))
.map(
- consensusPipeConnector -> {
- long userWriteProgress = consensusPipeConnector.getLeaderReplicateProgress();
- long replicateProgress = consensusPipeConnector.getFollowerApplyProgress();
+ consensusPipeSink -> {
+ long userWriteProgress = consensusPipeSink.getLeaderReplicateProgress();
+ long replicateProgress = consensusPipeSink.getFollowerApplyProgress();
return Math.max(userWriteProgress - replicateProgress, 0L);
})
.orElse(0L);
@@ -69,15 +68,15 @@ public class PipeConsensusSyncLagManager {
public long getCurrentLeaderReplicateIndex(ConsensusPipeName consensusPipeName) {
return Optional.ofNullable(consensusPipe2ConnectorMap.get(consensusPipeName))
- .map(ConsensusPipeConnector::getLeaderReplicateProgress)
+ .map(ConsensusPipeSink::getLeaderReplicateProgress)
.orElse(0L);
}
public void addConsensusPipeConnector(
- ConsensusPipeName consensusPipeName, ConsensusPipeConnector consensusPipeConnector) {
+ ConsensusPipeName consensusPipeName, ConsensusPipeSink consensusPipeSink) {
lock.lock();
try {
- consensusPipe2ConnectorMap.put(consensusPipeName, consensusPipeConnector);
+ consensusPipe2ConnectorMap.put(consensusPipeName, consensusPipeSink);
} finally {
lock.unlock();
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index 29d563e0dce..71f064008df 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -34,7 +34,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TPathPrivilege;
import org.apache.iotdb.confignode.rpc.thrift.TRoleResp;
import org.apache.iotdb.confignode.rpc.thrift.TTablePrivilege;
import org.apache.iotdb.confignode.rpc.thrift.TUserResp;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.listener.PipeInsertionDataNodeListener;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.listener.PipeInsertionDataNodeListener;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java
index a2afa937475..6b9ba0a2612 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.db.exception.metadata.MeasurementAlreadyExistException;
import org.apache.iotdb.db.exception.metadata.template.TemplateIsInUseException;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.SchemaRegionListeningQueue;
+import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java
index b5de83e151e..bc2baacb136 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.consensus.ratis.utils.Utils;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.consensus.statemachine.BaseStateMachine;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.SchemaRegionListeningQueue;
+import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue;
import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager;
import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionPluginAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionPluginAgent.java
index 43326eb72a7..ae27a7eff33 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionPluginAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionPluginAgent.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.pipe.agent.plugin.dataregion;
import org.apache.iotdb.commons.pipe.agent.plugin.PipePluginAgent;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeConnectorConstructor;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeExtractorConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeProcessorConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSourceConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper;
import org.apache.iotdb.commons.pipe.datastructure.visibility.Visibility;
@@ -42,10 +42,9 @@ public class PipeDataRegionPluginAgent extends PipePluginAgent {
}
@Override
- protected PipeExtractorConstructor createPipeExtractorConstructor(
+ protected PipeSourceConstructor createPipeExtractorConstructor(
PipePluginMetaKeeper pipePluginMetaKeeper) {
- return new PipeDataRegionExtractorConstructor(
- (DataNodePipePluginMetaKeeper) pipePluginMetaKeeper);
+ return new PipeDataRegionSourceConstructor((DataNodePipePluginMetaKeeper) pipePluginMetaKeeper);
}
@Override
@@ -56,10 +55,9 @@ public class PipeDataRegionPluginAgent extends PipePluginAgent {
}
@Override
- protected PipeConnectorConstructor createPipeConnectorConstructor(
+ protected PipeSinkConstructor createPipeConnectorConstructor(
PipePluginMetaKeeper pipePluginMetaKeeper) {
- return new PipeDataRegionConnectorConstructor(
- (DataNodePipePluginMetaKeeper) pipePluginMetaKeeper);
+ return new PipeDataRegionSinkConstructor((DataNodePipePluginMetaKeeper) pipePluginMetaKeeper);
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionConnectorConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionSinkConstructor.java
similarity index 60%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionConnectorConstructor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionSinkConstructor.java
index c95fec2b4bf..536cf71cdb8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionConnectorConstructor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionSinkConstructor.java
@@ -20,22 +20,22 @@
package org.apache.iotdb.db.pipe.agent.plugin.dataregion;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
-import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.donothing.DoNothingConnector;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeConnectorConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.donothing.DoNothingSink;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper;
-import org.apache.iotdb.db.pipe.connector.protocol.airgap.IoTDBDataRegionAirGapConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.legacy.IoTDBLegacyPipeConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.opcda.OpcDaConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.opcua.OpcUaConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.PipeConsensusAsyncConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.sync.IoTDBDataRegionSyncConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.websocket.WebSocketConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.writeback.WriteBackConnector;
+import org.apache.iotdb.db.pipe.sink.protocol.airgap.IoTDBDataRegionAirGapSink;
+import org.apache.iotdb.db.pipe.sink.protocol.legacy.IoTDBLegacyPipeSink;
+import org.apache.iotdb.db.pipe.sink.protocol.opcda.OpcDaSink;
+import org.apache.iotdb.db.pipe.sink.protocol.opcua.OpcUaSink;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.sync.IoTDBDataRegionSyncSink;
+import org.apache.iotdb.db.pipe.sink.protocol.websocket.WebSocketSink;
+import org.apache.iotdb.db.pipe.sink.protocol.writeback.WriteBackSink;
-class PipeDataRegionConnectorConstructor extends PipeConnectorConstructor {
+class PipeDataRegionSinkConstructor extends PipeSinkConstructor {
- PipeDataRegionConnectorConstructor(DataNodePipePluginMetaKeeper pipePluginMetaKeeper) {
+ PipeDataRegionSinkConstructor(DataNodePipePluginMetaKeeper pipePluginMetaKeeper) {
super(pipePluginMetaKeeper);
}
@@ -43,66 +43,59 @@ class PipeDataRegionConnectorConstructor extends PipeConnectorConstructor {
protected void initConstructors() {
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName(),
- IoTDBDataRegionAsyncConnector::new);
+ IoTDBDataRegionAsyncSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_SSL_CONNECTOR.getPipePluginName(),
- IoTDBDataRegionSyncConnector::new);
+ IoTDBDataRegionSyncSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_SYNC_CONNECTOR.getPipePluginName(),
- IoTDBDataRegionSyncConnector::new);
+ IoTDBDataRegionSyncSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName(),
- IoTDBDataRegionAsyncConnector::new);
+ IoTDBDataRegionAsyncSink::new);
pluginConstructors.put(
BuiltinPipePlugin.PIPE_CONSENSUS_ASYNC_CONNECTOR.getPipePluginName(),
- PipeConsensusAsyncConnector::new);
+ PipeConsensusAsyncSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_LEGACY_PIPE_CONNECTOR.getPipePluginName(),
- IoTDBLegacyPipeConnector::new);
+ IoTDBLegacyPipeSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName(),
- IoTDBDataRegionAirGapConnector::new);
+ IoTDBDataRegionAirGapSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.WEBSOCKET_CONNECTOR.getPipePluginName(), WebSocketConnector::new);
+ BuiltinPipePlugin.WEBSOCKET_CONNECTOR.getPipePluginName(), WebSocketSink::new);
+ pluginConstructors.put(BuiltinPipePlugin.OPC_UA_CONNECTOR.getPipePluginName(), OpcUaSink::new);
+ pluginConstructors.put(BuiltinPipePlugin.OPC_DA_CONNECTOR.getPipePluginName(), OpcDaSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.OPC_UA_CONNECTOR.getPipePluginName(), OpcUaConnector::new);
+ BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.OPC_DA_CONNECTOR.getPipePluginName(), OpcDaConnector::new);
- pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingConnector::new);
- pluginConstructors.put(
- BuiltinPipePlugin.WRITE_BACK_CONNECTOR.getPipePluginName(), WriteBackConnector::new);
+ BuiltinPipePlugin.WRITE_BACK_CONNECTOR.getPipePluginName(), WriteBackSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName(),
- IoTDBDataRegionAsyncConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName(), IoTDBDataRegionAsyncSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK.getPipePluginName(),
- IoTDBDataRegionSyncConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK.getPipePluginName(), IoTDBDataRegionSyncSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(),
- IoTDBDataRegionSyncConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(), IoTDBDataRegionSyncSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_SINK.getPipePluginName(),
- IoTDBDataRegionAsyncConnector::new);
+ IoTDBDataRegionAsyncSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_LEGACY_PIPE_SINK.getPipePluginName(),
- IoTDBLegacyPipeConnector::new);
+ BuiltinPipePlugin.IOTDB_LEGACY_PIPE_SINK.getPipePluginName(), IoTDBLegacyPipeSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(),
- IoTDBDataRegionAirGapConnector::new);
+ BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(), IoTDBDataRegionAirGapSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.WEBSOCKET_SINK.getPipePluginName(), WebSocketConnector::new);
- pluginConstructors.put(BuiltinPipePlugin.OPC_UA_SINK.getPipePluginName(), OpcUaConnector::new);
- pluginConstructors.put(BuiltinPipePlugin.OPC_DA_SINK.getPipePluginName(), OpcDaConnector::new);
+ BuiltinPipePlugin.WEBSOCKET_SINK.getPipePluginName(), WebSocketSink::new);
+ pluginConstructors.put(BuiltinPipePlugin.OPC_UA_SINK.getPipePluginName(), OpcUaSink::new);
+ pluginConstructors.put(BuiltinPipePlugin.OPC_DA_SINK.getPipePluginName(), OpcDaSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingConnector::new);
+ BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.WRITE_BACK_SINK.getPipePluginName(), WriteBackConnector::new);
+ BuiltinPipePlugin.WRITE_BACK_SINK.getPipePluginName(), WriteBackSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.SUBSCRIPTION_SINK.getPipePluginName(), DoNothingConnector::new);
+ BuiltinPipePlugin.SUBSCRIPTION_SINK.getPipePluginName(), DoNothingSink::new);
pluginConstructors.put(
BuiltinPipePlugin.PIPE_CONSENSUS_ASYNC_SINK.getPipePluginName(),
- PipeConsensusAsyncConnector::new);
+ PipeConsensusAsyncSink::new);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionExtractorConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionSourceConstructor.java
similarity index 70%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionExtractorConstructor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionSourceConstructor.java
index 2fbc9935a25..d67ef97913c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionExtractorConstructor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionSourceConstructor.java
@@ -20,32 +20,31 @@
package org.apache.iotdb.db.pipe.agent.plugin.dataregion;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
-import org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.donothing.DoNothingExtractor;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeExtractorConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.builtin.source.donothing.DoNothingSource;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSourceConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper;
-import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor;
-import org.apache.iotdb.db.pipe.extractor.mqtt.MQTTExtractor;
+import org.apache.iotdb.db.pipe.source.dataregion.IoTDBDataRegionSource;
+import org.apache.iotdb.db.pipe.source.mqtt.MQTTSource;
-class PipeDataRegionExtractorConstructor extends PipeExtractorConstructor {
+class PipeDataRegionSourceConstructor extends PipeSourceConstructor {
- PipeDataRegionExtractorConstructor(DataNodePipePluginMetaKeeper pipePluginMetaKeeper) {
+ PipeDataRegionSourceConstructor(DataNodePipePluginMetaKeeper pipePluginMetaKeeper) {
super(pipePluginMetaKeeper);
}
@Override
protected void initConstructors() {
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_EXTRACTOR.getPipePluginName(), DoNothingExtractor::new);
+ BuiltinPipePlugin.DO_NOTHING_EXTRACTOR.getPipePluginName(), DoNothingSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName(), IoTDBDataRegionExtractor::new);
+ BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName(), IoTDBDataRegionSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_SOURCE.getPipePluginName(), DoNothingExtractor::new);
+ BuiltinPipePlugin.DO_NOTHING_SOURCE.getPipePluginName(), DoNothingSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_SOURCE.getPipePluginName(), IoTDBDataRegionExtractor::new);
+ BuiltinPipePlugin.IOTDB_SOURCE.getPipePluginName(), IoTDBDataRegionSource::new);
- pluginConstructors.put(
- BuiltinPipePlugin.MQTT_EXTRACTOR.getPipePluginName(), MQTTExtractor::new);
- pluginConstructors.put(BuiltinPipePlugin.MQTT_SOURCE.getPipePluginName(), MQTTExtractor::new);
+ pluginConstructors.put(BuiltinPipePlugin.MQTT_EXTRACTOR.getPipePluginName(), MQTTSource::new);
+ pluginConstructors.put(BuiltinPipePlugin.MQTT_SOURCE.getPipePluginName(), MQTTSource::new);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionPluginAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionPluginAgent.java
index fc0974099cc..549030073b1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionPluginAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionPluginAgent.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.pipe.agent.plugin.schemaregion;
import org.apache.iotdb.commons.pipe.agent.plugin.PipePluginAgent;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeConnectorConstructor;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeExtractorConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeProcessorConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSourceConstructor;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper;
public class PipeSchemaRegionPluginAgent extends PipePluginAgent {
@@ -32,9 +32,9 @@ public class PipeSchemaRegionPluginAgent extends PipePluginAgent {
}
@Override
- protected PipeExtractorConstructor createPipeExtractorConstructor(
+ protected PipeSourceConstructor createPipeExtractorConstructor(
PipePluginMetaKeeper pipePluginMetaKeeper) {
- return new PipeSchemaRegionExtractorConstructor();
+ return new PipeSchemaRegionSourceConstructor();
}
@Override
@@ -44,8 +44,8 @@ public class PipeSchemaRegionPluginAgent extends PipePluginAgent {
}
@Override
- protected PipeConnectorConstructor createPipeConnectorConstructor(
+ protected PipeSinkConstructor createPipeConnectorConstructor(
PipePluginMetaKeeper pipePluginMetaKeeper) {
- return new PipeSchemaRegionConnectorConstructor();
+ return new PipeSchemaRegionSinkConstructor();
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionConnectorConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionSinkConstructor.java
similarity index 70%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionConnectorConstructor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionSinkConstructor.java
index 6c96aaaeddc..160ecf54c01 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionConnectorConstructor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionSinkConstructor.java
@@ -20,56 +20,50 @@
package org.apache.iotdb.db.pipe.agent.plugin.schemaregion;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
-import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.donothing.DoNothingConnector;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeConnectorConstructor;
-import org.apache.iotdb.db.pipe.connector.protocol.airgap.IoTDBSchemaRegionAirGapConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.sync.IoTDBSchemaRegionConnector;
+import org.apache.iotdb.commons.pipe.agent.plugin.builtin.sink.donothing.DoNothingSink;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSinkConstructor;
+import org.apache.iotdb.db.pipe.sink.protocol.airgap.IoTDBSchemaRegionAirGapSink;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.sync.IoTDBSchemaRegionSink;
import org.apache.iotdb.pipe.api.PipeConnector;
-class PipeSchemaRegionConnectorConstructor extends PipeConnectorConstructor {
+class PipeSchemaRegionSinkConstructor extends PipeSinkConstructor {
@Override
protected void initConstructors() {
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName(),
- IoTDBSchemaRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName(), IoTDBSchemaRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_SSL_CONNECTOR.getPipePluginName(),
- IoTDBSchemaRegionConnector::new);
+ IoTDBSchemaRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_SYNC_CONNECTOR.getPipePluginName(),
- IoTDBSchemaRegionConnector::new);
+ IoTDBSchemaRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName(),
- IoTDBSchemaRegionConnector::new);
+ IoTDBSchemaRegionSink::new);
pluginConstructors.put(
BuiltinPipePlugin.IOTDB_AIR_GAP_CONNECTOR.getPipePluginName(),
- IoTDBSchemaRegionAirGapConnector::new);
+ IoTDBSchemaRegionAirGapSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingConnector::new);
+ BuiltinPipePlugin.DO_NOTHING_CONNECTOR.getPipePluginName(), DoNothingSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName(), IoTDBSchemaRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName(), IoTDBSchemaRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK.getPipePluginName(),
- IoTDBSchemaRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK.getPipePluginName(), IoTDBSchemaRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(),
- IoTDBSchemaRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_SYNC_SINK.getPipePluginName(), IoTDBSchemaRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_SINK.getPipePluginName(),
- IoTDBSchemaRegionConnector::new);
+ BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_SINK.getPipePluginName(), IoTDBSchemaRegionSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(),
- IoTDBSchemaRegionAirGapConnector::new);
+ BuiltinPipePlugin.IOTDB_AIR_GAP_SINK.getPipePluginName(), IoTDBSchemaRegionAirGapSink::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingConnector::new);
+ BuiltinPipePlugin.DO_NOTHING_SINK.getPipePluginName(), DoNothingSink::new);
}
@Override
public PipeConnector reflectPluginByKey(String pluginKey) {
// TODO: support constructing plugin by reflection
- return (PipeConnector)
- pluginConstructors.getOrDefault(pluginKey, DoNothingConnector::new).get();
+ return (PipeConnector) pluginConstructors.getOrDefault(pluginKey, DoNothingSink::new).get();
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionExtractorConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionSourceConstructor.java
similarity index 75%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionExtractorConstructor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionSourceConstructor.java
index 10d8257c1e6..303e4987c20 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionExtractorConstructor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionSourceConstructor.java
@@ -20,30 +20,29 @@
package org.apache.iotdb.db.pipe.agent.plugin.schemaregion;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
-import org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.donothing.DoNothingExtractor;
-import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeExtractorConstructor;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor;
+import org.apache.iotdb.commons.pipe.agent.plugin.builtin.source.donothing.DoNothingSource;
+import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeSourceConstructor;
+import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource;
import org.apache.iotdb.pipe.api.PipeExtractor;
-class PipeSchemaRegionExtractorConstructor extends PipeExtractorConstructor {
+class PipeSchemaRegionSourceConstructor extends PipeSourceConstructor {
@Override
protected void initConstructors() {
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_EXTRACTOR.getPipePluginName(), DoNothingExtractor::new);
+ BuiltinPipePlugin.DO_NOTHING_EXTRACTOR.getPipePluginName(), DoNothingSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName(), IoTDBSchemaRegionExtractor::new);
+ BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName(), IoTDBSchemaRegionSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.DO_NOTHING_SOURCE.getPipePluginName(), DoNothingExtractor::new);
+ BuiltinPipePlugin.DO_NOTHING_SOURCE.getPipePluginName(), DoNothingSource::new);
pluginConstructors.put(
- BuiltinPipePlugin.IOTDB_SOURCE.getPipePluginName(), IoTDBSchemaRegionExtractor::new);
+ BuiltinPipePlugin.IOTDB_SOURCE.getPipePluginName(), IoTDBSchemaRegionSource::new);
}
@Override
public PipeExtractor reflectPluginByKey(String pluginKey) {
// TODO: support constructing plugin by reflection
- return (PipeExtractor)
- pluginConstructors.getOrDefault(pluginKey, DoNothingExtractor::new).get();
+ return (PipeExtractor) pluginConstructors.getOrDefault(pluginKey, DoNothingSource::new).get();
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeAgentLauncher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeAgentLauncher.java
index 089d4e2fda7..9be97ea6e17 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeAgentLauncher.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeAgentLauncher.java
@@ -31,7 +31,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TGetJarInListResp;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventBatch;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventBatch;
import org.apache.iotdb.db.protocol.client.ConfigNodeClient;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.db.protocol.client.ConfigNodeInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeDataNodeRuntimeAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeDataNodeRuntimeAgent.java
index 9c4b0419794..593ba6a297b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeDataNodeRuntimeAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeDataNodeRuntimeAgent.java
@@ -35,8 +35,8 @@ import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.SchemaRegionListeningQueue;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner;
+import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.service.ResourcesInformationHolder;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeSchemaRegionListenerManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeSchemaRegionListenerManager.java
index b12588a9079..d28929b36a2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeSchemaRegionListenerManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeSchemaRegionListenerManager.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.pipe.agent.runtime;
import org.apache.iotdb.commons.consensus.SchemaRegionId;
import org.apache.iotdb.commons.pipe.agent.task.PipeTask;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.SchemaRegionListeningQueue;
import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionListenerMetrics;
+import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue;
import java.util.Map;
import java.util.Set;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java
index 7606cbc4ea6..1286d26f6c1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java
@@ -39,8 +39,8 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeType;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
import org.apache.iotdb.consensus.exception.ConsensusException;
import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeName;
@@ -50,13 +50,13 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
import org.apache.iotdb.db.pipe.agent.task.builder.PipeDataNodeBuilder;
import org.apache.iotdb.db.pipe.agent.task.builder.PipeDataNodeTaskBuilder;
-import org.apache.iotdb.db.pipe.extractor.dataregion.DataRegionListeningFilter;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.listener.PipeInsertionDataNodeListener;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.SchemaRegionListeningFilter;
import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics;
import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryManager;
+import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.listener.PipeInsertionDataNodeListener;
+import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningFilter;
import org.apache.iotdb.db.protocol.client.ConfigNodeClient;
import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
import org.apache.iotdb.db.protocol.client.ConfigNodeInfo;
@@ -101,32 +101,32 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_QUERY_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATH_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATTERN_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_SNAPSHOT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_PATH_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_PATTERN_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_REALTIME_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_QUERY_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_PATH_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_PATTERN_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_SNAPSHOT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_PATH_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_PATTERN_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_REALTIME_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_START_TIME_KEY;
public class PipeDataNodeTaskAgent extends PipeTaskAgent {
@@ -361,12 +361,12 @@ public class PipeDataNodeTaskAgent extends PipeTaskAgent {
pipeMeta
.getStaticMeta()
.getConnectorParameters()
- .getString(PipeConnectorConstant.SINK_TOPIC_KEY);
+ .getString(PipeSinkConstant.SINK_TOPIC_KEY);
final String consumerGroupId =
pipeMeta
.getStaticMeta()
.getConnectorParameters()
- .getString(PipeConnectorConstant.SINK_CONSUMER_GROUP_KEY);
+ .getString(PipeSinkConstant.SINK_CONSUMER_GROUP_KEY);
SubscriptionAgent.broker().updateCompletedTopicNames(consumerGroupId, topicName);
}
}
@@ -432,17 +432,16 @@ public class PipeDataNodeTaskAgent extends PipeTaskAgent {
.getExtractorParameters()
.getStringOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTRACTOR_MODE_KEY,
- PipeExtractorConstant.SOURCE_MODE_KEY),
- PipeExtractorConstant.EXTRACTOR_MODE_DEFAULT_VALUE);
+ PipeSourceConstant.EXTRACTOR_MODE_KEY, PipeSourceConstant.SOURCE_MODE_KEY),
+ PipeSourceConstant.EXTRACTOR_MODE_DEFAULT_VALUE);
final boolean includeDataAndNeedDrop =
DataRegionListeningFilter.parseInsertionDeletionListeningOptionPair(
pipeMeta.getStaticMeta().getExtractorParameters())
.getLeft()
&& (extractorModeValue.equalsIgnoreCase(
- PipeExtractorConstant.EXTRACTOR_MODE_QUERY_VALUE)
+ PipeSourceConstant.EXTRACTOR_MODE_QUERY_VALUE)
|| extractorModeValue.equalsIgnoreCase(
- PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE));
+ PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE));
final boolean isCompleted = isAllDataRegionCompleted && includeDataAndNeedDrop;
final Pair<Long, Double> remainingEventAndTime =
@@ -743,10 +742,10 @@ public class PipeDataNodeTaskAgent extends PipeTaskAgent {
// If the realtime mode is batch or file, we do not need to allocate memory
final String realtimeMode =
extractorParameters.getStringByKeys(
- PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_KEY,
- PipeExtractorConstant.SOURCE_REALTIME_MODE_KEY);
- if (PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_BATCH_MODE_VALUE.equals(realtimeMode)
- || PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_FILE_VALUE.equals(realtimeMode)) {
+ PipeSourceConstant.EXTRACTOR_REALTIME_MODE_KEY,
+ PipeSourceConstant.SOURCE_REALTIME_MODE_KEY);
+ if (PipeSourceConstant.EXTRACTOR_REALTIME_MODE_BATCH_MODE_VALUE.equals(realtimeMode)
+ || PipeSourceConstant.EXTRACTOR_REALTIME_MODE_FILE_VALUE.equals(realtimeMode)) {
return;
}
@@ -810,12 +809,11 @@ public class PipeDataNodeTaskAgent extends PipeTaskAgent {
// If the extractor is not hybrid, we do need to allocate memory
isTSFileParser =
isTSFileParser
- || !PipeConnectorConstant.CONNECTOR_FORMAT_HYBRID_VALUE.equals(
+ || !PipeSinkConstant.CONNECTOR_FORMAT_HYBRID_VALUE.equals(
connectorParameters.getStringOrDefault(
Arrays.asList(
- PipeConnectorConstant.CONNECTOR_FORMAT_KEY,
- PipeConnectorConstant.SINK_FORMAT_KEY),
- PipeConnectorConstant.CONNECTOR_FORMAT_HYBRID_VALUE));
+ PipeSinkConstant.CONNECTOR_FORMAT_KEY, PipeSinkConstant.SINK_FORMAT_KEY),
+ PipeSinkConstant.CONNECTOR_FORMAT_HYBRID_VALUE));
if (!isTSFileParser) {
return 0;
@@ -831,12 +829,11 @@ public class PipeDataNodeTaskAgent extends PipeTaskAgent {
// If the connector format is tsfile , we need to use batch
boolean needUseBatch =
- PipeConnectorConstant.CONNECTOR_FORMAT_TS_FILE_VALUE.equals(
+ PipeSinkConstant.CONNECTOR_FORMAT_TS_FILE_VALUE.equals(
connectorParameters.getStringOrDefault(
Arrays.asList(
- PipeConnectorConstant.CONNECTOR_FORMAT_KEY,
- PipeConnectorConstant.SINK_FORMAT_KEY),
- PipeConnectorConstant.CONNECTOR_FORMAT_HYBRID_VALUE));
+ PipeSinkConstant.CONNECTOR_FORMAT_KEY, PipeSinkConstant.SINK_FORMAT_KEY),
+ PipeSinkConstant.CONNECTOR_FORMAT_HYBRID_VALUE));
if (needUseBatch) {
return PipeConfig.getInstance().getSinkBatchMemoryTsFile();
@@ -846,9 +843,9 @@ public class PipeDataNodeTaskAgent extends PipeTaskAgent {
needUseBatch =
connectorParameters.getBooleanOrDefault(
Arrays.asList(
- PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_MODE_ENABLE_KEY,
- PipeConnectorConstant.SINK_IOTDB_BATCH_MODE_ENABLE_KEY),
- PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_MODE_ENABLE_DEFAULT_VALUE);
+ PipeSinkConstant.CONNECTOR_IOTDB_BATCH_MODE_ENABLE_KEY,
+ PipeSinkConstant.SINK_IOTDB_BATCH_MODE_ENABLE_KEY),
+ PipeSinkConstant.CONNECTOR_IOTDB_BATCH_MODE_ENABLE_DEFAULT_VALUE);
if (!needUseBatch) {
return 0;
@@ -871,15 +868,14 @@ public class PipeDataNodeTaskAgent extends PipeTaskAgent {
String format =
connectorParameters.getStringOrDefault(
- Arrays.asList(
- PipeConnectorConstant.CONNECTOR_FORMAT_KEY, PipeConnectorConstant.SINK_FORMAT_KEY),
- PipeConnectorConstant.CONNECTOR_FORMAT_HYBRID_VALUE);
+ Arrays.asList(PipeSinkConstant.CONNECTOR_FORMAT_KEY, PipeSinkConstant.SINK_FORMAT_KEY),
+ PipeSinkConstant.CONNECTOR_FORMAT_HYBRID_VALUE);
// If the connector format is tsfile and hybrid, we need to transfer tsfile
needTransferTsFile =
needTransferTsFile
- || PipeConnectorConstant.CONNECTOR_FORMAT_HYBRID_VALUE.equals(format)
- || PipeConnectorConstant.CONNECTOR_FORMAT_TS_FILE_VALUE.equals(format);
+ || PipeSinkConstant.CONNECTOR_FORMAT_HYBRID_VALUE.equals(format)
+ || PipeSinkConstant.CONNECTOR_FORMAT_TS_FILE_VALUE.equals(format);
if (!needTransferTsFile) {
return 0;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeBuilder.java
index af07ef716e2..e39779769d5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeBuilder.java
@@ -29,8 +29,8 @@ import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.DataRegionListeningFilter;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.SchemaRegionListeningFilter;
+import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter;
+import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningFilter;
import org.apache.iotdb.db.schemaengine.SchemaEngine;
import org.apache.iotdb.db.storageengine.StorageEngine;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeTaskBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeTaskBuilder.java
index 496c1d61005..2b6f18c167d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeTaskBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeTaskBuilder.java
@@ -25,17 +25,17 @@ import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeType;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
import org.apache.iotdb.db.pipe.agent.task.PipeDataNodeTask;
import org.apache.iotdb.db.pipe.agent.task.execution.PipeProcessorSubtaskExecutor;
import org.apache.iotdb.db.pipe.agent.task.execution.PipeSubtaskExecutorManager;
-import org.apache.iotdb.db.pipe.agent.task.stage.PipeTaskConnectorStage;
-import org.apache.iotdb.db.pipe.agent.task.stage.PipeTaskExtractorStage;
import org.apache.iotdb.db.pipe.agent.task.stage.PipeTaskProcessorStage;
-import org.apache.iotdb.db.pipe.extractor.dataregion.DataRegionListeningFilter;
-import org.apache.iotdb.db.subscription.task.stage.SubscriptionTaskConnectorStage;
+import org.apache.iotdb.db.pipe.agent.task.stage.PipeTaskSinkStage;
+import org.apache.iotdb.db.pipe.agent.task.stage.PipeTaskSourceStage;
+import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter;
+import org.apache.iotdb.db.subscription.task.stage.SubscriptionTaskSinkStage;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import org.apache.tsfile.utils.Pair;
@@ -46,21 +46,21 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_FORMAT_HYBRID_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_FORMAT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_FORMAT_TABLET_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_FORMAT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_QUERY_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_SNAPSHOT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_REALTIME_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_FORMAT_HYBRID_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_FORMAT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_FORMAT_TABLET_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_FORMAT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_QUERY_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_SNAPSHOT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_REALTIME_ENABLE_KEY;
public class PipeDataNodeTaskBuilder {
@@ -95,20 +95,20 @@ public class PipeDataNodeTaskBuilder {
injectParameters(extractorParameters, connectorParameters);
// We first build the extractor and connector, then build the processor.
- final PipeTaskExtractorStage extractorStage =
- new PipeTaskExtractorStage(
+ final PipeTaskSourceStage extractorStage =
+ new PipeTaskSourceStage(
pipeStaticMeta.getPipeName(),
pipeStaticMeta.getCreationTime(),
extractorParameters,
regionId,
pipeTaskMeta);
- final PipeTaskConnectorStage connectorStage;
+ final PipeTaskSinkStage connectorStage;
final PipeType pipeType = pipeStaticMeta.getPipeType();
if (PipeType.SUBSCRIPTION.equals(pipeType)) {
connectorStage =
- new SubscriptionTaskConnectorStage(
+ new SubscriptionTaskSinkStage(
pipeStaticMeta.getPipeName(),
pipeStaticMeta.getCreationTime(),
connectorParameters,
@@ -116,7 +116,7 @@ public class PipeDataNodeTaskBuilder {
PipeSubtaskExecutorManager.getInstance().getSubscriptionExecutor());
} else { // user pipe or consensus pipe
connectorStage =
- new PipeTaskConnectorStage(
+ new PipeTaskSinkStage(
pipeStaticMeta.getPipeName(),
pipeStaticMeta.getCreationTime(),
connectorParameters,
@@ -199,11 +199,10 @@ public class PipeDataNodeTaskBuilder {
|| shouldTerminatePipeOnAllHistoricalEventsConsumed) {
final Boolean isRealtime =
connectorParameters.getBooleanByKeys(
- PipeConnectorConstant.CONNECTOR_REALTIME_FIRST_KEY,
- PipeConnectorConstant.SINK_REALTIME_FIRST_KEY);
+ PipeSinkConstant.CONNECTOR_REALTIME_FIRST_KEY,
+ PipeSinkConstant.SINK_REALTIME_FIRST_KEY);
if (isRealtime == null) {
- connectorParameters.addAttribute(
- PipeConnectorConstant.CONNECTOR_REALTIME_FIRST_KEY, "false");
+ connectorParameters.addAttribute(PipeSinkConstant.CONNECTOR_REALTIME_FIRST_KEY, "false");
if (insertionDeletionListeningOptionPair.right) {
LOGGER.info(
"PipeDataNodeTaskBuilder: When 'inclusion' contains 'data.delete', 'realtime-first' is defaulted to 'false' to prevent sync issues after deletion.");
@@ -230,12 +229,11 @@ public class PipeDataNodeTaskBuilder {
if (isRealtimeEnabled && !shouldTerminatePipeOnAllHistoricalEventsConsumed) {
final Boolean enableSendTsFileLimit =
connectorParameters.getBooleanByKeys(
- PipeConnectorConstant.SINK_ENABLE_SEND_TSFILE_LIMIT,
- PipeConnectorConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT);
+ PipeSinkConstant.SINK_ENABLE_SEND_TSFILE_LIMIT,
+ PipeSinkConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT);
if (enableSendTsFileLimit == null) {
- connectorParameters.addAttribute(
- PipeConnectorConstant.SINK_ENABLE_SEND_TSFILE_LIMIT, "true");
+ connectorParameters.addAttribute(PipeSinkConstant.SINK_ENABLE_SEND_TSFILE_LIMIT, "true");
LOGGER.info(
"PipeDataNodeTaskBuilder: When the realtime sync is enabled, we enable rate limiter in sending tsfile by default to reserve disk and network IO for realtime sending.");
} else if (!enableSendTsFileLimit) {
@@ -251,15 +249,14 @@ public class PipeDataNodeTaskBuilder {
!BuiltinPipePlugin.BUILTIN_SOURCES.contains(
extractorParameters
.getStringOrDefault(
- Arrays.asList(
- PipeExtractorConstant.EXTRACTOR_KEY, PipeExtractorConstant.SOURCE_KEY),
+ Arrays.asList(PipeSourceConstant.EXTRACTOR_KEY, PipeSourceConstant.SOURCE_KEY),
BuiltinPipePlugin.IOTDB_EXTRACTOR.getPipePluginName())
.toLowerCase());
final String connectorPluginName =
connectorParameters
.getStringOrDefault(
- Arrays.asList(PipeConnectorConstant.CONNECTOR_KEY, PipeConnectorConstant.SINK_KEY),
+ Arrays.asList(PipeSinkConstant.CONNECTOR_KEY, PipeSinkConstant.SINK_KEY),
BuiltinPipePlugin.IOTDB_THRIFT_SINK.getPipePluginName())
.toLowerCase();
final boolean isWriteBackSink =
@@ -268,7 +265,7 @@ public class PipeDataNodeTaskBuilder {
if (isSourceExternal && isWriteBackSink) {
connectorParameters.addAttribute(
- PipeConnectorConstant.CONNECTOR_USE_EVENT_USER_NAME_KEY, Boolean.TRUE.toString());
+ PipeSinkConstant.CONNECTOR_USE_EVENT_USER_NAME_KEY, Boolean.TRUE.toString());
}
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/PipeEventCollector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/PipeEventCollector.java
index e64248a5797..3ee173ac842 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/PipeEventCollector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/PipeEventCollector.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor;
+import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode;
import org.apache.iotdb.pipe.api.collector.EventCollector;
@@ -174,14 +174,14 @@ public class PipeEventCollector implements EventCollector {
// Only used by events containing delete data node, no need to bind progress index here since
// delete data event does not have progress index currently
(deleteDataEvent.getDeleteDataNode() instanceof DeleteDataNode
- ? IoTDBSchemaRegionExtractor.TREE_PATTERN_PARSE_VISITOR.process(
+ ? IoTDBSchemaRegionSource.TREE_PATTERN_PARSE_VISITOR.process(
deleteDataEvent.getDeleteDataNode(),
(IoTDBTreePattern) deleteDataEvent.getTreePattern())
- : IoTDBSchemaRegionExtractor.TABLE_PATTERN_PARSE_VISITOR
+ : IoTDBSchemaRegionSource.TABLE_PATTERN_PARSE_VISITOR
.process(deleteDataEvent.getDeleteDataNode(), deleteDataEvent.getTablePattern())
.flatMap(
planNode ->
- IoTDBSchemaRegionExtractor.TABLE_PRIVILEGE_PARSE_VISITOR.process(
+ IoTDBSchemaRegionSource.TABLE_PRIVILEGE_PARSE_VISITOR.process(
planNode, deleteDataEvent.getUserName())))
.map(
planNode ->
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeConnectorSubtaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSinkSubtaskExecutor.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeConnectorSubtaskExecutor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSinkSubtaskExecutor.java
index 0850c81a59d..9a88ad74d7c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeConnectorSubtaskExecutor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSinkSubtaskExecutor.java
@@ -25,10 +25,10 @@ import org.apache.iotdb.commons.pipe.config.PipeConfig;
import java.util.concurrent.atomic.AtomicInteger;
-public class PipeConnectorSubtaskExecutor extends PipeSubtaskExecutor {
+public class PipeSinkSubtaskExecutor extends PipeSubtaskExecutor {
private static final AtomicInteger id = new AtomicInteger(0);
- public PipeConnectorSubtaskExecutor() {
+ public PipeSinkSubtaskExecutor() {
super(
PipeConfig.getInstance().getPipeSubtaskExecutorMaxThreadNum(),
ThreadName.PIPE_CONNECTOR_EXECUTOR_POOL.getName() + "-" + id.get(),
@@ -36,7 +36,7 @@ public class PipeConnectorSubtaskExecutor extends PipeSubtaskExecutor {
true);
}
- public PipeConnectorSubtaskExecutor(final int corePoolSize, final String threadName) {
+ public PipeSinkSubtaskExecutor(final int corePoolSize, final String threadName) {
super(corePoolSize, threadName, true);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSubtaskExecutorManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSubtaskExecutorManager.java
index e0a71454d23..61edbe5d60f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSubtaskExecutorManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSubtaskExecutorManager.java
@@ -31,7 +31,7 @@ import java.util.function.Supplier;
*/
public class PipeSubtaskExecutorManager {
private final PipeProcessorSubtaskExecutor processorExecutor;
- private final Supplier<PipeConnectorSubtaskExecutor> connectorExecutorSupplier;
+ private final Supplier<PipeSinkSubtaskExecutor> connectorExecutorSupplier;
private final SubscriptionSubtaskExecutor subscriptionExecutor;
private final Supplier<PipeConsensusSubtaskExecutor> consensusExecutorSupplier;
@@ -39,7 +39,7 @@ public class PipeSubtaskExecutorManager {
return processorExecutor;
}
- public Supplier<PipeConnectorSubtaskExecutor> getConnectorExecutorSupplier() {
+ public Supplier<PipeSinkSubtaskExecutor> getConnectorExecutorSupplier() {
return connectorExecutorSupplier;
}
@@ -55,7 +55,7 @@ public class PipeSubtaskExecutorManager {
private PipeSubtaskExecutorManager() {
processorExecutor = new PipeProcessorSubtaskExecutor();
- connectorExecutorSupplier = PipeConnectorSubtaskExecutor::new;
+ connectorExecutorSupplier = PipeSinkSubtaskExecutor::new;
subscriptionExecutor =
SubscriptionConfig.getInstance().getSubscriptionEnabled()
? new SubscriptionSubtaskExecutor()
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskConnectorStage.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskSinkStage.java
similarity index 72%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskConnectorStage.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskSinkStage.java
index e5ae5dacd27..c24db53e610 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskConnectorStage.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskSinkStage.java
@@ -21,31 +21,31 @@ package org.apache.iotdb.db.pipe.agent.task.stage;
import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue;
import org.apache.iotdb.commons.pipe.agent.task.stage.PipeTaskStage;
-import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskConnectorRuntimeEnvironment;
-import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor;
-import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtaskManager;
+import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSinkRuntimeEnvironment;
+import org.apache.iotdb.db.pipe.agent.task.execution.PipeSinkSubtaskExecutor;
+import org.apache.iotdb.db.pipe.agent.task.subtask.sink.PipeSinkSubtaskManager;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import org.apache.iotdb.pipe.api.event.Event;
import org.apache.iotdb.pipe.api.exception.PipeException;
import java.util.function.Supplier;
-public class PipeTaskConnectorStage extends PipeTaskStage {
+public class PipeTaskSinkStage extends PipeTaskStage {
protected final String pipeName;
protected final long creationTime;
protected final PipeParameters pipeConnectorParameters;
protected final int regionId;
- protected final Supplier<? extends PipeConnectorSubtaskExecutor> executor;
+ protected final Supplier<? extends PipeSinkSubtaskExecutor> executor;
protected String connectorSubtaskId;
- public PipeTaskConnectorStage(
+ public PipeTaskSinkStage(
String pipeName,
long creationTime,
PipeParameters pipeConnectorParameters,
int regionId,
- Supplier<? extends PipeConnectorSubtaskExecutor> executor) {
+ Supplier<? extends PipeSinkSubtaskExecutor> executor) {
this.pipeName = pipeName;
this.creationTime = creationTime;
this.pipeConnectorParameters = pipeConnectorParameters;
@@ -57,11 +57,11 @@ public class PipeTaskConnectorStage extends PipeTaskStage {
protected void registerSubtask() {
this.connectorSubtaskId =
- PipeConnectorSubtaskManager.instance()
+ PipeSinkSubtaskManager.instance()
.register(
executor,
pipeConnectorParameters,
- new PipeTaskConnectorRuntimeEnvironment(pipeName, creationTime, regionId));
+ new PipeTaskSinkRuntimeEnvironment(pipeName, creationTime, regionId));
}
@Override
@@ -71,21 +71,21 @@ public class PipeTaskConnectorStage extends PipeTaskStage {
@Override
public void startSubtask() throws PipeException {
- PipeConnectorSubtaskManager.instance().start(connectorSubtaskId);
+ PipeSinkSubtaskManager.instance().start(connectorSubtaskId);
}
@Override
public void stopSubtask() throws PipeException {
- PipeConnectorSubtaskManager.instance().stop(connectorSubtaskId);
+ PipeSinkSubtaskManager.instance().stop(connectorSubtaskId);
}
@Override
public void dropSubtask() throws PipeException {
- PipeConnectorSubtaskManager.instance()
+ PipeSinkSubtaskManager.instance()
.deregister(pipeName, creationTime, regionId, connectorSubtaskId);
}
public UnboundedBlockingPendingQueue<Event> getPipeConnectorPendingQueue() {
- return PipeConnectorSubtaskManager.instance().getPipeConnectorPendingQueue(connectorSubtaskId);
+ return PipeSinkSubtaskManager.instance().getPipeConnectorPendingQueue(connectorSubtaskId);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskExtractorStage.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskSourceStage.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskExtractorStage.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskSourceStage.java
index df1a7079f63..fc3bd646549 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskExtractorStage.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskSourceStage.java
@@ -36,13 +36,13 @@ import org.apache.iotdb.pipe.api.exception.PipeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PipeTaskExtractorStage extends PipeTaskStage {
+public class PipeTaskSourceStage extends PipeTaskStage {
- private static final Logger LOGGER = LoggerFactory.getLogger(PipeTaskExtractorStage.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeTaskSourceStage.class);
private final PipeExtractor pipeExtractor;
- public PipeTaskExtractorStage(
+ public PipeTaskSourceStage(
String pipeName,
long creationTime,
PipeParameters extractorParameters,
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeRealtimePriorityBlockingQueue.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeRealtimePriorityBlockingQueue.java
index 409447b5b2f..2baebeedc18 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeRealtimePriorityBlockingQueue.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.agent.task.subtask.connector;
+package org.apache.iotdb.db.pipe.agent.task.subtask.sink;
import org.apache.iotdb.commons.pipe.agent.task.connection.BlockingPendingQueue;
import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java
similarity index 83%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtask.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java
index 2415ea6e36e..4b98ae82d81 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.agent.task.subtask.connector;
+package org.apache.iotdb.db.pipe.agent.task.subtask.sink;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException;
import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue;
-import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeAbstractConnectorSubtask;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector;
+import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeAbstractSinkSubtask;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSink;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.sync.IoTDBDataRegionSyncConnector;
import org.apache.iotdb.db.pipe.event.UserDefinedEnrichedEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent;
-import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionConnectorMetrics;
-import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionConnectorMetrics;
+import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionSinkMetrics;
+import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.sync.IoTDBDataRegionSyncSink;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.utils.ErrorHandlingUtils;
import org.apache.iotdb.pipe.api.PipeConnector;
@@ -46,9 +46,9 @@ import org.slf4j.LoggerFactory;
import java.util.Objects;
-public class PipeConnectorSubtask extends PipeAbstractConnectorSubtask {
+public class PipeSinkSubtask extends PipeAbstractSinkSubtask {
- private static final Logger LOGGER = LoggerFactory.getLogger(PipeConnectorSubtask.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeSinkSubtask.class);
// For input
protected final UnboundedBlockingPendingQueue<Event> inputPendingQueue;
@@ -64,7 +64,7 @@ public class PipeConnectorSubtask extends PipeAbstractConnectorSubtask {
public static final PipeHeartbeatEvent CRON_HEARTBEAT_EVENT =
new PipeHeartbeatEvent("cron", false);
- public PipeConnectorSubtask(
+ public PipeSinkSubtask(
final String taskID,
final long creationTime,
final String attributeSortedString,
@@ -77,9 +77,9 @@ public class PipeConnectorSubtask extends PipeAbstractConnectorSubtask {
this.inputPendingQueue = inputPendingQueue;
if (!attributeSortedString.startsWith("schema_")) {
- PipeDataRegionConnectorMetrics.getInstance().register(this);
+ PipeDataRegionSinkMetrics.getInstance().register(this);
} else {
- PipeSchemaRegionConnectorMetrics.getInstance().register(this);
+ PipeSchemaRegionSinkMetrics.getInstance().register(this);
}
}
@@ -108,17 +108,17 @@ public class PipeConnectorSubtask extends PipeAbstractConnectorSubtask {
if (event instanceof TabletInsertionEvent) {
outputPipeConnector.transfer((TabletInsertionEvent) event);
- PipeDataRegionConnectorMetrics.getInstance().markTabletEvent(taskID);
+ PipeDataRegionSinkMetrics.getInstance().markTabletEvent(taskID);
} else if (event instanceof TsFileInsertionEvent) {
outputPipeConnector.transfer((TsFileInsertionEvent) event);
- PipeDataRegionConnectorMetrics.getInstance().markTsFileEvent(taskID);
+ PipeDataRegionSinkMetrics.getInstance().markTsFileEvent(taskID);
} else if (event instanceof PipeSchemaRegionWritePlanEvent) {
outputPipeConnector.transfer(event);
if (((PipeSchemaRegionWritePlanEvent) event).getPlanNode().getType()
!= PlanNodeType.DELETE_DATA) {
// Only plan nodes in schema region will be marked, delete data node is currently not
// taken into account
- PipeSchemaRegionConnectorMetrics.getInstance().markSchemaEvent(taskID);
+ PipeSchemaRegionSinkMetrics.getInstance().markSchemaEvent(taskID);
}
} else if (event instanceof PipeHeartbeatEvent) {
transferHeartbeatEvent((PipeHeartbeatEvent) event);
@@ -185,15 +185,15 @@ public class PipeConnectorSubtask extends PipeAbstractConnectorSubtask {
}
event.onTransferred();
- PipeDataRegionConnectorMetrics.getInstance().markPipeHeartbeatEvent(taskID);
+ PipeDataRegionSinkMetrics.getInstance().markPipeHeartbeatEvent(taskID);
}
@Override
public void close() {
if (!attributeSortedString.startsWith("schema_")) {
- PipeDataRegionConnectorMetrics.getInstance().deregister(taskID);
+ PipeDataRegionSinkMetrics.getInstance().deregister(taskID);
} else {
- PipeSchemaRegionConnectorMetrics.getInstance().deregister(taskID);
+ PipeSchemaRegionSinkMetrics.getInstance().deregister(taskID);
}
isClosed.set(true);
@@ -273,8 +273,8 @@ public class PipeConnectorSubtask extends PipeAbstractConnectorSubtask {
highPriorityLockTaskCount.decrementAndGet();
}
- if (outputPipeConnector instanceof IoTDBConnector) {
- ((IoTDBConnector) outputPipeConnector).discardEventsOfPipe(pipeNameToDrop, regionId);
+ if (outputPipeConnector instanceof IoTDBSink) {
+ ((IoTDBSink) outputPipeConnector).discardEventsOfPipe(pipeNameToDrop, regionId);
}
}
@@ -304,36 +304,36 @@ public class PipeConnectorSubtask extends PipeAbstractConnectorSubtask {
}
public int getAsyncConnectorRetryEventQueueSize() {
- return outputPipeConnector instanceof IoTDBDataRegionAsyncConnector
- ? ((IoTDBDataRegionAsyncConnector) outputPipeConnector).getRetryEventQueueSize()
+ return outputPipeConnector instanceof IoTDBDataRegionAsyncSink
+ ? ((IoTDBDataRegionAsyncSink) outputPipeConnector).getRetryEventQueueSize()
: 0;
}
public int getPendingHandlersSize() {
- return outputPipeConnector instanceof IoTDBDataRegionAsyncConnector
- ? ((IoTDBDataRegionAsyncConnector) outputPipeConnector).getPendingHandlersSize()
+ return outputPipeConnector instanceof IoTDBDataRegionAsyncSink
+ ? ((IoTDBDataRegionAsyncSink) outputPipeConnector).getPendingHandlersSize()
: 0;
}
public int getBatchSize() {
- if (outputPipeConnector instanceof IoTDBDataRegionAsyncConnector) {
- return ((IoTDBDataRegionAsyncConnector) outputPipeConnector).getBatchSize();
+ if (outputPipeConnector instanceof IoTDBDataRegionAsyncSink) {
+ return ((IoTDBDataRegionAsyncSink) outputPipeConnector).getBatchSize();
}
- if (outputPipeConnector instanceof IoTDBDataRegionSyncConnector) {
- return ((IoTDBDataRegionSyncConnector) outputPipeConnector).getBatchSize();
+ if (outputPipeConnector instanceof IoTDBDataRegionSyncSink) {
+ return ((IoTDBDataRegionSyncSink) outputPipeConnector).getBatchSize();
}
return 0;
}
public double getTotalUncompressedSize() {
- return outputPipeConnector instanceof IoTDBConnector
- ? ((IoTDBConnector) outputPipeConnector).getTotalUncompressedSize()
+ return outputPipeConnector instanceof IoTDBSink
+ ? ((IoTDBSink) outputPipeConnector).getTotalUncompressedSize()
: 0;
}
public double getTotalCompressedSize() {
- return outputPipeConnector instanceof IoTDBConnector
- ? ((IoTDBConnector) outputPipeConnector).getTotalCompressedSize()
+ return outputPipeConnector instanceof IoTDBSink
+ ? ((IoTDBSink) outputPipeConnector).getTotalCompressedSize()
: 0;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtaskLifeCycle.java
similarity index 77%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtaskLifeCycle.java
index 6e4a858a370..80929379a10 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtaskLifeCycle.java
@@ -17,30 +17,30 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.agent.task.subtask.connector;
+package org.apache.iotdb.db.pipe.agent.task.subtask.sink;
import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue;
-import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor;
+import org.apache.iotdb.db.pipe.agent.task.execution.PipeSinkSubtaskExecutor;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
import org.apache.iotdb.pipe.api.event.Event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PipeConnectorSubtaskLifeCycle implements AutoCloseable {
+public class PipeSinkSubtaskLifeCycle implements AutoCloseable {
- private static final Logger LOGGER = LoggerFactory.getLogger(PipeConnectorSubtaskLifeCycle.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeSinkSubtaskLifeCycle.class);
- protected final PipeConnectorSubtaskExecutor executor;
- protected final PipeConnectorSubtask subtask;
+ protected final PipeSinkSubtaskExecutor executor;
+ protected final PipeSinkSubtask subtask;
private final UnboundedBlockingPendingQueue<Event> pendingQueue;
protected int runningTaskCount;
protected int registeredTaskCount;
- public PipeConnectorSubtaskLifeCycle(
- PipeConnectorSubtaskExecutor executor,
- PipeConnectorSubtask subtask,
+ public PipeSinkSubtaskLifeCycle(
+ PipeSinkSubtaskExecutor executor,
+ PipeSinkSubtask subtask,
UnboundedBlockingPendingQueue<Event> pendingQueue) {
this.executor = executor;
this.subtask = subtask;
@@ -50,7 +50,7 @@ public class PipeConnectorSubtaskLifeCycle implements AutoCloseable {
registeredTaskCount = 0;
}
- public PipeConnectorSubtask getSubtask() {
+ public PipeSinkSubtask getSubtask() {
return subtask;
}
@@ -79,19 +79,18 @@ public class PipeConnectorSubtaskLifeCycle implements AutoCloseable {
}
/**
- * Deregister the {@link PipeConnectorSubtask}. If the {@link PipeConnectorSubtask} is the last
- * one, close the {@link PipeConnectorSubtask}.
+ * Deregister the {@link PipeSinkSubtask}. If the {@link PipeSinkSubtask} is the last one, close
+ * the {@link PipeSinkSubtask}.
*
- * <p>Note that this method should be called after the {@link PipeConnectorSubtask} is stopped.
- * Otherwise, the {@link PipeConnectorSubtaskLifeCycle#runningTaskCount} might be inconsistent
- * with the {@link PipeConnectorSubtaskLifeCycle#registeredTaskCount} because of parallel
- * connector scheduling.
+ * <p>Note that this method should be called after the {@link PipeSinkSubtask} is stopped.
+ * Otherwise, the {@link PipeSinkSubtaskLifeCycle#runningTaskCount} might be inconsistent with the
+ * {@link PipeSinkSubtaskLifeCycle#registeredTaskCount} because of parallel connector scheduling.
*
* @param pipeNameToDeregister pipe name
* @param regionId region id
- * @return {@code true} if the {@link PipeConnectorSubtask} is out of life cycle, indicating that
- * the {@link PipeConnectorSubtask} should never be used again
- * @throws IllegalStateException if {@link PipeConnectorSubtaskLifeCycle#registeredTaskCount} <= 0
+ * @return {@code true} if the {@link PipeSinkSubtask} is out of life cycle, indicating that the
+ * {@link PipeSinkSubtask} should never be used again
+ * @throws IllegalStateException if {@link PipeSinkSubtaskLifeCycle#registeredTaskCount} <= 0
*/
public synchronized boolean deregister(final String pipeNameToDeregister, int regionId) {
if (registeredTaskCount <= 0) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtaskManager.java
similarity index 80%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskManager.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtaskManager.java
index 9e867d6083e..e25cf6be67f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtaskManager.java
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.agent.task.subtask.connector;
+package org.apache.iotdb.db.pipe.agent.task.subtask.sink;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta;
import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
import org.apache.iotdb.commons.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration;
-import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskConnectorRuntimeEnvironment;
+import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSinkRuntimeEnvironment;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
+import org.apache.iotdb.db.pipe.agent.task.execution.PipeSinkSubtaskExecutor;
import org.apache.iotdb.db.pipe.consensus.ReplicateProgressDataNodeManager;
import org.apache.iotdb.db.pipe.metric.source.PipeDataRegionEventCounter;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.db.storageengine.StorageEngine;
import org.apache.iotdb.pipe.api.PipeConnector;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;
@@ -52,24 +52,24 @@ import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
-public class PipeConnectorSubtaskManager {
+public class PipeSinkSubtaskManager {
- private static final Logger LOGGER = LoggerFactory.getLogger(PipeConnectorSubtaskManager.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeSinkSubtaskManager.class);
private static final String FAILED_TO_DEREGISTER_EXCEPTION_MESSAGE =
"Failed to deregister PipeConnectorSubtask. No such subtask: ";
- private final Map<String, List<PipeConnectorSubtaskLifeCycle>>
+ private final Map<String, List<PipeSinkSubtaskLifeCycle>>
attributeSortedString2SubtaskLifeCycleMap = new HashMap<>();
public synchronized String register(
- final Supplier<? extends PipeConnectorSubtaskExecutor> executorSupplier,
+ final Supplier<? extends PipeSinkSubtaskExecutor> executorSupplier,
final PipeParameters pipeConnectorParameters,
- final PipeTaskConnectorRuntimeEnvironment environment) {
+ final PipeTaskSinkRuntimeEnvironment environment) {
final String connectorKey =
pipeConnectorParameters
.getStringOrDefault(
- Arrays.asList(PipeConnectorConstant.CONNECTOR_KEY, PipeConnectorConstant.SINK_KEY),
+ Arrays.asList(PipeSinkConstant.CONNECTOR_KEY, PipeSinkConstant.SINK_KEY),
BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName())
// Convert the value of `CONNECTOR_KEY` or `SINK_KEY` to lowercase
// for matching in `CONNECTOR_CONSTRUCTORS`
@@ -94,15 +94,15 @@ public class PipeConnectorSubtaskManager {
connectorNum =
pipeConnectorParameters.getIntOrDefault(
Arrays.asList(
- PipeConnectorConstant.CONNECTOR_IOTDB_PARALLEL_TASKS_KEY,
- PipeConnectorConstant.SINK_IOTDB_PARALLEL_TASKS_KEY),
- PipeConnectorConstant.CONNECTOR_IOTDB_PARALLEL_TASKS_DEFAULT_VALUE);
+ PipeSinkConstant.CONNECTOR_IOTDB_PARALLEL_TASKS_KEY,
+ PipeSinkConstant.SINK_IOTDB_PARALLEL_TASKS_KEY),
+ PipeSinkConstant.CONNECTOR_IOTDB_PARALLEL_TASKS_DEFAULT_VALUE);
realTimeFirst =
pipeConnectorParameters.getBooleanOrDefault(
Arrays.asList(
- PipeConnectorConstant.CONNECTOR_REALTIME_FIRST_KEY,
- PipeConnectorConstant.SINK_REALTIME_FIRST_KEY),
- PipeConnectorConstant.CONNECTOR_REALTIME_FIRST_DEFAULT_VALUE);
+ PipeSinkConstant.CONNECTOR_REALTIME_FIRST_KEY,
+ PipeSinkConstant.SINK_REALTIME_FIRST_KEY),
+ PipeSinkConstant.CONNECTOR_REALTIME_FIRST_DEFAULT_VALUE);
attributeSortedString = "data_" + attributeSortedString;
} else {
// Do not allow parallel tasks for schema region connectors
@@ -113,9 +113,9 @@ public class PipeConnectorSubtaskManager {
environment.setAttributeSortedString(attributeSortedString);
if (!attributeSortedString2SubtaskLifeCycleMap.containsKey(attributeSortedString)) {
- final PipeConnectorSubtaskExecutor executor = executorSupplier.get();
+ final PipeSinkSubtaskExecutor executor = executorSupplier.get();
- final List<PipeConnectorSubtaskLifeCycle> pipeConnectorSubtaskLifeCycleList =
+ final List<PipeSinkSubtaskLifeCycle> pipeSinkSubtaskLifeCycleList =
new ArrayList<>(connectorNum);
AtomicInteger counter = new AtomicInteger(0);
@@ -139,8 +139,8 @@ public class PipeConnectorSubtaskManager {
// 1. Construct, validate and customize PipeConnector, and then handshake (create
// connection) with the target
try {
- if (pipeConnector instanceof IoTDBDataRegionAsyncConnector) {
- ((IoTDBDataRegionAsyncConnector) pipeConnector).setTransferTsFileCounter(counter);
+ if (pipeConnector instanceof IoTDBDataRegionAsyncSink) {
+ ((IoTDBDataRegionAsyncSink) pipeConnector).setTransferTsFileCounter(counter);
}
pipeConnector.validate(new PipeParameterValidator(pipeConnectorParameters));
pipeConnector.customize(
@@ -160,8 +160,8 @@ public class PipeConnectorSubtaskManager {
}
// 2. Construct PipeConnectorSubtaskLifeCycle to manage PipeConnectorSubtask's life cycle
- final PipeConnectorSubtask pipeConnectorSubtask =
- new PipeConnectorSubtask(
+ final PipeSinkSubtask pipeSinkSubtask =
+ new PipeSinkSubtask(
String.format(
"%s_%s_%s",
attributeSortedString, environment.getCreationTime(), connectorIndex),
@@ -170,9 +170,9 @@ public class PipeConnectorSubtaskManager {
connectorIndex,
pendingQueue,
pipeConnector);
- final PipeConnectorSubtaskLifeCycle pipeConnectorSubtaskLifeCycle =
- new PipeConnectorSubtaskLifeCycle(executor, pipeConnectorSubtask, pendingQueue);
- pipeConnectorSubtaskLifeCycleList.add(pipeConnectorSubtaskLifeCycle);
+ final PipeSinkSubtaskLifeCycle pipeSinkSubtaskLifeCycle =
+ new PipeSinkSubtaskLifeCycle(executor, pipeSinkSubtask, pendingQueue);
+ pipeSinkSubtaskLifeCycleList.add(pipeSinkSubtaskLifeCycle);
}
LOGGER.info(
@@ -181,10 +181,10 @@ public class PipeConnectorSubtaskManager {
executor.getWorkingThreadName(),
executor.getCallbackThreadName());
attributeSortedString2SubtaskLifeCycleMap.put(
- attributeSortedString, pipeConnectorSubtaskLifeCycleList);
+ attributeSortedString, pipeSinkSubtaskLifeCycleList);
}
- for (final PipeConnectorSubtaskLifeCycle lifeCycle :
+ for (final PipeSinkSubtaskLifeCycle lifeCycle :
attributeSortedString2SubtaskLifeCycleMap.get(attributeSortedString)) {
lifeCycle.register();
}
@@ -201,11 +201,11 @@ public class PipeConnectorSubtaskManager {
throw new PipeException(FAILED_TO_DEREGISTER_EXCEPTION_MESSAGE + attributeSortedString);
}
- final List<PipeConnectorSubtaskLifeCycle> lifeCycles =
+ final List<PipeSinkSubtaskLifeCycle> lifeCycles =
attributeSortedString2SubtaskLifeCycleMap.get(attributeSortedString);
// Shall not be empty
- final PipeConnectorSubtaskExecutor executor = lifeCycles.get(0).executor;
+ final PipeSinkSubtaskExecutor executor = lifeCycles.get(0).executor;
lifeCycles.removeIf(o -> o.deregister(pipeName, regionId));
@@ -229,7 +229,7 @@ public class PipeConnectorSubtaskManager {
throw new PipeException(FAILED_TO_DEREGISTER_EXCEPTION_MESSAGE + attributeSortedString);
}
- for (final PipeConnectorSubtaskLifeCycle lifeCycle :
+ for (final PipeSinkSubtaskLifeCycle lifeCycle :
attributeSortedString2SubtaskLifeCycleMap.get(attributeSortedString)) {
lifeCycle.start();
}
@@ -240,7 +240,7 @@ public class PipeConnectorSubtaskManager {
throw new PipeException(FAILED_TO_DEREGISTER_EXCEPTION_MESSAGE + attributeSortedString);
}
- for (final PipeConnectorSubtaskLifeCycle lifeCycle :
+ for (final PipeSinkSubtaskLifeCycle lifeCycle :
attributeSortedString2SubtaskLifeCycleMap.get(attributeSortedString)) {
lifeCycle.stop();
}
@@ -269,15 +269,15 @@ public class PipeConnectorSubtaskManager {
///////////////////////// Singleton Instance Holder /////////////////////////
- private PipeConnectorSubtaskManager() {
+ private PipeSinkSubtaskManager() {
// Do nothing
}
private static class PipeSubtaskManagerHolder {
- private static final PipeConnectorSubtaskManager INSTANCE = new PipeConnectorSubtaskManager();
+ private static final PipeSinkSubtaskManager INSTANCE = new PipeSinkSubtaskManager();
}
- public static PipeConnectorSubtaskManager instance() {
+ public static PipeSinkSubtaskManager instance() {
return PipeSubtaskManagerHolder.INSTANCE;
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/PipeConsensusSubtaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/PipeConsensusSubtaskExecutor.java
index d50e08463e2..8b91c8d4089 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/PipeConsensusSubtaskExecutor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/PipeConsensusSubtaskExecutor.java
@@ -20,11 +20,11 @@ package org.apache.iotdb.db.pipe.consensus;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor;
+import org.apache.iotdb.db.pipe.agent.task.execution.PipeSinkSubtaskExecutor;
import java.util.concurrent.atomic.AtomicInteger;
-public class PipeConsensusSubtaskExecutor extends PipeConnectorSubtaskExecutor {
+public class PipeConsensusSubtaskExecutor extends PipeSinkSubtaskExecutor {
private static final AtomicInteger id = new AtomicInteger(0);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/metric/PipeConsensusConnectorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/metric/PipeConsensusSinkMetrics.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/metric/PipeConsensusConnectorMetrics.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/metric/PipeConsensusSinkMetrics.java
index 3faf7b987a4..b2a78edfeea 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/metric/PipeConsensusConnectorMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/metric/PipeConsensusSinkMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.consensus.metric;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.PipeConsensusAsyncConnector;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.impl.DoNothingMetricManager;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
@@ -30,8 +30,8 @@ import org.apache.iotdb.metrics.type.Timer;
import org.apache.iotdb.metrics.utils.MetricLevel;
import org.apache.iotdb.metrics.utils.MetricType;
-public class PipeConsensusConnectorMetrics implements IMetricSet {
- private final PipeConsensusAsyncConnector pipeConsensusAsyncConnector;
+public class PipeConsensusSinkMetrics implements IMetricSet {
+ private final PipeConsensusAsyncSink pipeConsensusAsyncConnector;
private Timer connectorEnqueueTimer = DoNothingMetricManager.DO_NOTHING_TIMER;
private Timer connectorWALTransferTimer = DoNothingMetricManager.DO_NOTHING_TIMER;
@@ -43,7 +43,7 @@ public class PipeConsensusConnectorMetrics implements IMetricSet {
private static final String CONNECTOR = "pipeConsensusAsyncConnector";
- public PipeConsensusConnectorMetrics(PipeConsensusAsyncConnector pipeConsensusAsyncConnector) {
+ public PipeConsensusSinkMetrics(PipeConsensusAsyncSink pipeConsensusAsyncConnector) {
this.pipeConsensusAsyncConnector = pipeConsensusAsyncConnector;
}
@@ -107,7 +107,7 @@ public class PipeConsensusConnectorMetrics implements IMetricSet {
Metric.PIPE_SEND_EVENT.toString(),
MetricLevel.IMPORTANT,
pipeConsensusAsyncConnector,
- PipeConsensusAsyncConnector::getTransferBufferSize,
+ PipeConsensusAsyncSink::getTransferBufferSize,
Tag.NAME.toString(),
CONNECTOR,
Tag.REGION.toString(),
@@ -118,7 +118,7 @@ public class PipeConsensusConnectorMetrics implements IMetricSet {
Metric.PIPE_SEND_EVENT.toString(),
MetricLevel.IMPORTANT,
pipeConsensusAsyncConnector,
- PipeConsensusAsyncConnector::getRetryBufferSize,
+ PipeConsensusAsyncSink::getRetryBufferSize,
Tag.NAME.toString(),
CONNECTOR,
Tag.REGION.toString(),
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeCompactedTsFileInsertionEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeCompactedTsFileInsertionEvent.java
index bcc6c5facdd..b0272c75fd6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeCompactedTsFileInsertionEvent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeCompactedTsFileInsertionEvent.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.commons.pipe.agent.task.progress.CommitterKey;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.assigner.PipeTsFileEpochProgressIndexKeeper;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.assigner.PipeTsFileEpochProgressIndexKeeper;
import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java
index ce9e70a2b42..5db40e82786 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java
@@ -35,11 +35,11 @@ import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.aggregator.TsFileInsertionPointCounter;
import org.apache.iotdb.db.pipe.event.common.tsfile.parser.TsFileInsertionEventParser;
import org.apache.iotdb.db.pipe.event.common.tsfile.parser.TsFileInsertionEventParserProvider;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.assigner.PipeTsFileEpochProgressIndexKeeper;
import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryManager;
import org.apache.iotdb.db.pipe.resource.tsfile.PipeTsFileResourceManager;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.assigner.PipeTsFileEpochProgressIndexKeeper;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEvent.java
index 2f48e0a47ae..839f0b870ec 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEvent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEvent.java
@@ -25,8 +25,8 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.db.pipe.event.common.PipeInsertionEvent;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.epoch.TsFileEpoch;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionSource;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.epoch.TsFileEpoch;
import org.apache.tsfile.file.metadata.IDeviceID;
@@ -107,7 +107,7 @@ public class PipeRealtimeEvent extends EnrichedEvent {
device2Measurements = null;
}
- public boolean mayExtractorUseTablets(final PipeRealtimeDataRegionExtractor extractor) {
+ public boolean mayExtractorUseTablets(final PipeRealtimeDataRegionSource extractor) {
final TsFileEpoch.State state = tsFileEpoch.getState(extractor);
return state.equals(TsFileEpoch.State.EMPTY) || state.equals(TsFileEpoch.State.USING_TABLET);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEventFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEventFactory.java
index 479d0fdf1f3..4941bae8a66 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEventFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeEventFactory.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.epoch.TsFileEpochManager;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.epoch.TsFileEpochManager;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeMetrics.java
index d7f1577a85c..e54e515afd2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeMetrics.java
@@ -26,12 +26,12 @@ import org.apache.iotdb.db.pipe.metric.overview.PipeResourceMetrics;
import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics;
import org.apache.iotdb.db.pipe.metric.processor.PipeProcessorMetrics;
import org.apache.iotdb.db.pipe.metric.receiver.PipeDataNodeReceiverMetrics;
-import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionConnectorMetrics;
-import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionExtractorMetrics;
import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionListenerMetrics;
-import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionConnectorMetrics;
+import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionSinkMetrics;
+import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionSourceMetrics;
+import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics;
import org.apache.iotdb.db.pipe.metric.source.PipeAssignerMetrics;
-import org.apache.iotdb.db.pipe.metric.source.PipeDataRegionExtractorMetrics;
+import org.apache.iotdb.db.pipe.metric.source.PipeDataRegionSourceMetrics;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
@@ -42,15 +42,15 @@ public class PipeDataNodeMetrics implements IMetricSet {
@Override
public void bindTo(final AbstractMetricService metricService) {
PipeAssignerMetrics.getInstance().bindTo(metricService);
- PipeDataRegionExtractorMetrics.getInstance().bindTo(metricService);
+ PipeDataRegionSourceMetrics.getInstance().bindTo(metricService);
PipeProcessorMetrics.getInstance().bindTo(metricService);
- PipeDataRegionConnectorMetrics.getInstance().bindTo(metricService);
+ PipeDataRegionSinkMetrics.getInstance().bindTo(metricService);
PipeHeartbeatEventMetrics.getInstance().bindTo(metricService);
PipeResourceMetrics.getInstance().bindTo(metricService);
PipeEventCommitMetrics.getInstance().bindTo(metricService);
PipeSchemaRegionListenerMetrics.getInstance().bindTo(metricService);
- PipeSchemaRegionExtractorMetrics.getInstance().bindTo(metricService);
- PipeSchemaRegionConnectorMetrics.getInstance().bindTo(metricService);
+ PipeSchemaRegionSourceMetrics.getInstance().bindTo(metricService);
+ PipeSchemaRegionSinkMetrics.getInstance().bindTo(metricService);
PipeDataNodeSinglePipeMetrics.getInstance().bindTo(metricService);
PipeDataNodeReceiverMetrics.getInstance().bindTo(metricService);
PipeTsFileToTabletsMetrics.getInstance().bindTo(metricService);
@@ -59,15 +59,15 @@ public class PipeDataNodeMetrics implements IMetricSet {
@Override
public void unbindFrom(final AbstractMetricService metricService) {
PipeAssignerMetrics.getInstance().unbindFrom(metricService);
- PipeDataRegionExtractorMetrics.getInstance().unbindFrom(metricService);
+ PipeDataRegionSourceMetrics.getInstance().unbindFrom(metricService);
PipeProcessorMetrics.getInstance().unbindFrom(metricService);
- PipeDataRegionConnectorMetrics.getInstance().unbindFrom(metricService);
+ PipeDataRegionSinkMetrics.getInstance().unbindFrom(metricService);
PipeHeartbeatEventMetrics.getInstance().unbindFrom(metricService);
PipeResourceMetrics.getInstance().unbindFrom(metricService);
PipeEventCommitMetrics.getInstance().unbindFrom(metricService);
PipeSchemaRegionListenerMetrics.getInstance().unbindFrom(metricService);
- PipeSchemaRegionExtractorMetrics.getInstance().unbindFrom(metricService);
- PipeSchemaRegionConnectorMetrics.getInstance().unbindFrom(metricService);
+ PipeSchemaRegionSourceMetrics.getInstance().unbindFrom(metricService);
+ PipeSchemaRegionSinkMetrics.getInstance().unbindFrom(metricService);
PipeDataNodeSinglePipeMetrics.getInstance().unbindFrom(metricService);
PipeDataNodeReceiverMetrics.getInstance().unbindFrom(metricService);
PipeTsFileToTabletsMetrics.getInstance().unbindFrom(metricService);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeRemainingEventAndTimeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeRemainingEventAndTimeOperator.java
index 996b71cfc3d..db19cc477d8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeRemainingEventAndTimeOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeRemainingEventAndTimeOperator.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.db.pipe.metric.overview;
import org.apache.iotdb.commons.enums.PipeRateAverage;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
import org.apache.iotdb.commons.pipe.metric.PipeRemainingOperator;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor;
+import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource;
import org.apache.iotdb.metrics.core.IoTDBMetricManager;
import org.apache.iotdb.metrics.core.type.IoTDBHistogram;
import org.apache.iotdb.metrics.impl.DoNothingMetricManager;
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicReference;
public class PipeDataNodeRemainingEventAndTimeOperator extends PipeRemainingOperator {
// Calculate from schema region extractors directly for it requires less computation
- private final Set<IoTDBSchemaRegionExtractor> schemaRegionExtractors =
+ private final Set<IoTDBSchemaRegionSource> schemaRegionExtractors =
Collections.newSetFromMap(new ConcurrentHashMap<>());
private final AtomicInteger insertNodeEventCount = new AtomicInteger(0);
@@ -106,7 +106,7 @@ public class PipeDataNodeRemainingEventAndTimeOperator extends PipeRemainingOper
+ rawTabletEventCount.get()
+ insertNodeEventCount.get()
+ schemaRegionExtractors.stream()
- .map(IoTDBSchemaRegionExtractor::getUnTransferredEventCount)
+ .map(IoTDBSchemaRegionSource::getUnTransferredEventCount)
.reduce(Long::sum)
.orElse(0L);
@@ -127,7 +127,7 @@ public class PipeDataNodeRemainingEventAndTimeOperator extends PipeRemainingOper
+ insertNodeEventCount.get()
+ heartbeatEventCount.get()
+ schemaRegionExtractors.stream()
- .map(IoTDBSchemaRegionExtractor::getUnTransferredEventCount)
+ .map(IoTDBSchemaRegionSource::getUnTransferredEventCount)
.reduce(Long::sum)
.orElse(0L);
@@ -175,7 +175,7 @@ public class PipeDataNodeRemainingEventAndTimeOperator extends PipeRemainingOper
final long totalSchemaRegionWriteEventCount =
schemaRegionExtractors.stream()
- .map(IoTDBSchemaRegionExtractor::getUnTransferredEventCount)
+ .map(IoTDBSchemaRegionSource::getUnTransferredEventCount)
.reduce(Long::sum)
.orElse(0L);
@@ -209,7 +209,7 @@ public class PipeDataNodeRemainingEventAndTimeOperator extends PipeRemainingOper
//////////////////////////// Register & deregister (pipe integration) ////////////////////////////
- void register(final IoTDBSchemaRegionExtractor extractor) {
+ void register(final IoTDBSchemaRegionSource extractor) {
schemaRegionExtractors.add(extractor);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeSinglePipeMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeSinglePipeMetrics.java
index 70b4561bb5c..f52b28ba2d7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeSinglePipeMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeSinglePipeMetrics.java
@@ -23,9 +23,9 @@ import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
+import org.apache.iotdb.db.pipe.source.dataregion.IoTDBDataRegionSource;
+import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.impl.DoNothingMetricManager;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
@@ -225,7 +225,7 @@ public class PipeDataNodeSinglePipeMetrics implements IMetricSet {
//////////////////////////// register & deregister (pipe integration) ////////////////////////////
- public void register(final IoTDBDataRegionExtractor extractor) {
+ public void register(final IoTDBDataRegionSource extractor) {
// The metric is global thus the regionId is omitted
final String pipeID = extractor.getPipeName() + "_" + extractor.getCreationTime();
remainingEventAndTimeOperatorMap.computeIfAbsent(
@@ -238,7 +238,7 @@ public class PipeDataNodeSinglePipeMetrics implements IMetricSet {
}
}
- public void register(final IoTDBSchemaRegionExtractor extractor) {
+ public void register(final IoTDBSchemaRegionSource extractor) {
// The metric is global thus the regionId is omitted
final String pipeID = extractor.getPipeName() + "_" + extractor.getCreationTime();
remainingEventAndTimeOperatorMap
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeTsFileToTabletsMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeTsFileToTabletsMetrics.java
index 04015fe6f82..4f2159f356c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeTsFileToTabletsMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/overview/PipeTsFileToTabletsMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.metric.overview;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor;
+import org.apache.iotdb.db.pipe.source.dataregion.IoTDBDataRegionSource;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.type.Rate;
@@ -102,7 +102,7 @@ public class PipeTsFileToTabletsMetrics implements IMetricSet {
//////////////////////////// register & deregister ////////////////////////////
- public void register(final IoTDBDataRegionExtractor extractor) {
+ public void register(final IoTDBDataRegionSource extractor) {
final String pipeID = extractor.getPipeName() + "_" + extractor.getCreationTime();
pipe.add(pipeID);
if (Objects.nonNull(metricService)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java
index e49c0009281..ee2b6c09989 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionListenerMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.metric.schema;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.SchemaRegionListeningQueue;
+import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionConnectorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSinkMetrics.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionConnectorMetrics.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSinkMetrics.java
index 407c38f02cb..940b4404086 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionConnectorMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSinkMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.metric.schema;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask;
+import org.apache.iotdb.db.pipe.agent.task.subtask.sink.PipeSinkSubtask;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.type.Rate;
@@ -37,16 +37,14 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-public class PipeSchemaRegionConnectorMetrics implements IMetricSet {
+public class PipeSchemaRegionSinkMetrics implements IMetricSet {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeSchemaRegionConnectorMetrics.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeSchemaRegionSinkMetrics.class);
@SuppressWarnings("java:S3077")
private volatile AbstractMetricService metricService;
- private final ConcurrentMap<String, PipeConnectorSubtask> connectorMap =
- new ConcurrentHashMap<>();
+ private final ConcurrentMap<String, PipeSinkSubtask> connectorMap = new ConcurrentHashMap<>();
private final ConcurrentMap<String, Rate> schemaRateMap = new ConcurrentHashMap<>();
//////////////////////////// bindTo & unbindFrom (metric framework) ////////////////////////////
@@ -62,7 +60,7 @@ public class PipeSchemaRegionConnectorMetrics implements IMetricSet {
}
private void createRate(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
// Transfer event rate
schemaRateMap.put(
taskID,
@@ -89,7 +87,7 @@ public class PipeSchemaRegionConnectorMetrics implements IMetricSet {
}
private void removeRate(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
// Transfer event rate
metricService.remove(
MetricType.RATE,
@@ -103,9 +101,9 @@ public class PipeSchemaRegionConnectorMetrics implements IMetricSet {
//////////////////////////// Register & deregister (pipe integration) ////////////////////////////
- public void register(@NonNull final PipeConnectorSubtask pipeConnectorSubtask) {
- final String taskID = pipeConnectorSubtask.getTaskID();
- connectorMap.putIfAbsent(taskID, pipeConnectorSubtask);
+ public void register(@NonNull final PipeSinkSubtask pipeSinkSubtask) {
+ final String taskID = pipeSinkSubtask.getTaskID();
+ connectorMap.putIfAbsent(taskID, pipeSinkSubtask);
if (Objects.nonNull(metricService)) {
createMetrics(taskID);
}
@@ -140,21 +138,20 @@ public class PipeSchemaRegionConnectorMetrics implements IMetricSet {
//////////////////////////// singleton ////////////////////////////
- private static class PipeSchemaRegionConnectorMetricsHolder {
+ private static class PipeSchemaRegionSinkMetricsHolder {
- private static final PipeSchemaRegionConnectorMetrics INSTANCE =
- new PipeSchemaRegionConnectorMetrics();
+ private static final PipeSchemaRegionSinkMetrics INSTANCE = new PipeSchemaRegionSinkMetrics();
- private PipeSchemaRegionConnectorMetricsHolder() {
+ private PipeSchemaRegionSinkMetricsHolder() {
// Empty constructor
}
}
- public static PipeSchemaRegionConnectorMetrics getInstance() {
- return PipeSchemaRegionConnectorMetricsHolder.INSTANCE;
+ public static PipeSchemaRegionSinkMetrics getInstance() {
+ return PipeSchemaRegionSinkMetricsHolder.INSTANCE;
}
- private PipeSchemaRegionConnectorMetrics() {
+ private PipeSchemaRegionSinkMetrics() {
// Empty constructor
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionExtractorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSourceMetrics.java
similarity index 82%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionExtractorMetrics.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSourceMetrics.java
index c4157bbe4e0..5a2a74dc7ab 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionExtractorMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/schema/PipeSchemaRegionSourceMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.metric.schema;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor;
+import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -36,15 +36,14 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-public class PipeSchemaRegionExtractorMetrics implements IMetricSet {
+public class PipeSchemaRegionSourceMetrics implements IMetricSet {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeSchemaRegionExtractorMetrics.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeSchemaRegionSourceMetrics.class);
@SuppressWarnings("java:S3077")
private volatile AbstractMetricService metricService;
- private final Map<String, IoTDBSchemaRegionExtractor> extractorMap = new ConcurrentHashMap<>();
+ private final Map<String, IoTDBSchemaRegionSource> extractorMap = new ConcurrentHashMap<>();
//////////////////////////// bindTo & unbindFrom (metric framework) ////////////////////////////
@@ -59,12 +58,12 @@ public class PipeSchemaRegionExtractorMetrics implements IMetricSet {
}
private void createAutoGauge(final String taskID) {
- final IoTDBSchemaRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBSchemaRegionSource extractor = extractorMap.get(taskID);
metricService.createAutoGauge(
Metric.UNTRANSFERRED_SCHEMA_COUNT.toString(),
MetricLevel.IMPORTANT,
extractorMap.get(taskID),
- IoTDBSchemaRegionExtractor::getUnTransferredEventCount,
+ IoTDBSchemaRegionSource::getUnTransferredEventCount,
Tag.NAME.toString(),
extractor.getPipeName(),
Tag.REGION.toString(),
@@ -87,7 +86,7 @@ public class PipeSchemaRegionExtractorMetrics implements IMetricSet {
}
private void removeAutoGauge(final String taskID) {
- final IoTDBSchemaRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBSchemaRegionSource extractor = extractorMap.get(taskID);
// pending event count
metricService.remove(
MetricType.AUTO_GAUGE,
@@ -102,7 +101,7 @@ public class PipeSchemaRegionExtractorMetrics implements IMetricSet {
//////////////////////////// register & deregister (pipe integration) ////////////////////////////
- public void register(@NonNull final IoTDBSchemaRegionExtractor extractor) {
+ public void register(@NonNull final IoTDBSchemaRegionSource extractor) {
final String taskID = extractor.getTaskID();
extractorMap.putIfAbsent(taskID, extractor);
if (Objects.nonNull(metricService)) {
@@ -127,19 +126,19 @@ public class PipeSchemaRegionExtractorMetrics implements IMetricSet {
private static class PipeSchemaRegionExtractorMetricsHolder {
- private static final PipeSchemaRegionExtractorMetrics INSTANCE =
- new PipeSchemaRegionExtractorMetrics();
+ private static final PipeSchemaRegionSourceMetrics INSTANCE =
+ new PipeSchemaRegionSourceMetrics();
private PipeSchemaRegionExtractorMetricsHolder() {
// Empty constructor
}
}
- public static PipeSchemaRegionExtractorMetrics getInstance() {
+ public static PipeSchemaRegionSourceMetrics getInstance() {
return PipeSchemaRegionExtractorMetricsHolder.INSTANCE;
}
- private PipeSchemaRegionExtractorMetrics() {
+ private PipeSchemaRegionSourceMetrics() {
// Empty constructor
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionConnectorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionSinkMetrics.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionConnectorMetrics.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionSinkMetrics.java
index 49ac24f3e4c..52a8828b2ee 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionConnectorMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/sink/PipeDataRegionSinkMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.metric.sink;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask;
+import org.apache.iotdb.db.pipe.agent.task.subtask.sink.PipeSinkSubtask;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.impl.DoNothingHistogram;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
@@ -41,10 +41,9 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-public class PipeDataRegionConnectorMetrics implements IMetricSet {
+public class PipeDataRegionSinkMetrics implements IMetricSet {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeDataRegionConnectorMetrics.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeDataRegionSinkMetrics.class);
public static Histogram tabletBatchSizeHistogram = new DoNothingHistogram();
@@ -57,7 +56,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
@SuppressWarnings("java:S3077")
private volatile AbstractMetricService metricService;
- private final Map<String, PipeConnectorSubtask> connectorMap = new HashMap<>();
+ private final Map<String, PipeSinkSubtask> connectorMap = new HashMap<>();
private final Map<String, Rate> tabletRateMap = new ConcurrentHashMap<>();
@@ -101,13 +100,13 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
}
private void createAutoGauge(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
// Pending event count
metricService.createAutoGauge(
Metric.UNTRANSFERRED_TABLET_COUNT.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getTabletInsertionEventCount,
+ PipeSinkSubtask::getTabletInsertionEventCount,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -118,7 +117,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
Metric.UNTRANSFERRED_TSFILE_COUNT.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getTsFileInsertionEventCount,
+ PipeSinkSubtask::getTsFileInsertionEventCount,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -129,7 +128,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
Metric.UNTRANSFERRED_HEARTBEAT_COUNT.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getPipeHeartbeatEventCount,
+ PipeSinkSubtask::getPipeHeartbeatEventCount,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -141,7 +140,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
Metric.PIPE_ASYNC_CONNECTOR_RETRY_EVENT_QUEUE_SIZE.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getAsyncConnectorRetryEventQueueSize,
+ PipeSinkSubtask::getAsyncConnectorRetryEventQueueSize,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -152,7 +151,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
Metric.PIPE_PENDING_HANDLERS_SIZE.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getPendingHandlersSize,
+ PipeSinkSubtask::getPendingHandlersSize,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -164,7 +163,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
Metric.PIPE_CONNECTOR_BATCH_SIZE.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getBatchSize,
+ PipeSinkSubtask::getBatchSize,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -175,7 +174,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
Metric.PIPE_TOTAL_UNCOMPRESSED_SIZE.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getTotalUncompressedSize,
+ PipeSinkSubtask::getTotalUncompressedSize,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -186,7 +185,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
Metric.PIPE_TOTAL_COMPRESSED_SIZE.toString(),
MetricLevel.IMPORTANT,
connector,
- PipeConnectorSubtask::getTotalCompressedSize,
+ PipeSinkSubtask::getTotalCompressedSize,
Tag.NAME.toString(),
connector.getAttributeSortedString(),
Tag.INDEX.toString(),
@@ -196,7 +195,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
}
private void createRate(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
// Transfer event rate
tabletRateMap.put(
taskID,
@@ -234,7 +233,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
}
private void createTimer(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
compressionTimerMap.putIfAbsent(
connector.getAttributeSortedString(),
metricService.getOrCreateTimer(
@@ -273,7 +272,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
}
private void removeAutoGauge(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
// Pending event count
metricService.remove(
MetricType.AUTO_GAUGE,
@@ -352,7 +351,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
}
private void removeRate(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
// Transfer event rate
metricService.remove(
MetricType.RATE,
@@ -387,7 +386,7 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
}
private void removeTimer(final String taskID) {
- final PipeConnectorSubtask connector = connectorMap.get(taskID);
+ final PipeSinkSubtask connector = connectorMap.get(taskID);
metricService.remove(
MetricType.TIMER,
Metric.PIPE_COMPRESSION_TIME.toString(),
@@ -400,9 +399,9 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
//////////////////////////// register & deregister (pipe integration) ////////////////////////////
- public void register(@NonNull final PipeConnectorSubtask pipeConnectorSubtask) {
- final String taskID = pipeConnectorSubtask.getTaskID();
- connectorMap.putIfAbsent(taskID, pipeConnectorSubtask);
+ public void register(@NonNull final PipeSinkSubtask pipeSinkSubtask) {
+ final String taskID = pipeSinkSubtask.getTaskID();
+ connectorMap.putIfAbsent(taskID, pipeSinkSubtask);
if (Objects.nonNull(metricService)) {
createMetrics(taskID);
}
@@ -467,21 +466,20 @@ public class PipeDataRegionConnectorMetrics implements IMetricSet {
//////////////////////////// singleton ////////////////////////////
- private static class PipeConnectorMetricsHolder {
+ private static class PipeSinkMetricsHolder {
- private static final PipeDataRegionConnectorMetrics INSTANCE =
- new PipeDataRegionConnectorMetrics();
+ private static final PipeDataRegionSinkMetrics INSTANCE = new PipeDataRegionSinkMetrics();
- private PipeConnectorMetricsHolder() {
+ private PipeSinkMetricsHolder() {
// Empty constructor
}
}
- public static PipeDataRegionConnectorMetrics getInstance() {
- return PipeDataRegionConnectorMetrics.PipeConnectorMetricsHolder.INSTANCE;
+ public static PipeDataRegionSinkMetrics getInstance() {
+ return PipeSinkMetricsHolder.INSTANCE;
}
- private PipeDataRegionConnectorMetrics() {
+ private PipeDataRegionSinkMetrics() {
// Empty constructor
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java
index 3a35305584f..43bf41dfb83 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeAssignerMetrics.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.metric.source;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.assigner.PipeDataRegionAssigner;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.assigner.PipeDataRegionAssigner;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionExtractorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionSourceMetrics.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionExtractorMetrics.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionSourceMetrics.java
index d12ac20024c..c2f7da4c490 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionExtractorMetrics.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/source/PipeDataRegionSourceMetrics.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.pipe.metric.source;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.epoch.TsFileEpoch;
+import org.apache.iotdb.db.pipe.source.dataregion.IoTDBDataRegionSource;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.epoch.TsFileEpoch;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.type.Gauge;
@@ -39,15 +39,14 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-public class PipeDataRegionExtractorMetrics implements IMetricSet {
+public class PipeDataRegionSourceMetrics implements IMetricSet {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeDataRegionExtractorMetrics.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeDataRegionSourceMetrics.class);
@SuppressWarnings("java:S3077")
private volatile AbstractMetricService metricService;
- private final Map<String, IoTDBDataRegionExtractor> extractorMap = new ConcurrentHashMap<>();
+ private final Map<String, IoTDBDataRegionSource> extractorMap = new ConcurrentHashMap<>();
private final Map<String, Rate> tabletRateMap = new ConcurrentHashMap<>();
@@ -57,7 +56,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
private final Map<String, Gauge> recentProcessedTsFileEpochStateMap = new ConcurrentHashMap<>();
- public Map<String, IoTDBDataRegionExtractor> getExtractorMap() {
+ public Map<String, IoTDBDataRegionSource> getExtractorMap() {
return extractorMap;
}
@@ -79,13 +78,13 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
}
private void createAutoGauge(final String taskID) {
- final IoTDBDataRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBDataRegionSource extractor = extractorMap.get(taskID);
// Pending event count
metricService.createAutoGauge(
Metric.UNPROCESSED_HISTORICAL_TSFILE_COUNT.toString(),
MetricLevel.IMPORTANT,
extractor,
- IoTDBDataRegionExtractor::getHistoricalTsFileInsertionEventCount,
+ IoTDBDataRegionSource::getHistoricalTsFileInsertionEventCount,
Tag.NAME.toString(),
extractor.getPipeName(),
Tag.REGION.toString(),
@@ -96,7 +95,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
Metric.UNPROCESSED_REALTIME_TSFILE_COUNT.toString(),
MetricLevel.IMPORTANT,
extractor,
- IoTDBDataRegionExtractor::getRealtimeTsFileInsertionEventCount,
+ IoTDBDataRegionSource::getRealtimeTsFileInsertionEventCount,
Tag.NAME.toString(),
extractor.getPipeName(),
Tag.REGION.toString(),
@@ -107,7 +106,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
Metric.UNPROCESSED_TABLET_COUNT.toString(),
MetricLevel.IMPORTANT,
extractor,
- IoTDBDataRegionExtractor::getTabletInsertionEventCount,
+ IoTDBDataRegionSource::getTabletInsertionEventCount,
Tag.NAME.toString(),
extractor.getPipeName(),
Tag.REGION.toString(),
@@ -118,7 +117,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
Metric.UNPROCESSED_HEARTBEAT_COUNT.toString(),
MetricLevel.IMPORTANT,
extractor,
- IoTDBDataRegionExtractor::getPipeHeartbeatEventCount,
+ IoTDBDataRegionSource::getPipeHeartbeatEventCount,
Tag.NAME.toString(),
extractor.getPipeName(),
Tag.REGION.toString(),
@@ -128,7 +127,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
}
private void createRate(final String taskID) {
- final IoTDBDataRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBDataRegionSource extractor = extractorMap.get(taskID);
// Supply event rate
tabletRateMap.put(
taskID,
@@ -166,7 +165,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
}
private void createGauge(final String taskID) {
- final IoTDBDataRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBDataRegionSource extractor = extractorMap.get(taskID);
// Tsfile epoch state
recentProcessedTsFileEpochStateMap.put(
taskID,
@@ -199,7 +198,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
}
private void removeAutoGauge(final String taskID) {
- final IoTDBDataRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBDataRegionSource extractor = extractorMap.get(taskID);
// pending event count
metricService.remove(
MetricType.AUTO_GAUGE,
@@ -240,7 +239,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
}
private void removeRate(final String taskID) {
- final IoTDBDataRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBDataRegionSource extractor = extractorMap.get(taskID);
// supply event rate
metricService.remove(
MetricType.RATE,
@@ -275,7 +274,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
}
private void removeGauge(final String taskID) {
- final IoTDBDataRegionExtractor extractor = extractorMap.get(taskID);
+ final IoTDBDataRegionSource extractor = extractorMap.get(taskID);
// Tsfile epoch state
metricService.remove(
MetricType.GAUGE,
@@ -290,7 +289,7 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
//////////////////////////// register & deregister (pipe integration) ////////////////////////////
- public void register(@NonNull final IoTDBDataRegionExtractor extractor) {
+ public void register(@NonNull final IoTDBDataRegionSource extractor) {
final String taskID = extractor.getTaskID();
extractorMap.putIfAbsent(taskID, extractor);
if (Objects.nonNull(metricService)) {
@@ -370,21 +369,20 @@ public class PipeDataRegionExtractorMetrics implements IMetricSet {
//////////////////////////// singleton ////////////////////////////
- private static class PipeExtractorMetricsHolder {
+ private static class PipeSourceMetricsHolder {
- private static final PipeDataRegionExtractorMetrics INSTANCE =
- new PipeDataRegionExtractorMetrics();
+ private static final PipeDataRegionSourceMetrics INSTANCE = new PipeDataRegionSourceMetrics();
- private PipeExtractorMetricsHolder() {
+ private PipeSourceMetricsHolder() {
// Empty constructor
}
}
- public static PipeDataRegionExtractorMetrics getInstance() {
- return PipeDataRegionExtractorMetrics.PipeExtractorMetricsHolder.INSTANCE;
+ public static PipeDataRegionSourceMetrics getInstance() {
+ return PipeSourceMetricsHolder.INSTANCE;
}
- private PipeDataRegionExtractorMetrics() {
+ private PipeDataRegionSourceMetrics() {
// Empty constructor
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/CombineRequest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/CombineRequest.java
index 0e1f0f2b033..99c8bb67a1a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/CombineRequest.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/CombineRequest.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.pipe.processor.twostage.exchange.payload;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
import org.apache.iotdb.db.pipe.processor.twostage.state.State;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -83,7 +83,7 @@ public class CombineRequest extends TPipeTransferReq {
this.state = state;
this.combineId = combineId;
- this.version = IoTDBConnectorRequestVersion.VERSION_2.getVersion();
+ this.version = IoTDBSinkRequestVersion.VERSION_2.getVersion();
this.type = RequestType.COMBINE.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java
index 752be403008..03f8721f17b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/payload/FetchCombineResultRequest.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.pipe.processor.twostage.exchange.payload;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.tsfile.utils.PublicBAOS;
@@ -70,7 +70,7 @@ public class FetchCombineResultRequest extends TPipeTransferReq {
this.creationTime = creationTime;
this.combineIdList = combineIdList;
- this.version = IoTDBConnectorRequestVersion.VERSION_2.getVersion();
+ this.version = IoTDBSinkRequestVersion.VERSION_2.getVersion();
this.type = RequestType.FETCH_COMBINE_RESULT.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/receiver/TwoStageAggregateReceiver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/receiver/TwoStageAggregateReceiver.java
index 1e029d7a442..240f7a89e5f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/receiver/TwoStageAggregateReceiver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/receiver/TwoStageAggregateReceiver.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.pipe.processor.twostage.exchange.receiver;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
import org.apache.iotdb.commons.pipe.receiver.IoTDBReceiver;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
import org.apache.iotdb.db.pipe.processor.twostage.combiner.PipeCombineHandlerManager;
import org.apache.iotdb.db.pipe.processor.twostage.exchange.payload.CombineRequest;
import org.apache.iotdb.db.pipe.processor.twostage.exchange.payload.FetchCombineResultRequest;
@@ -38,8 +38,8 @@ public class TwoStageAggregateReceiver implements IoTDBReceiver {
private static final Logger LOGGER = LoggerFactory.getLogger(TwoStageAggregateReceiver.class);
@Override
- public IoTDBConnectorRequestVersion getVersion() {
- return IoTDBConnectorRequestVersion.VERSION_2;
+ public IoTDBSinkRequestVersion getVersion() {
+ return IoTDBSinkRequestVersion.VERSION_2;
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/sender/TwoStageAggregateSender.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/sender/TwoStageAggregateSender.java
index a24b6c4fc39..bac357368c0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/sender/TwoStageAggregateSender.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/exchange/sender/TwoStageAggregateSender.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.property.ThriftClientProperty;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClient;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
import org.apache.iotdb.db.pipe.processor.twostage.combiner.PipeCombineHandlerManager;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/airgap/IoTDBAirGapReceiver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/airgap/IoTDBAirGapReceiver.java
index 1d8424a1270..3cea6c998f8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/airgap/IoTDBAirGapReceiver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/airgap/IoTDBAirGapReceiver.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.pipe.receiver.protocol.airgap;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.concurrent.WrappedRunnable;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.payload.airgap.AirGapELanguageConstant;
-import org.apache.iotdb.commons.pipe.connector.payload.airgap.AirGapOneByteResponse;
-import org.apache.iotdb.commons.pipe.connector.payload.airgap.AirGapPseudoTPipeTransferRequest;
+import org.apache.iotdb.commons.pipe.sink.payload.airgap.AirGapELanguageConstant;
+import org.apache.iotdb.commons.pipe.sink.payload.airgap.AirGapOneByteResponse;
+import org.apache.iotdb.commons.pipe.sink.payload.airgap.AirGapPseudoTPipeTransferRequest;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiverAgent;
import org.apache.iotdb.db.protocol.session.ClientSession;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java
index 5bdc5de9205..d0217b6e3f8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java
@@ -26,8 +26,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.payload.legacy.PipeData;
-import org.apache.iotdb.db.pipe.connector.payload.legacy.TsFilePipeData;
+import org.apache.iotdb.db.pipe.sink.payload.legacy.PipeData;
+import org.apache.iotdb.db.pipe.sink.payload.legacy.TsFilePipeData;
import org.apache.iotdb.db.protocol.session.SessionManager;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiver.java
index 82c39729dfd..168e6406745 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiver.java
@@ -27,12 +27,12 @@ import org.apache.iotdb.commons.consensus.ConsensusGroupId;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
import org.apache.iotdb.commons.consensus.index.ProgressIndexType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusTransferFilePieceReq;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.response.PipeConsensusTransferFilePieceResp;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.response.PipeTransferFilePieceResp;
import org.apache.iotdb.commons.pipe.receiver.IoTDBReceiverAgent;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.response.PipeConsensusTransferFilePieceResp;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.response.PipeTransferFilePieceResp;
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.commons.utils.RetryUtils;
import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException;
@@ -46,14 +46,14 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
import org.apache.iotdb.db.exception.load.LoadFileException;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusDeleteNodeReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealWithModReq;
import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusReceiverMetrics;
import org.apache.iotdb.db.pipe.event.common.tsfile.aggregator.TsFileInsertionPointCounter;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusDeleteNodeReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealWithModReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.storageengine.StorageEngine;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiverAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiverAgent.java
index 4b899323fb5..1acbf2c6a26 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiverAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiverAgent.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.consensus.ConsensusGroupId;
import org.apache.iotdb.commons.consensus.DataRegionId;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestVersion;
import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.consensus.pipe.PipeConsensus;
import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeName;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
index 692a029c96d..c899eca9435 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
@@ -25,17 +25,17 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeOutOfMemoryCriticalException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.payload.airgap.AirGapPseudoTPipeTransferRequest;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.common.PipeTransferSliceReqHandler;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferCompressedReq;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV1;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV2;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferSliceReq;
import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
import org.apache.iotdb.commons.pipe.receiver.IoTDBFileReceiver;
import org.apache.iotdb.commons.pipe.receiver.PipeReceiverStatusHandler;
+import org.apache.iotdb.commons.pipe.sink.payload.airgap.AirGapPseudoTPipeTransferRequest;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.common.PipeTransferSliceReqHandler;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferCompressedReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV1;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV2;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferSliceReq;
import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.commons.utils.RetryUtils;
@@ -45,23 +45,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferPlanNodeReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferSchemaSnapshotPieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferSchemaSnapshotSealReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBatchReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBatchReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBinaryReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletInsertNodeReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFileSealReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent;
import org.apache.iotdb.db.pipe.metric.receiver.PipeDataNodeReceiverMetrics;
import org.apache.iotdb.db.pipe.receiver.visitor.PipePlanToStatementVisitor;
@@ -74,6 +57,23 @@ import org.apache.iotdb.db.pipe.receiver.visitor.PipeTreeStatementDataTypeConver
import org.apache.iotdb.db.pipe.receiver.visitor.PipeTreeStatementToBatchVisitor;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlock;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferPlanNodeReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferSchemaSnapshotPieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferSchemaSnapshotSealReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBatchReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBatchReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBinaryReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletInsertNodeReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.protocol.session.SessionManager;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiverAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiverAgent.java
index e0016eceac2..8a995f7656d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiverAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiverAgent.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.pipe.receiver.protocol.thrift;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
import org.apache.iotdb.commons.pipe.receiver.IoTDBReceiver;
import org.apache.iotdb.commons.pipe.receiver.IoTDBReceiverAgent;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
import org.apache.iotdb.db.pipe.processor.twostage.exchange.receiver.TwoStageAggregateReceiver;
public class IoTDBDataNodeReceiverAgent extends IoTDBReceiverAgent {
@@ -31,9 +31,9 @@ public class IoTDBDataNodeReceiverAgent extends IoTDBReceiverAgent {
@Override
protected void initConstructors() {
RECEIVER_CONSTRUCTORS.put(
- IoTDBConnectorRequestVersion.VERSION_1.getVersion(), IoTDBDataNodeReceiver::new);
+ IoTDBSinkRequestVersion.VERSION_1.getVersion(), IoTDBDataNodeReceiver::new);
RECEIVER_CONSTRUCTORS.put(
- IoTDBConnectorRequestVersion.VERSION_2.getVersion(), TwoStageAggregateReceiver::new);
+ IoTDBSinkRequestVersion.VERSION_2.getVersion(), TwoStageAggregateReceiver::new);
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTableStatementDataTypeConvertExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTableStatementDataTypeConvertExecutionVisitor.java
index 50b39ed44f5..4e7530f05fe 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTableStatementDataTypeConvertExecutionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTableStatementDataTypeConvertExecutionVisitor.java
@@ -21,12 +21,12 @@ package org.apache.iotdb.db.pipe.receiver.visitor;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReqV2;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.parser.table.TsFileInsertionEventTableParser;
import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver;
import org.apache.iotdb.db.pipe.receiver.transform.statement.PipeConvertedInsertRowStatement;
import org.apache.iotdb.db.pipe.receiver.transform.statement.PipeConvertedInsertTabletStatement;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReqV2;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTreeStatementDataTypeConvertExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTreeStatementDataTypeConvertExecutionVisitor.java
index ed47e519b00..9aa352385ed 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTreeStatementDataTypeConvertExecutionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeTreeStatementDataTypeConvertExecutionVisitor.java
@@ -21,11 +21,11 @@ package org.apache.iotdb.db.pipe.receiver.visitor;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReq;
import org.apache.iotdb.db.pipe.event.common.tsfile.parser.scan.TsFileInsertionEventScanParser;
import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver;
import org.apache.iotdb.db.pipe.receiver.transform.statement.PipeConvertedInsertRowStatement;
import org.apache.iotdb.db.pipe.receiver.transform.statement.PipeConvertedInsertTabletStatement;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReq;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/tsfile/PipeCompactionManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/tsfile/PipeCompactionManager.java
index 03860fda8f8..0a4f7cb97af 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/tsfile/PipeCompactionManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/tsfile/PipeCompactionManager.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.pipe.resource.tsfile;
import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue;
-import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtaskLifeCycle;
-import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeRealtimePriorityBlockingQueue;
+import org.apache.iotdb.db.pipe.agent.task.subtask.sink.PipeRealtimePriorityBlockingQueue;
+import org.apache.iotdb.db.pipe.agent.task.subtask.sink.PipeSinkSubtaskLifeCycle;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.iotdb.pipe.api.event.Event;
@@ -32,17 +32,17 @@ import java.util.concurrent.CopyOnWriteArraySet;
public class PipeCompactionManager {
- private final Set<PipeConnectorSubtaskLifeCycle> pipeConnectorSubtaskLifeCycles =
+ private final Set<PipeSinkSubtaskLifeCycle> pipeSinkSubtaskLifeCycles =
new CopyOnWriteArraySet<>();
public void registerPipeConnectorSubtaskLifeCycle(
- final PipeConnectorSubtaskLifeCycle pipeConnectorSubtaskLifeCycle) {
- pipeConnectorSubtaskLifeCycles.add(pipeConnectorSubtaskLifeCycle);
+ final PipeSinkSubtaskLifeCycle pipeSinkSubtaskLifeCycle) {
+ pipeSinkSubtaskLifeCycles.add(pipeSinkSubtaskLifeCycle);
}
public void deregisterPipeConnectorSubtaskLifeCycle(
- final PipeConnectorSubtaskLifeCycle pipeConnectorSubtaskLifeCycle) {
- pipeConnectorSubtaskLifeCycles.remove(pipeConnectorSubtaskLifeCycle);
+ final PipeSinkSubtaskLifeCycle pipeSinkSubtaskLifeCycle) {
+ pipeSinkSubtaskLifeCycles.remove(pipeSinkSubtaskLifeCycle);
}
public void emitResult(
@@ -55,7 +55,7 @@ public class PipeCompactionManager {
final Set<TsFileResource> sourceFileResources = new HashSet<>(seqFileResources);
sourceFileResources.addAll(unseqFileResources);
- for (final PipeConnectorSubtaskLifeCycle lifeCycle : pipeConnectorSubtaskLifeCycles) {
+ for (final PipeSinkSubtaskLifeCycle lifeCycle : pipeSinkSubtaskLifeCycles) {
final UnboundedBlockingPendingQueue<Event> pendingQueue = lifeCycle.getPendingQueue();
if (pendingQueue instanceof PipeRealtimePriorityBlockingQueue) {
final PipeRealtimePriorityBlockingQueue realtimePriorityBlockingQueue =
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeAsyncClientManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeAsyncClientManager.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeAsyncClientManager.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeAsyncClientManager.java
index d4c044071e9..a942a8d08cc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeAsyncClientManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeAsyncClientManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.client;
+package org.apache.iotdb.db.pipe.sink.client;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.ClientPoolFactory;
@@ -27,11 +27,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBClientManager;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.common.PipeTransferHandshakeConstant;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBClientManager;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.common.PipeTransferHandshakeConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
import org.apache.iotdb.pipe.api.exception.PipeConnectionException;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -55,9 +55,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_LOAD_BALANCE_PRIORITY_STRATEGY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_LOAD_BALANCE_RANDOM_STRATEGY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_LOAD_BALANCE_ROUND_ROBIN_STRATEGY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_LOAD_BALANCE_PRIORITY_STRATEGY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_LOAD_BALANCE_RANDOM_STRATEGY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_LOAD_BALANCE_ROUND_ROBIN_STRATEGY;
public class IoTDBDataNodeAsyncClientManager extends IoTDBClientManager
implements IoTDBDataNodeCacheLeaderClientManager {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeCacheLeaderClientManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeCacheLeaderClientManager.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeCacheLeaderClientManager.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeCacheLeaderClientManager.java
index 799cd3bc8c4..dc24295f936 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeCacheLeaderClientManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeCacheLeaderClientManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.client;
+package org.apache.iotdb.db.pipe.sink.client;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeSyncClientManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeSyncClientManager.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeSyncClientManager.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeSyncClientManager.java
index 39cbb7902d2..e1ff15bbd8b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeSyncClientManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/client/IoTDBDataNodeSyncClientManager.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.client;
+package org.apache.iotdb.db.pipe.sink.client;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClientManager;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferHandshakeV2Req;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClient;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClientManager;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferHandshakeV2Req;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
import org.apache.tsfile.utils.Pair;
import org.slf4j.Logger;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventBatch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventBatch.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventBatch.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventBatch.java
index 8d52055fcc9..c7622c4a95f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventBatch.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventBatch.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.batch;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.batch;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
import org.apache.iotdb.db.pipe.resource.memory.PipeDynamicMemoryBlock;
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlockType;
import org.apache.iotdb.db.pipe.resource.memory.PipeModelFixedMemoryBlock;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.db.storageengine.dataregion.wal.exception.WALPipeException;
import org.apache.iotdb.pipe.api.event.Event;
import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
@@ -169,7 +169,7 @@ public abstract class PipeTabletEventBatch implements AutoCloseable {
events.removeIf(
event -> {
if (pipeNameToDrop.equals(event.getPipeName()) && regionId == event.getRegionId()) {
- event.clearReferenceCount(IoTDBDataRegionAsyncConnector.class.getName());
+ event.clearReferenceCount(IoTDBDataRegionAsyncSink.class.getName());
return true;
}
return false;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventPlainBatch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventPlainBatch.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventPlainBatch.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventPlainBatch.java
index 50480537cf9..c637b2bff42 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventPlainBatch.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventPlainBatch.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.batch;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.batch;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBatchReqV2;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
-import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionConnectorMetrics;
+import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBatchReqV2;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.storageengine.dataregion.wal.exception.WALPipeException;
import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
@@ -74,8 +74,8 @@ public class PipeTabletEventPlainBatch extends PipeTabletEventBatch {
@Override
protected void recordMetric(long timeInterval, long bufferSize) {
- PipeDataRegionConnectorMetrics.tabletBatchTimeIntervalHistogram.update(timeInterval);
- PipeDataRegionConnectorMetrics.tabletBatchSizeHistogram.update(bufferSize);
+ PipeDataRegionSinkMetrics.tabletBatchTimeIntervalHistogram.update(timeInterval);
+ PipeDataRegionSinkMetrics.tabletBatchSizeHistogram.update(bufferSize);
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventTsFileBatch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventTsFileBatch.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventTsFileBatch.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventTsFileBatch.java
index d1b5a57259d..660706a4325 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventTsFileBatch.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTabletEventTsFileBatch.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.batch;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.batch;
-import org.apache.iotdb.db.pipe.connector.util.builder.PipeTableModelTsFileBuilderV2;
-import org.apache.iotdb.db.pipe.connector.util.builder.PipeTreeModelTsFileBuilderV2;
-import org.apache.iotdb.db.pipe.connector.util.builder.PipeTsFileBuilder;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTableModelTabletEventSorter;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTreeModelTabletEventSorter;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
-import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionConnectorMetrics;
+import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics;
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryWeightUtil;
+import org.apache.iotdb.db.pipe.sink.util.builder.PipeTableModelTsFileBuilderV2;
+import org.apache.iotdb.db.pipe.sink.util.builder.PipeTreeModelTsFileBuilderV2;
+import org.apache.iotdb.db.pipe.sink.util.builder.PipeTsFileBuilder;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTableModelTabletEventSorter;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter;
import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
import org.apache.tsfile.exception.write.WriteProcessException;
@@ -128,8 +128,8 @@ public class PipeTabletEventTsFileBatch extends PipeTabletEventBatch {
@Override
protected void recordMetric(long timeInterval, long bufferSize) {
- PipeDataRegionConnectorMetrics.tsFileBatchTimeIntervalHistogram.update(timeInterval);
- PipeDataRegionConnectorMetrics.tsFileBatchSizeHistogram.update(bufferSize);
+ PipeDataRegionSinkMetrics.tsFileBatchTimeIntervalHistogram.update(timeInterval);
+ PipeDataRegionSinkMetrics.tsFileBatchSizeHistogram.update(bufferSize);
}
private void bufferTreeModelTablet(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTransferBatchReqBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTransferBatchReqBuilder.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTransferBatchReqBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTransferBatchReqBuilder.java
index 15036b07e62..d30acaf146a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTransferBatchReqBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/batch/PipeTransferBatchReqBuilder.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.batch;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.batch;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.connector.client.IoTDBDataNodeCacheLeaderClientManager;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.client.IoTDBDataNodeCacheLeaderClientManager;
import org.apache.iotdb.db.storageengine.dataregion.wal.exception.WALPipeException;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import org.apache.iotdb.pipe.api.event.Event;
@@ -41,23 +41,23 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_FORMAT_HYBRID_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_FORMAT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_FORMAT_TS_FILE_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_DELAY_MS_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_DELAY_MS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_DELAY_SECONDS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_SIZE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PLAIN_BATCH_SIZE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_TS_FILE_BATCH_DELAY_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_TS_FILE_BATCH_SIZE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_LEADER_CACHE_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_LEADER_CACHE_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_FORMAT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_DELAY_MS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_DELAY_SECONDS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_SIZE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_LEADER_CACHE_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_FORMAT_HYBRID_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_FORMAT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_FORMAT_TS_FILE_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_BATCH_DELAY_MS_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_BATCH_DELAY_MS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_BATCH_DELAY_SECONDS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_BATCH_SIZE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PLAIN_BATCH_SIZE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_TS_FILE_BATCH_DELAY_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_TS_FILE_BATCH_SIZE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_LEADER_CACHE_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_LEADER_CACHE_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_FORMAT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_BATCH_DELAY_MS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_BATCH_DELAY_SECONDS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_BATCH_SIZE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_LEADER_CACHE_ENABLE_KEY;
public class PipeTransferBatchReqBuilder implements AutoCloseable {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeV1Req.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferDataNodeHandshakeV1Req.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeV1Req.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferDataNodeHandshakeV1Req.java
index bc6cc133643..3fc3ab0ce6f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeV1Req.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferDataNodeHandshakeV1Req.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferHandshakeV1Req;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferHandshakeV1Req;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeV2Req.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferDataNodeHandshakeV2Req.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeV2Req.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferDataNodeHandshakeV2Req.java
index 4a46704ed47..4b9e7a26589 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferDataNodeHandshakeV2Req.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferDataNodeHandshakeV2Req.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferHandshakeV2Req;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferHandshakeV2Req;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferPlanNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferPlanNodeReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java
index e77d521b53f..6c33541c59f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferPlanNodeReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -52,7 +52,7 @@ public class PipeTransferPlanNodeReq extends TPipeTransferReq {
req.planNode = planNode;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_PLAN_NODE.getType();
req.body = planNode.serializeToByteBuffer();
@@ -75,7 +75,7 @@ public class PipeTransferPlanNodeReq extends TPipeTransferReq {
public static byte[] toTPipeTransferBytes(final PlanNode planNode) throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(PipeRequestType.TRANSFER_PLAN_NODE.getType(), outputStream);
return BytesUtils.concatByteArray(
byteArrayOutputStream.toByteArray(), planNode.serializeToByteBuffer().array());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotPieceReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferSchemaSnapshotPieceReq.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotPieceReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferSchemaSnapshotPieceReq.java
index 10da15faa03..f1e9d77685c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotPieceReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferSchemaSnapshotPieceReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
index 7e4fbc24b13..3cab4014d4b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV2;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV2;
import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBatchReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBatchReq.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBatchReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBatchReq.java
index 27664cdbac7..48bd1016763 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBatchReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBatchReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
@@ -126,7 +126,7 @@ public class PipeTransferTabletBatchReq extends TPipeTransferReq {
// batchReq.binaryReqs, batchReq.insertNodeReqs, batchReq.tabletReqs are empty
// when this method is called from PipeTransferTabletBatchReqBuilder.toTPipeTransferReq()
- batchReq.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ batchReq.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
batchReq.type = PipeRequestType.TRANSFER_TABLET_BATCH.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBatchReqV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBatchReqV2.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBatchReqV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBatchReqV2.java
index ae676060a44..b7d7d44db85 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBatchReqV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBatchReqV2.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
@@ -146,7 +146,7 @@ public class PipeTransferTabletBatchReqV2 extends TPipeTransferReq {
throws IOException {
final PipeTransferTabletBatchReqV2 batchReq = new PipeTransferTabletBatchReqV2();
- batchReq.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ batchReq.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
batchReq.type = PipeRequestType.TRANSFER_TABLET_BATCH_V2.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBinaryReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java
index 36390c649b4..a5615406329 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBinaryReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
@@ -79,7 +79,7 @@ public class PipeTransferTabletBinaryReq extends TPipeTransferReq {
final PipeTransferTabletBinaryReq req = new PipeTransferTabletBinaryReq();
req.byteBuffer = byteBuffer;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_TABLET_BINARY.getType();
req.body = byteBuffer;
@@ -102,7 +102,7 @@ public class PipeTransferTabletBinaryReq extends TPipeTransferReq {
public static byte[] toTPipeTransferBytes(final ByteBuffer byteBuffer) throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(PipeRequestType.TRANSFER_TABLET_BINARY.getType(), outputStream);
return BytesUtils.concatByteArray(byteArrayOutputStream.toByteArray(), byteBuffer.array());
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBinaryReqV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReqV2.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBinaryReqV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReqV2.java
index 8b23c3d9392..8166e6b07ef 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletBinaryReqV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReqV2.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode;
@@ -96,7 +96,7 @@ public class PipeTransferTabletBinaryReqV2 extends PipeTransferTabletBinaryReq {
req.byteBuffer = byteBuffer;
req.dataBaseName = dataBaseName;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_TABLET_BINARY_V2.getType();
return req;
@@ -110,7 +110,7 @@ public class PipeTransferTabletBinaryReqV2 extends PipeTransferTabletBinaryReq {
req.byteBuffer = byteBuffer;
req.dataBaseName = dataBaseName;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_TABLET_BINARY_V2.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
@@ -146,7 +146,7 @@ public class PipeTransferTabletBinaryReqV2 extends PipeTransferTabletBinaryReq {
throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(PipeRequestType.TRANSFER_TABLET_BINARY_V2.getType(), outputStream);
ReadWriteIOUtils.write(byteBuffer.limit(), outputStream);
outputStream.write(byteBuffer.array(), 0, byteBuffer.limit());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletInsertNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletInsertNodeReq.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletInsertNodeReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletInsertNodeReq.java
index 5944b3a368a..46646baf08c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletInsertNodeReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletInsertNodeReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver;
import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
@@ -70,7 +70,7 @@ public class PipeTransferTabletInsertNodeReq extends TPipeTransferReq {
final PipeTransferTabletInsertNodeReq req = new PipeTransferTabletInsertNodeReq();
req.insertNode = insertNode;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_TABLET_INSERT_NODE.getType();
return req;
}
@@ -82,7 +82,7 @@ public class PipeTransferTabletInsertNodeReq extends TPipeTransferReq {
req.insertNode = insertNode;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_TABLET_INSERT_NODE.getType();
req.body = insertNode.serializeToByteBuffer();
@@ -106,7 +106,7 @@ public class PipeTransferTabletInsertNodeReq extends TPipeTransferReq {
public static byte[] toTPipeTransferBytes(final InsertNode insertNode) throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(PipeRequestType.TRANSFER_TABLET_INSERT_NODE.getType(), outputStream);
return BytesUtils.concatByteArray(
byteArrayOutputStream.toByteArray(), insertNode.serializeToByteBuffer().array());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletInsertNodeReqV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletInsertNodeReqV2.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletInsertNodeReqV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletInsertNodeReqV2.java
index 45ed17b92e9..599e12af9ed 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletInsertNodeReqV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletInsertNodeReqV2.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver;
import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
@@ -96,7 +96,7 @@ public class PipeTransferTabletInsertNodeReqV2 extends PipeTransferTabletInsertN
req.insertNode = insertNode;
req.dataBaseName = dataBaseName;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_TABLET_INSERT_NODE_V2.getType();
return req;
@@ -111,7 +111,7 @@ public class PipeTransferTabletInsertNodeReqV2 extends PipeTransferTabletInsertN
req.insertNode = insertNode;
req.dataBaseName = dataBaseName;
- req.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ req.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
req.type = PipeRequestType.TRANSFER_TABLET_INSERT_NODE_V2.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
@@ -145,7 +145,7 @@ public class PipeTransferTabletInsertNodeReqV2 extends PipeTransferTabletInsertN
throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(
PipeRequestType.TRANSFER_TABLET_INSERT_NODE_V2.getType(), outputStream);
insertNode.serialize(outputStream);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletRawReq.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletRawReq.java
index 0109feb5ee0..4e3888f8d0e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletRawReq.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.commons.utils.PathUtils;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTreeModelTabletEventSorter;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter;
import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -111,7 +111,7 @@ public class PipeTransferTabletRawReq extends TPipeTransferReq {
tabletReq.tablet = tablet;
tabletReq.isAligned = isAligned;
- tabletReq.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ tabletReq.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
tabletReq.type = PipeRequestType.TRANSFER_TABLET_RAW.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
@@ -142,7 +142,7 @@ public class PipeTransferTabletRawReq extends TPipeTransferReq {
throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(PipeRequestType.TRANSFER_TABLET_RAW.getType(), outputStream);
tablet.serialize(outputStream);
ReadWriteIOUtils.write(isAligned, outputStream);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReqV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletRawReqV2.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReqV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletRawReqV2.java
index d0608cb7042..ee0e2fb220a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTabletRawReqV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletRawReqV2.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.IoTDBConnectorRequestVersion;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.commons.utils.PathUtils;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTableModelTabletEventSorter;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTreeModelTabletEventSorter;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTableModelTabletEventSorter;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter;
import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -114,7 +114,7 @@ public class PipeTransferTabletRawReqV2 extends PipeTransferTabletRawReq {
tabletReq.tablet = tablet;
tabletReq.isAligned = isAligned;
tabletReq.dataBaseName = dataBaseName;
- tabletReq.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ tabletReq.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
tabletReq.type = PipeRequestType.TRANSFER_TABLET_RAW_V2.getType();
return tabletReq;
@@ -130,7 +130,7 @@ public class PipeTransferTabletRawReqV2 extends PipeTransferTabletRawReq {
tabletReq.isAligned = isAligned;
tabletReq.dataBaseName = dataBaseName;
- tabletReq.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion();
+ tabletReq.version = IoTDBSinkRequestVersion.VERSION_1.getVersion();
tabletReq.type = PipeRequestType.TRANSFER_TABLET_RAW_V2.getType();
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
@@ -165,7 +165,7 @@ public class PipeTransferTabletRawReqV2 extends PipeTransferTabletRawReq {
final Tablet tablet, final boolean isAligned, final String dataBaseName) throws IOException {
try (final PublicBAOS byteArrayOutputStream = new PublicBAOS();
final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
- ReadWriteIOUtils.write(IoTDBConnectorRequestVersion.VERSION_1.getVersion(), outputStream);
+ ReadWriteIOUtils.write(IoTDBSinkRequestVersion.VERSION_1.getVersion(), outputStream);
ReadWriteIOUtils.write(PipeRequestType.TRANSFER_TABLET_RAW_V2.getType(), outputStream);
tablet.serialize(outputStream);
ReadWriteIOUtils.write(isAligned, outputStream);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFilePieceReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFilePieceReq.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFilePieceReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFilePieceReq.java
index 5c9fe434b4b..0435d9a4c37 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFilePieceReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFilePieceReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFilePieceWithModReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFilePieceWithModReq.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFilePieceWithModReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFilePieceWithModReq.java
index 6a0706db322..7feb339f6d5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFilePieceWithModReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFilePieceWithModReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFileSealReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFileSealReq.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFileSealReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFileSealReq.java
index 6d8312c4d74..9e559db1a88 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFileSealReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFileSealReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV1;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV1;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFileSealWithModReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFileSealWithModReq.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFileSealWithModReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFileSealWithModReq.java
index 86034964aa3..25fb874cb6e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferTsFileSealWithModReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTsFileSealWithModReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
+package org.apache.iotdb.db.pipe.sink.payload.evolvable.request;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV2;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFileSealReqV2;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/DeletionPipeData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/DeletionPipeData.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/DeletionPipeData.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/DeletionPipeData.java
index e087335d916..ecb8cf5fbde 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/DeletionPipeData.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/DeletionPipeData.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.iotdb.db.pipe.connector.payload.legacy;
+package org.apache.iotdb.db.pipe.sink.payload.legacy;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.db.pipe.receiver.protocol.legacy.loader.DeletionLoader;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/PipeData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/PipeData.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/PipeData.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/PipeData.java
index d6417687a26..643ee849096 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/PipeData.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/PipeData.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.iotdb.db.pipe.connector.payload.legacy;
+package org.apache.iotdb.db.pipe.sink.payload.legacy;
import org.apache.iotdb.db.pipe.receiver.protocol.legacy.loader.ILoader;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/TsFilePipeData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/TsFilePipeData.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/TsFilePipeData.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/TsFilePipeData.java
index e688e4cc79e..a41e62b705f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/legacy/TsFilePipeData.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/legacy/TsFilePipeData.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.iotdb.db.pipe.connector.payload.legacy;
+package org.apache.iotdb.db.pipe.sink.payload.legacy;
import org.apache.iotdb.db.pipe.receiver.protocol.legacy.loader.ILoader;
import org.apache.iotdb.db.pipe.receiver.protocol.legacy.loader.TsFileLoader;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBDataNodeAirGapConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBDataNodeAirGapSink.java
similarity index 83%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBDataNodeAirGapConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBDataNodeAirGapSink.java
index 13842b9b136..d2fc67a4c6f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBDataNodeAirGapConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBDataNodeAirGapSink.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.airgap;
+package org.apache.iotdb.db.pipe.sink.protocol.airgap;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.common.PipeTransferHandshakeConstant;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBAirGapConnector;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.common.PipeTransferHandshakeConstant;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBAirGapSink;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -33,7 +33,7 @@ import java.util.HashMap;
@TreeModel
@TableModel
-public abstract class IoTDBDataNodeAirGapConnector extends IoTDBAirGapConnector {
+public abstract class IoTDBDataNodeAirGapSink extends IoTDBAirGapSink {
@Override
protected boolean mayNeedHandshakeWhenFail() {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBDataRegionAirGapConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBDataRegionAirGapSink.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBDataRegionAirGapConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBDataRegionAirGapSink.java
index b2520e61313..5e2dfb6f9a0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBDataRegionAirGapConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBDataRegionAirGapSink.java
@@ -17,18 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.airgap;
+package org.apache.iotdb.db.pipe.sink.protocol.airgap;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.pipe.connector.limiter.TsFileSendRateLimiter;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferPlanNodeReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
+import org.apache.iotdb.commons.pipe.sink.limiter.TsFileSendRateLimiter;
import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
@@ -36,7 +29,14 @@ import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.terminate.PipeTerminateEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
import org.apache.iotdb.db.pipe.metric.overview.PipeResourceMetrics;
-import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionConnectorMetrics;
+import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferPlanNodeReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.storageengine.dataregion.wal.exception.WALPipeException;
import org.apache.iotdb.pipe.api.annotation.TableModel;
@@ -58,16 +58,15 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Objects;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_ENABLE_SEND_TSFILE_LIMIT;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_ENABLE_SEND_TSFILE_LIMIT;
@TreeModel
@TableModel
-public class IoTDBDataRegionAirGapConnector extends IoTDBDataNodeAirGapConnector {
+public class IoTDBDataRegionAirGapSink extends IoTDBDataNodeAirGapSink {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(IoTDBDataRegionAirGapConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataRegionAirGapSink.class);
private boolean enableSendTsFileLimit;
@@ -178,15 +177,14 @@ public class IoTDBDataRegionAirGapConnector extends IoTDBDataNodeAirGapConnector
final AirGapSocket socket, final PipeDeleteDataNodeEvent pipeDeleteDataNodeEvent)
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeDeleteDataNodeEvent.increaseReferenceCount(
- IoTDBDataNodeAirGapConnector.class.getName())) {
+ if (!pipeDeleteDataNodeEvent.increaseReferenceCount(IoTDBDataNodeAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeDeleteDataNodeEvent);
} finally {
pipeDeleteDataNodeEvent.decreaseReferenceCount(
- IoTDBDataNodeAirGapConnector.class.getName(), false);
+ IoTDBDataNodeAirGapSink.class.getName(), false);
}
}
@@ -217,14 +215,14 @@ public class IoTDBDataRegionAirGapConnector extends IoTDBDataNodeAirGapConnector
throws PipeException, WALPipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionAirGapConnector.class.getName())) {
+ IoTDBDataRegionAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeInsertNodeTabletInsertionEvent);
} finally {
pipeInsertNodeTabletInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionAirGapConnector.class.getName(), false);
+ IoTDBDataRegionAirGapSink.class.getName(), false);
}
}
@@ -268,14 +266,14 @@ public class IoTDBDataRegionAirGapConnector extends IoTDBDataNodeAirGapConnector
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeRawTabletInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionAirGapConnector.class.getName())) {
+ IoTDBDataRegionAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeRawTabletInsertionEvent);
} finally {
pipeRawTabletInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionAirGapConnector.class.getName(), false);
+ IoTDBDataRegionAirGapSink.class.getName(), false);
}
}
@@ -309,14 +307,14 @@ public class IoTDBDataRegionAirGapConnector extends IoTDBDataNodeAirGapConnector
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeTsFileInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionAirGapConnector.class.getName())) {
+ IoTDBDataRegionAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeTsFileInsertionEvent);
} finally {
pipeTsFileInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionAirGapConnector.class.getName(), false);
+ IoTDBDataRegionAirGapSink.class.getName(), false);
}
}
@@ -402,7 +400,7 @@ public class IoTDBDataRegionAirGapConnector extends IoTDBDataNodeAirGapConnector
protected byte[] compressIfNeeded(final byte[] reqInBytes) throws IOException {
if (Objects.isNull(compressionTimer) && Objects.nonNull(attributeSortedString)) {
compressionTimer =
- PipeDataRegionConnectorMetrics.getInstance().getCompressionTimer(attributeSortedString);
+ PipeDataRegionSinkMetrics.getInstance().getCompressionTimer(attributeSortedString);
}
return super.compressIfNeeded(reqInBytes);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBSchemaRegionAirGapConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBSchemaRegionAirGapSink.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBSchemaRegionAirGapConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBSchemaRegionAirGapSink.java
index d6716935695..3634b2396a4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBSchemaRegionAirGapConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/airgap/IoTDBSchemaRegionAirGapSink.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.airgap;
+package org.apache.iotdb.db.pipe.sink.protocol.airgap;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferPlanNodeReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferSchemaSnapshotPieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferSchemaSnapshotSealReq;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent;
import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferPlanNodeReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferSchemaSnapshotPieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferSchemaSnapshotSealReq;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
import org.apache.iotdb.pipe.api.event.Event;
@@ -45,10 +45,9 @@ import java.util.Objects;
@TreeModel
@TableModel
-public class IoTDBSchemaRegionAirGapConnector extends IoTDBDataNodeAirGapConnector {
+public class IoTDBSchemaRegionAirGapSink extends IoTDBDataNodeAirGapSink {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(IoTDBSchemaRegionAirGapConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSchemaRegionAirGapSink.class);
@Override
public void transfer(final TabletInsertionEvent tabletInsertionEvent) throws Exception {
@@ -94,14 +93,14 @@ public class IoTDBSchemaRegionAirGapConnector extends IoTDBDataNodeAirGapConnect
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeSchemaRegionWritePlanEvent.increaseReferenceCount(
- IoTDBDataNodeAirGapConnector.class.getName())) {
+ IoTDBDataNodeAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeSchemaRegionWritePlanEvent);
} finally {
pipeSchemaRegionWritePlanEvent.decreaseReferenceCount(
- IoTDBDataNodeAirGapConnector.class.getName(), false);
+ IoTDBDataNodeAirGapSink.class.getName(), false);
}
}
@@ -132,14 +131,14 @@ public class IoTDBSchemaRegionAirGapConnector extends IoTDBDataNodeAirGapConnect
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeSchemaRegionSnapshotEvent.increaseReferenceCount(
- IoTDBSchemaRegionAirGapConnector.class.getName())) {
+ IoTDBSchemaRegionAirGapSink.class.getName())) {
return;
}
try {
doTransfer(socket, pipeSchemaRegionSnapshotEvent);
} finally {
pipeSchemaRegionSnapshotEvent.decreaseReferenceCount(
- IoTDBSchemaRegionAirGapConnector.class.getName(), false);
+ IoTDBSchemaRegionAirGapSink.class.getName(), false);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/legacy/IoTDBLegacyPipeSink.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/legacy/IoTDBLegacyPipeSink.java
index 35cbd39149b..b3792bc9320 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/legacy/IoTDBLegacyPipeSink.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.legacy;
+package org.apache.iotdb.db.pipe.sink.protocol.legacy;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
@@ -27,15 +27,15 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClient;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.payload.legacy.TsFilePipeData;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.terminate.PipeTerminateEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.payload.legacy.TsFilePipeData;
import org.apache.iotdb.db.storageengine.StorageEngine;
import org.apache.iotdb.pipe.api.PipeConnector;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -70,29 +70,29 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_IP_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PASSWORD_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PORT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_SYNC_CONNECTOR_VERSION_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_SYNC_CONNECTOR_VERSION_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USERNAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USER_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_IP_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_PASSWORD_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_PORT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_SSL_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_SYNC_CONNECTOR_VERSION_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_USERNAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_USER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_IP_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PASSWORD_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PORT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_SYNC_CONNECTOR_VERSION_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_SYNC_CONNECTOR_VERSION_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USERNAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USER_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_IP_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_PASSWORD_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_PORT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_SSL_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_SYNC_CONNECTOR_VERSION_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USERNAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USER_KEY;
@TreeModel
-public class IoTDBLegacyPipeConnector implements PipeConnector {
+public class IoTDBLegacyPipeSink implements PipeConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBLegacyPipeConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBLegacyPipeSink.class);
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
@@ -309,15 +309,14 @@ public class IoTDBLegacyPipeConnector implements PipeConnector {
final PipeInsertNodeTabletInsertionEvent pipeInsertNodeInsertionEvent)
throws IoTDBConnectionException, StatementExecutionException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeInsertNodeInsertionEvent.increaseReferenceCount(
- IoTDBLegacyPipeConnector.class.getName())) {
+ if (!pipeInsertNodeInsertionEvent.increaseReferenceCount(IoTDBLegacyPipeSink.class.getName())) {
return;
}
try {
doTransfer(pipeInsertNodeInsertionEvent);
} finally {
pipeInsertNodeInsertionEvent.decreaseReferenceCount(
- IoTDBLegacyPipeConnector.class.getName(), false);
+ IoTDBLegacyPipeSink.class.getName(), false);
}
}
@@ -340,15 +339,14 @@ public class IoTDBLegacyPipeConnector implements PipeConnector {
private void doTransferWrapper(final PipeRawTabletInsertionEvent pipeRawTabletInsertionEvent)
throws PipeException, IoTDBConnectionException, StatementExecutionException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeRawTabletInsertionEvent.increaseReferenceCount(
- IoTDBLegacyPipeConnector.class.getName())) {
+ if (!pipeRawTabletInsertionEvent.increaseReferenceCount(IoTDBLegacyPipeSink.class.getName())) {
return;
}
try {
doTransfer(pipeRawTabletInsertionEvent);
} finally {
pipeRawTabletInsertionEvent.decreaseReferenceCount(
- IoTDBLegacyPipeConnector.class.getName(), false);
+ IoTDBLegacyPipeSink.class.getName(), false);
}
}
@@ -365,15 +363,13 @@ public class IoTDBLegacyPipeConnector implements PipeConnector {
private void doTransferWrapper(final PipeTsFileInsertionEvent pipeTsFileInsertionEvent)
throws PipeException, TException, IOException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeTsFileInsertionEvent.increaseReferenceCount(
- IoTDBLegacyPipeConnector.class.getName())) {
+ if (!pipeTsFileInsertionEvent.increaseReferenceCount(IoTDBLegacyPipeSink.class.getName())) {
return;
}
try {
doTransfer(pipeTsFileInsertionEvent);
} finally {
- pipeTsFileInsertionEvent.decreaseReferenceCount(
- IoTDBLegacyPipeConnector.class.getName(), false);
+ pipeTsFileInsertionEvent.decreaseReferenceCount(IoTDBLegacyPipeSink.class.getName(), false);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaHeader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaHeader.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaHeader.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaHeader.java
index 878a719b12e..47909c99757 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaHeader.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaHeader.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.opcda;
+package org.apache.iotdb.db.pipe.sink.protocol.opcda;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaServerHandle.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaServerHandle.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaServerHandle.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaServerHandle.java
index 48d7c415ab3..8ca78a2da55 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaServerHandle.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaServerHandle.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.opcda;
+package org.apache.iotdb.db.pipe.sink.protocol.opcda;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTreeModelTabletEventSorter;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter;
import org.apache.iotdb.pipe.api.exception.PipeException;
import com.sun.jna.Memory;
@@ -56,10 +56,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import static org.apache.iotdb.db.pipe.connector.protocol.opcda.OpcDaHeader.IID_IOPCItemMgt;
-import static org.apache.iotdb.db.pipe.connector.protocol.opcda.OpcDaHeader.IID_IOPCServer;
-import static org.apache.iotdb.db.pipe.connector.protocol.opcda.OpcDaHeader.IID_IOPCSyncIO;
-import static org.apache.iotdb.db.pipe.connector.protocol.opcda.OpcDaHeader.IID_IUNKNOWN;
+import static org.apache.iotdb.db.pipe.sink.protocol.opcda.OpcDaHeader.IID_IOPCItemMgt;
+import static org.apache.iotdb.db.pipe.sink.protocol.opcda.OpcDaHeader.IID_IOPCServer;
+import static org.apache.iotdb.db.pipe.sink.protocol.opcda.OpcDaHeader.IID_IOPCSyncIO;
+import static org.apache.iotdb.db.pipe.sink.protocol.opcda.OpcDaHeader.IID_IUNKNOWN;
public class OpcDaServerHandle implements Closeable {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaSink.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaSink.java
index 2d123ff3fc7..322943de402 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcda/OpcDaConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcda/OpcDaSink.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.opcda;
+package org.apache.iotdb.db.pipe.sink.protocol.opcda;
-import org.apache.iotdb.db.pipe.connector.protocol.opcua.OpcUaConnector;
+import org.apache.iotdb.db.pipe.sink.protocol.opcua.OpcUaSink;
import org.apache.iotdb.pipe.api.PipeConnector;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
import org.apache.iotdb.pipe.api.customizer.configuration.PipeConnectorRuntimeConfiguration;
@@ -38,18 +38,18 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_DA_CLSID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_DA_PROGID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_DA_CLSID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_DA_PROGID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_DA_CLSID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_DA_PROGID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_DA_CLSID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_DA_PROGID_KEY;
/**
* Send data in IoTDB based on Opc Da protocol, using JNA. All data are converted into tablets, and
* then push the newest value to the <b>local COM</b> server in another process.
*/
@TreeModel
-public class OpcDaConnector implements PipeConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(OpcDaConnector.class);
+public class OpcDaSink implements PipeConnector {
+ private static final Logger LOGGER = LoggerFactory.getLogger(OpcDaSink.class);
private static final Map<String, Pair<AtomicInteger, OpcDaServerHandle>>
CLS_ID_TO_REFERENCE_COUNT_AND_HANDLE_MAP = new ConcurrentHashMap<>();
private String clsID;
@@ -108,7 +108,7 @@ public class OpcDaConnector implements PipeConnector {
@Override
public void transfer(final TabletInsertionEvent tabletInsertionEvent) throws Exception {
- OpcUaConnector.transferByTablet(
+ OpcUaSink.transferByTablet(
tabletInsertionEvent, LOGGER, (tablet, isTableModel) -> handle.transfer(tablet));
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaKeyStoreLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaKeyStoreLoader.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaKeyStoreLoader.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaKeyStoreLoader.java
index 1ce1c5d7bab..b17f27532d7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaKeyStoreLoader.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaKeyStoreLoader.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.opcua;
+package org.apache.iotdb.db.pipe.sink.protocol.opcua;
import org.apache.iotdb.commons.utils.FileUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaNameSpace.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaNameSpace.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaNameSpace.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaNameSpace.java
index 3af05080d80..e9e80f3c3c7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaNameSpace.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaNameSpace.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.opcua;
+package org.apache.iotdb.db.pipe.sink.protocol.opcua;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException;
import org.apache.iotdb.commons.utils.PathUtils;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTableModelTabletEventSorter;
-import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTreeModelTabletEventSorter;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTableModelTabletEventSorter;
+import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter;
import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
import org.apache.iotdb.pipe.api.event.Event;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaServerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaServerBuilder.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaServerBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaServerBuilder.java
index 29b8ddd282a..bc2df4839e2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaServerBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaServerBuilder.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.opcua;
+package org.apache.iotdb.db.pipe.sink.protocol.opcua;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.eclipse.milo.opcua.sdk.server.OpcUaServer;
@@ -87,13 +87,12 @@ public class OpcUaServerBuilder implements Closeable {
private DefaultTrustListManager trustListManager;
OpcUaServerBuilder() {
- tcpBindPort = PipeConnectorConstant.CONNECTOR_OPC_UA_TCP_BIND_PORT_DEFAULT_VALUE;
- httpsBindPort = PipeConnectorConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_DEFAULT_VALUE;
- user = PipeConnectorConstant.CONNECTOR_IOTDB_USER_DEFAULT_VALUE;
- password = PipeConnectorConstant.CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE;
- securityDir = Paths.get(PipeConnectorConstant.CONNECTOR_OPC_UA_SECURITY_DIR_DEFAULT_VALUE);
- enableAnonymousAccess =
- PipeConnectorConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_DEFAULT_VALUE;
+ tcpBindPort = PipeSinkConstant.CONNECTOR_OPC_UA_TCP_BIND_PORT_DEFAULT_VALUE;
+ httpsBindPort = PipeSinkConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_DEFAULT_VALUE;
+ user = PipeSinkConstant.CONNECTOR_IOTDB_USER_DEFAULT_VALUE;
+ password = PipeSinkConstant.CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE;
+ securityDir = Paths.get(PipeSinkConstant.CONNECTOR_OPC_UA_SECURITY_DIR_DEFAULT_VALUE);
+ enableAnonymousAccess = PipeSinkConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_DEFAULT_VALUE;
}
OpcUaServerBuilder setTcpBindPort(final int tcpBindPort) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaSink.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaSink.java
index 388ed67a32c..2c6f40d769b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaSink.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.opcua;
+package org.apache.iotdb.db.pipe.sink.protocol.opcua;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.db.conf.IoTDBConfig;
@@ -48,34 +48,34 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PASSWORD_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USERNAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USER_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_MODEL_CLIENT_SERVER_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_MODEL_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_MODEL_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_MODEL_PUB_SUB_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_PLACEHOLDER_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_PLACEHOLDER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_SECURITY_DIR_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_SECURITY_DIR_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_TCP_BIND_PORT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_OPC_UA_TCP_BIND_PORT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_PASSWORD_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_USERNAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_USER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_UA_ENABLE_ANONYMOUS_ACCESS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_UA_HTTPS_BIND_PORT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_UA_MODEL_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_UA_PLACEHOLDER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_UA_SECURITY_DIR_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_OPC_UA_TCP_BIND_PORT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PASSWORD_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USERNAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USER_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_ENABLE_ANONYMOUS_ACCESS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_HTTPS_BIND_PORT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_MODEL_CLIENT_SERVER_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_MODEL_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_MODEL_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_MODEL_PUB_SUB_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_PLACEHOLDER_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_PLACEHOLDER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_SECURITY_DIR_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_SECURITY_DIR_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_TCP_BIND_PORT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_OPC_UA_TCP_BIND_PORT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_PASSWORD_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USERNAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_ENABLE_ANONYMOUS_ACCESS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_HTTPS_BIND_PORT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_MODEL_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_PLACEHOLDER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_SECURITY_DIR_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_OPC_UA_TCP_BIND_PORT_KEY;
/**
* Send data in IoTDB based on Opc Ua protocol, using Eclipse Milo. All data are converted into
@@ -87,9 +87,9 @@ import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstan
*/
@TreeModel
@TableModel
-public class OpcUaConnector implements PipeConnector {
+public class OpcUaSink implements PipeConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(OpcUaConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(OpcUaSink.class);
private static final Map<String, Pair<AtomicInteger, OpcUaNameSpace>>
SERVER_KEY_TO_REFERENCE_COUNT_AND_NAME_SPACE_MAP = new ConcurrentHashMap<>();
@@ -271,8 +271,7 @@ public class OpcUaConnector implements PipeConnector {
final ThrowingBiConsumer<Tablet, Boolean, Exception> transferTablet)
throws Exception {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(
- OpcUaConnector.class.getName())) {
+ if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(OpcUaSink.class.getName())) {
return;
}
try {
@@ -280,8 +279,7 @@ public class OpcUaConnector implements PipeConnector {
transferTablet.accept(tablet, pipeInsertNodeTabletInsertionEvent.isTableModelEvent());
}
} finally {
- pipeInsertNodeTabletInsertionEvent.decreaseReferenceCount(
- OpcUaConnector.class.getName(), false);
+ pipeInsertNodeTabletInsertionEvent.decreaseReferenceCount(OpcUaSink.class.getName(), false);
}
}
@@ -290,7 +288,7 @@ public class OpcUaConnector implements PipeConnector {
final ThrowingBiConsumer<Tablet, Boolean, Exception> transferTablet)
throws Exception {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeRawTabletInsertionEvent.increaseReferenceCount(OpcUaConnector.class.getName())) {
+ if (!pipeRawTabletInsertionEvent.increaseReferenceCount(OpcUaSink.class.getName())) {
return;
}
try {
@@ -298,7 +296,7 @@ public class OpcUaConnector implements PipeConnector {
pipeRawTabletInsertionEvent.convertToTablet(),
pipeRawTabletInsertionEvent.isTableModelEvent());
} finally {
- pipeRawTabletInsertionEvent.decreaseReferenceCount(OpcUaConnector.class.getName(), false);
+ pipeRawTabletInsertionEvent.decreaseReferenceCount(OpcUaSink.class.getName(), false);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/PipeConsensusAsyncConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/PipeConsensusAsyncSink.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/PipeConsensusAsyncConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/PipeConsensusAsyncSink.java
index efa7c421c1c..fe110ff6645 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/PipeConsensusAsyncConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/PipeConsensusAsyncSink.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
@@ -27,32 +27,32 @@ import org.apache.iotdb.commons.client.async.AsyncPipeConsensusServiceClient;
import org.apache.iotdb.commons.client.container.IoTV2GlobalComponentContainer;
import org.apache.iotdb.commons.consensus.ConsensusGroupId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorRetryTimesConfigurableException;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector;
+import org.apache.iotdb.commons.exception.pipe.PipeRuntimeSinkRetryTimesConfigurableException;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSink;
import org.apache.iotdb.commons.service.metric.MetricService;
-import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeConnector;
import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeName;
+import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeSink;
import org.apache.iotdb.consensus.pipe.metric.PipeConsensusSyncLagManager;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler.PipeConsensusDeleteEventHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler.PipeConsensusTabletBatchEventHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler.PipeConsensusTabletInsertNodeEventHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler.PipeConsensusTsFileInsertionEventHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.builder.PipeConsensusAsyncBatchReqBuilder;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusDeleteNodeReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
import org.apache.iotdb.db.pipe.consensus.ReplicateProgressDataNodeManager;
-import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusConnectorMetrics;
+import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusSinkMetrics;
import org.apache.iotdb.db.pipe.event.common.PipeInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler.PipeConsensusDeleteEventHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler.PipeConsensusTabletBatchEventHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler.PipeConsensusTabletInsertNodeEventHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler.PipeConsensusTsFileInsertionEventHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.builder.PipeConsensusAsyncBatchReqBuilder;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusDeleteNodeReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -79,15 +79,15 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_CONSENSUS_GROUP_ID_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_CONSENSUS_PIPE_NAME;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_CONSENSUS_GROUP_ID_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_CONSENSUS_PIPE_NAME;
// TODO: Optimize the network and disk io for TsFile onComplete
// TODO: support Tablet Batch
@TreeModel
@TableModel
-public class PipeConsensusAsyncConnector extends IoTDBConnector implements ConsensusPipeConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(PipeConsensusAsyncConnector.class);
+public class PipeConsensusAsyncSink extends IoTDBSink implements ConsensusPipeSink {
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeConsensusAsyncSink.class);
private static final String ENQUEUE_EXCEPTION_MSG =
"Timeout: PipeConsensusConnector offers an event into transferBuffer failed, because transferBuffer is full.";
private static final String THRIFT_ERROR_FORMATTER_WITHOUT_ENDPOINT =
@@ -109,10 +109,10 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
private ScheduledExecutorService backgroundTaskService;
private final AtomicBoolean isClosed = new AtomicBoolean(false);
private final int thisDataNodeId = IoTDBDescriptor.getInstance().getConfig().getDataNodeId();
- private PipeConsensusConnectorMetrics pipeConsensusConnectorMetrics;
+ private PipeConsensusSinkMetrics pipeConsensusSinkMetrics;
private String consensusPipeName;
private int consensusGroupId;
- private PipeConsensusSyncConnector retryConnector;
+ private PipeConsensusSyncSink retryConnector;
private IClientManager<TEndPoint, AsyncPipeConsensusServiceClient> asyncTransferClientManager;
private PipeConsensusAsyncBatchReqBuilder tabletBatchBuilder;
private volatile long currentReplicateProgress = 0;
@@ -142,17 +142,17 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
consensusPipeName = parameters.getString(CONNECTOR_CONSENSUS_PIPE_NAME);
// initialize metric components
- pipeConsensusConnectorMetrics = new PipeConsensusConnectorMetrics(this);
+ pipeConsensusSinkMetrics = new PipeConsensusSinkMetrics(this);
PipeConsensusSyncLagManager.getInstance(getConsensusGroupIdStr())
.addConsensusPipeConnector(new ConsensusPipeName(consensusPipeName), this);
- MetricService.getInstance().addMetricSet(this.pipeConsensusConnectorMetrics);
+ MetricService.getInstance().addMetricSet(this.pipeConsensusSinkMetrics);
// In PipeConsensus, one pipeConsensusTask corresponds to a pipeConsensusConnector. Thus,
// `nodeUrls` here actually is a singletonList that contains one peer's TEndPoint. But here we
// retain the implementation of list to cope with possible future expansion
retryConnector =
- new PipeConsensusSyncConnector(
- nodeUrls, consensusGroupId, thisDataNodeId, pipeConsensusConnectorMetrics);
+ new PipeConsensusSyncSink(
+ nodeUrls, consensusGroupId, thisDataNodeId, pipeConsensusSinkMetrics);
retryConnector.customize(parameters, configuration);
asyncTransferClientManager =
IoTV2GlobalComponentContainer.getInstance().getGlobalAsyncClientManager();
@@ -193,15 +193,15 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
transferBuffer.offer(
event, PIPE_CONSENSUS_EVENT_ENQUEUE_TIMEOUT_IN_MS, TimeUnit.MILLISECONDS);
long duration = System.nanoTime() - currentTime;
- pipeConsensusConnectorMetrics.recordConnectorEnqueueTimer(duration);
+ pipeConsensusSinkMetrics.recordConnectorEnqueueTimer(duration);
// add reference
if (result) {
- event.increaseReferenceCount(PipeConsensusAsyncConnector.class.getName());
+ event.increaseReferenceCount(PipeConsensusAsyncSink.class.getName());
}
// if connector is closed when executing this method, need to clear this event's reference
// count to avoid unnecessarily pinning some resource such as WAL.
if (isClosed.get()) {
- event.clearReferenceCount(PipeConsensusAsyncConnector.class.getName());
+ event.clearReferenceCount(PipeConsensusAsyncSink.class.getName());
}
return result;
} catch (InterruptedException e) {
@@ -241,7 +241,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
currentReplicateProgress =
Math.max(currentReplicateProgress, event.getReplicateIndexForIoTV2());
// decrease reference count
- event.decreaseReferenceCount(PipeConsensusAsyncConnector.class.getName(), true);
+ event.decreaseReferenceCount(PipeConsensusAsyncSink.class.getName(), true);
}
@Override
@@ -262,7 +262,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
boolean enqueueResult = addEvent2Buffer((EnrichedEvent) tabletInsertionEvent);
if (!enqueueResult) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
ENQUEUE_EXCEPTION_MSG, Integer.MAX_VALUE);
}
// batch transfer tablets.
@@ -270,7 +270,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
if (tabletBatchBuilder.onEvent(tabletInsertionEvent)) {
final PipeConsensusTabletBatchEventHandler pipeConsensusTabletBatchEventHandler =
new PipeConsensusTabletBatchEventHandler(
- tabletBatchBuilder, this, pipeConsensusConnectorMetrics);
+ tabletBatchBuilder, this, pipeConsensusSinkMetrics);
transfer(pipeConsensusTabletBatchEventHandler);
@@ -300,7 +300,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
(PipeInsertNodeTabletInsertionEvent) tabletInsertionEvent;
// We increase the reference count for this event to determine if the event may be released.
if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName())) {
+ PipeConsensusAsyncSink.class.getName())) {
return false;
}
@@ -330,7 +330,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
pipeInsertNodeTabletInsertionEvent,
pipeConsensusTransferReq,
this,
- pipeConsensusConnectorMetrics);
+ pipeConsensusSinkMetrics);
transfer(pipeConsensusInsertNodeReqHandler);
return true;
@@ -362,7 +362,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
boolean enqueueResult = addEvent2Buffer((EnrichedEvent) tsFileInsertionEvent);
if (!enqueueResult) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
ENQUEUE_EXCEPTION_MSG, Integer.MAX_VALUE);
}
@@ -373,8 +373,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
final PipeTsFileInsertionEvent pipeTsFileInsertionEvent =
(PipeTsFileInsertionEvent) tsFileInsertionEvent;
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeTsFileInsertionEvent.increaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName())) {
+ if (!pipeTsFileInsertionEvent.increaseReferenceCount(PipeConsensusAsyncSink.class.getName())) {
return false;
}
@@ -400,14 +399,14 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
tConsensusGroupId,
consensusPipeName,
thisDataNodeId,
- pipeConsensusConnectorMetrics);
+ pipeConsensusSinkMetrics);
transfer(pipeConsensusTsFileInsertionEventHandler);
return true;
} catch (Exception e) {
// Just in case. To avoid the case that exception occurred when constructing the handler.
pipeTsFileInsertionEvent.decreaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName(), false);
+ PipeConsensusAsyncSink.class.getName(), false);
throw e;
}
}
@@ -438,7 +437,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
final PipeDeleteDataNodeEvent deleteDataNodeEvent = (PipeDeleteDataNodeEvent) event;
final boolean enqueueResult = addEvent2Buffer(deleteDataNodeEvent);
if (!enqueueResult) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
ENQUEUE_EXCEPTION_MSG, Integer.MAX_VALUE);
}
@@ -454,8 +453,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
private boolean transferDeletion(PipeDeleteDataNodeEvent pipeDeleteDataNodeEvent) {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeDeleteDataNodeEvent.increaseReferenceCount(
- PipeConsensusSyncConnector.class.getName())) {
+ if (!pipeDeleteDataNodeEvent.increaseReferenceCount(PipeConsensusSyncSink.class.getName())) {
return false;
}
@@ -477,7 +475,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
thisDataNodeId);
final PipeConsensusDeleteEventHandler pipeConsensusDeleteEventHandler =
new PipeConsensusDeleteEventHandler(
- pipeDeleteDataNodeEvent, pipeConsensusTransferReq, this, pipeConsensusConnectorMetrics);
+ pipeDeleteDataNodeEvent, pipeConsensusTransferReq, this, pipeConsensusSinkMetrics);
transfer(pipeConsensusDeleteEventHandler);
return true;
@@ -502,7 +500,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
transfer(
new PipeConsensusTabletBatchEventHandler(
- tabletBatchBuilder, this, pipeConsensusConnectorMetrics));
+ tabletBatchBuilder, this, pipeConsensusSinkMetrics));
tabletBatchBuilder.onSuccess();
}
@@ -567,14 +565,12 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
// TODO: batch transfer
try {
if (transferInEventWithoutCheck(tabletInsertionEvent)) {
- tabletInsertionEvent.decreaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName(), false);
+ tabletInsertionEvent.decreaseReferenceCount(PipeConsensusAsyncSink.class.getName(), false);
} else {
addFailureEventToRetryQueue(tabletInsertionEvent);
}
} catch (final Exception e) {
- tabletInsertionEvent.decreaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName(), false);
+ tabletInsertionEvent.decreaseReferenceCount(PipeConsensusAsyncSink.class.getName(), false);
addFailureEventToRetryQueue(tabletInsertionEvent);
}
}
@@ -582,14 +578,12 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
private void retryTransfer(final PipeTsFileInsertionEvent tsFileInsertionEvent) {
try {
if (transferWithoutCheck(tsFileInsertionEvent)) {
- tsFileInsertionEvent.decreaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName(), false);
+ tsFileInsertionEvent.decreaseReferenceCount(PipeConsensusAsyncSink.class.getName(), false);
} else {
addFailureEventToRetryQueue(tsFileInsertionEvent);
}
} catch (final Exception e) {
- tsFileInsertionEvent.decreaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName(), false);
+ tsFileInsertionEvent.decreaseReferenceCount(PipeConsensusAsyncSink.class.getName(), false);
addFailureEventToRetryQueue(tsFileInsertionEvent);
}
}
@@ -597,14 +591,12 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
private void retryTransfer(final PipeDeleteDataNodeEvent deleteDataNodeEvent) {
try {
if (transferDeletion(deleteDataNodeEvent)) {
- deleteDataNodeEvent.decreaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName(), false);
+ deleteDataNodeEvent.decreaseReferenceCount(PipeConsensusAsyncSink.class.getName(), false);
} else {
addFailureEventToRetryQueue(deleteDataNodeEvent);
}
} catch (final Exception e) {
- deleteDataNodeEvent.decreaseReferenceCount(
- PipeConsensusAsyncConnector.class.getName(), false);
+ deleteDataNodeEvent.decreaseReferenceCount(PipeConsensusAsyncSink.class.getName(), false);
addFailureEventToRetryQueue(deleteDataNodeEvent);
}
}
@@ -621,7 +613,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
}
if (isClosed.get()) {
- event.clearReferenceCount(PipeConsensusAsyncConnector.class.getName());
+ event.clearReferenceCount(PipeConsensusAsyncSink.class.getName());
return;
}
// just in case
@@ -645,7 +637,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
}
if (isClosed.get()) {
- event.clearReferenceCount(PipeConsensusAsyncConnector.class.getName());
+ event.clearReferenceCount(PipeConsensusAsyncSink.class.getName());
}
}
@@ -663,14 +655,14 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
public synchronized void clearRetryEventsReferenceCount() {
while (!retryEventQueue.isEmpty()) {
final EnrichedEvent event = retryEventQueue.poll();
- event.clearReferenceCount(PipeConsensusAsyncConnector.class.getName());
+ event.clearReferenceCount(PipeConsensusAsyncSink.class.getName());
}
}
public synchronized void clearTransferBufferReferenceCount() {
while (!transferBuffer.isEmpty()) {
final EnrichedEvent event = transferBuffer.poll();
- event.clearReferenceCount(PipeConsensusAsyncConnector.class.getName());
+ event.clearReferenceCount(PipeConsensusAsyncSink.class.getName());
}
}
@@ -710,7 +702,7 @@ public class PipeConsensusAsyncConnector extends IoTDBConnector implements Conse
PipeConsensusSyncLagManager.getInstance(getConsensusGroupIdStr())
.removeConsensusPipeConnector(new ConsensusPipeName(consensusPipeName));
- MetricService.getInstance().removeMetricSet(this.pipeConsensusConnectorMetrics);
+ MetricService.getInstance().removeMetricSet(this.pipeConsensusSinkMetrics);
}
//////////////////////////// APIs provided for metric framework ////////////////////////////
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/PipeConsensusSyncConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/PipeConsensusSyncSink.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/PipeConsensusSyncConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/PipeConsensusSyncSink.java
index f501e8af7ba..4ee9e1f2352 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/PipeConsensusSyncConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/PipeConsensusSyncSink.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
@@ -27,25 +27,25 @@ import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.container.IoTV2GlobalComponentContainer;
import org.apache.iotdb.commons.client.sync.SyncPipeConsensusServiceClient;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorRetryTimesConfigurableException;
+import org.apache.iotdb.commons.exception.pipe.PipeRuntimeSinkRetryTimesConfigurableException;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.response.PipeConsensusTransferFilePieceResp;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.response.PipeConsensusTransferFilePieceResp;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSink;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusBatchTransferResp;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferResp;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.builder.PipeConsensusSyncBatchReqBuilder;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusDeleteNodeReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceWithModReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealWithModReq;
-import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusConnectorMetrics;
+import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusSinkMetrics;
import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.builder.PipeConsensusSyncBatchReqBuilder;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusDeleteNodeReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceWithModReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealWithModReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -70,8 +70,8 @@ import java.util.stream.Collectors;
/** This connector is used for PipeConsensus to transfer queued event. */
@TreeModel
@TableModel
-public class PipeConsensusSyncConnector extends IoTDBConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(PipeConsensusSyncConnector.class);
+public class PipeConsensusSyncSink extends IoTDBSink {
+ private static final Logger LOGGER = LoggerFactory.getLogger(PipeConsensusSyncSink.class);
private static final String PIPE_CONSENSUS_SYNC_CONNECTION_FAILED_FORMAT =
"PipeConsensus: syncClient connection to %s:%s failed when %s, because: %s";
private static final String TABLET_INSERTION_NODE_SCENARIO = "transfer insertionNode tablet";
@@ -82,14 +82,14 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
private final List<TEndPoint> peers;
private final int thisDataNodeId;
private final int consensusGroupId;
- private final PipeConsensusConnectorMetrics pipeConsensusConnectorMetrics;
+ private final PipeConsensusSinkMetrics pipeConsensusSinkMetrics;
private PipeConsensusSyncBatchReqBuilder tabletBatchBuilder;
- public PipeConsensusSyncConnector(
+ public PipeConsensusSyncSink(
final List<TEndPoint> peers,
final int consensusGroupId,
final int thisDataNodeId,
- final PipeConsensusConnectorMetrics pipeConsensusConnectorMetrics) {
+ final PipeConsensusSinkMetrics pipeConsensusSinkMetrics) {
// In PipeConsensus, one pipeConsensusTask corresponds to a pipeConsensusConnector. Thus,
// `peers` here actually is a singletonList that contains one peer's TEndPoint. But here we
// retain the implementation of list to cope with possible future expansion
@@ -98,7 +98,7 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
this.thisDataNodeId = thisDataNodeId;
this.syncRetryClientManager =
IoTV2GlobalComponentContainer.getInstance().getGlobalSyncClientManager();
- this.pipeConsensusConnectorMetrics = pipeConsensusConnectorMetrics;
+ this.pipeConsensusSinkMetrics = pipeConsensusSinkMetrics;
}
@Override
@@ -143,10 +143,10 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
final long startTime = System.nanoTime();
doTransferWrapper((PipeInsertNodeTabletInsertionEvent) tabletInsertionEvent);
final long duration = System.nanoTime() - startTime;
- pipeConsensusConnectorMetrics.recordRetryWALTransferTimer(duration);
+ pipeConsensusSinkMetrics.recordRetryWALTransferTimer(duration);
}
} catch (final Exception e) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
String.format(
"Failed to transfer tablet insertion event %s, because %s.",
tabletInsertionEvent, e.getMessage()),
@@ -167,9 +167,9 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
}
doTransfer((PipeTsFileInsertionEvent) tsFileInsertionEvent);
final long duration = System.nanoTime() - startTime;
- pipeConsensusConnectorMetrics.recordRetryTsFileTransferTimer(duration);
+ pipeConsensusSinkMetrics.recordRetryTsFileTransferTimer(duration);
} catch (Exception e) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
String.format(
"Failed to transfer tsfile insertion event %s, because %s.",
tsFileInsertionEvent, e.getMessage()),
@@ -215,7 +215,7 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
tabletBatchBuilder.onSuccess();
} catch (final Exception e) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
String.format(
PIPE_CONSENSUS_SYNC_CONNECTION_FAILED_FORMAT,
getFollowerUrl().getIp(),
@@ -229,15 +229,13 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
private void doTransferWrapper(final PipeDeleteDataNodeEvent pipeDeleteDataNodeEvent)
throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeDeleteDataNodeEvent.increaseReferenceCount(
- PipeConsensusSyncConnector.class.getName())) {
+ if (!pipeDeleteDataNodeEvent.increaseReferenceCount(PipeConsensusSyncSink.class.getName())) {
return;
}
try {
doTransfer(pipeDeleteDataNodeEvent);
} finally {
- pipeDeleteDataNodeEvent.decreaseReferenceCount(
- PipeConsensusSyncConnector.class.getName(), false);
+ pipeDeleteDataNodeEvent.decreaseReferenceCount(PipeConsensusSyncSink.class.getName(), false);
}
}
@@ -265,7 +263,7 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
progressIndex,
thisDataNodeId));
} catch (final Exception e) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
String.format(
PIPE_CONSENSUS_SYNC_CONNECTION_FAILED_FORMAT,
getFollowerUrl().getIp(),
@@ -299,14 +297,14 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(
- PipeConsensusSyncConnector.class.getName())) {
+ PipeConsensusSyncSink.class.getName())) {
return;
}
try {
doTransfer(pipeInsertNodeTabletInsertionEvent);
} finally {
pipeInsertNodeTabletInsertionEvent.decreaseReferenceCount(
- PipeConsensusSyncConnector.class.getName(), false);
+ PipeConsensusSyncSink.class.getName(), false);
}
}
@@ -344,7 +342,7 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
thisDataNodeId));
}
} catch (final Exception e) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
String.format(
PIPE_CONSENSUS_SYNC_CONNECTION_FAILED_FORMAT,
getFollowerUrl().getIp(),
@@ -418,7 +416,7 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
thisDataNodeId));
}
} catch (final Exception e) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
String.format(
PIPE_CONSENSUS_SYNC_CONNECTION_FAILED_FORMAT,
getFollowerUrl().getIp(),
@@ -483,7 +481,7 @@ public class PipeConsensusSyncConnector extends IoTDBConnector {
tConsensusGroupId,
thisDataNodeId)));
} catch (Exception e) {
- throw new PipeRuntimeConnectorRetryTimesConfigurableException(
+ throw new PipeRuntimeSinkRetryTimesConfigurableException(
String.format(
"Network error when transfer file %s, because %s.", file, e.getMessage()),
Integer.MAX_VALUE);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusDeleteEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusDeleteEventHandler.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusDeleteEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusDeleteEventHandler.java
index f5a0d6b6dbd..6f4e93ba445 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusDeleteEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusDeleteEventHandler.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeConsensusServiceClient;
import org.apache.iotdb.commons.utils.RetryUtils;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferResp;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.PipeConsensusAsyncConnector;
-import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusConnectorMetrics;
+import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusSinkMetrics;
import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -44,17 +44,17 @@ public class PipeConsensusDeleteEventHandler
private final TPipeConsensusTransferReq req;
- private final PipeConsensusAsyncConnector connector;
+ private final PipeConsensusAsyncSink connector;
- private final PipeConsensusConnectorMetrics metric;
+ private final PipeConsensusSinkMetrics metric;
private final long createTime;
public PipeConsensusDeleteEventHandler(
PipeDeleteDataNodeEvent event,
TPipeConsensusTransferReq req,
- PipeConsensusAsyncConnector connector,
- PipeConsensusConnectorMetrics metric) {
+ PipeConsensusAsyncSink connector,
+ PipeConsensusSinkMetrics metric) {
this.event = event;
this.req = req;
this.connector = connector;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletBatchEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletBatchEventHandler.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletBatchEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletBatchEventHandler.java
index 31677862579..1acc92841b0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletBatchEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletBatchEventHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeConsensusServiceClient;
@@ -25,9 +25,9 @@ import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusBatchTransferReq;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusBatchTransferResp;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferResp;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.PipeConsensusAsyncConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.builder.PipeConsensusAsyncBatchReqBuilder;
-import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusConnectorMetrics;
+import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusSinkMetrics;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.builder.PipeConsensusAsyncBatchReqBuilder;
import org.apache.iotdb.pipe.api.event.Event;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -48,20 +48,20 @@ public class PipeConsensusTabletBatchEventHandler
private final List<Long> requestCommitIds;
private final List<EnrichedEvent> events;
private final TPipeConsensusBatchTransferReq req;
- private final PipeConsensusAsyncConnector connector;
- private final PipeConsensusConnectorMetrics pipeConsensusConnectorMetrics;
+ private final PipeConsensusAsyncSink connector;
+ private final PipeConsensusSinkMetrics pipeConsensusSinkMetrics;
public PipeConsensusTabletBatchEventHandler(
final PipeConsensusAsyncBatchReqBuilder batchBuilder,
- final PipeConsensusAsyncConnector connector,
- final PipeConsensusConnectorMetrics pipeConsensusConnectorMetrics)
+ final PipeConsensusAsyncSink connector,
+ final PipeConsensusSinkMetrics pipeConsensusSinkMetrics)
throws IOException {
// Deep copy to keep Ids' and events' reference
requestCommitIds = batchBuilder.deepCopyRequestCommitIds();
events = batchBuilder.deepCopyEvents();
req = batchBuilder.toTPipeConsensusBatchTransferReq();
- this.pipeConsensusConnectorMetrics = pipeConsensusConnectorMetrics;
+ this.pipeConsensusSinkMetrics = pipeConsensusSinkMetrics;
this.connector = connector;
}
@@ -90,7 +90,7 @@ public class PipeConsensusTabletBatchEventHandler
.filter(tsStatus -> tsStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode())
.forEach(
tsStatus -> {
- pipeConsensusConnectorMetrics.recordRetryCounter();
+ pipeConsensusSinkMetrics.recordRetryCounter();
connector
.statusHandler()
.handle(tsStatus, tsStatus.getMessage(), events.toString());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletInsertNodeEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletInsertNodeEventHandler.java
similarity index 83%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletInsertNodeEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletInsertNodeEventHandler.java
index 731e0af06de..0b701fc264b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletInsertNodeEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletInsertNodeEventHandler.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler;
import org.apache.iotdb.commons.client.async.AsyncPipeConsensusServiceClient;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferResp;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.PipeConsensusAsyncConnector;
-import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusConnectorMetrics;
+import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusSinkMetrics;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
import org.apache.thrift.TException;
@@ -34,8 +34,8 @@ public class PipeConsensusTabletInsertNodeEventHandler
public PipeConsensusTabletInsertNodeEventHandler(
PipeInsertNodeTabletInsertionEvent event,
TPipeConsensusTransferReq req,
- PipeConsensusAsyncConnector connector,
- PipeConsensusConnectorMetrics metric) {
+ PipeConsensusAsyncSink connector,
+ PipeConsensusSinkMetrics metric) {
super(event, req, connector, metric);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletInsertionEventHandler.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletInsertionEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletInsertionEventHandler.java
index f15358074ef..643b9728a34 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTabletInsertionEventHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeConsensusServiceClient;
@@ -25,9 +25,9 @@ import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.commons.utils.RetryUtils;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferResp;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.PipeConsensusAsyncConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler.PipeTransferTabletInsertionEventHandler;
-import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusConnectorMetrics;
+import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusSinkMetrics;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler.PipeTransferTabletInsertionEventHandler;
import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -46,17 +46,17 @@ public abstract class PipeConsensusTabletInsertionEventHandler<E extends TPipeCo
protected final TPipeConsensusTransferReq req;
- protected final PipeConsensusAsyncConnector connector;
+ protected final PipeConsensusAsyncSink connector;
- protected final PipeConsensusConnectorMetrics metric;
+ protected final PipeConsensusSinkMetrics metric;
private final long createTime;
protected PipeConsensusTabletInsertionEventHandler(
TabletInsertionEvent event,
TPipeConsensusTransferReq req,
- PipeConsensusAsyncConnector connector,
- PipeConsensusConnectorMetrics metric) {
+ PipeConsensusAsyncSink connector,
+ PipeConsensusSinkMetrics metric) {
this.event = event;
this.req = req;
this.connector = connector;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTsFileInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTsFileInsertionEventHandler.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTsFileInsertionEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTsFileInsertionEventHandler.java
index 4ef419e0302..485096173c1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/handler/PipeConsensusTsFileInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/handler/PipeConsensusTsFileInsertionEventHandler.java
@@ -17,23 +17,23 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.handler;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeConsensusServiceClient;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.response.PipeConsensusTransferFilePieceResp;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.response.PipeConsensusTransferFilePieceResp;
import org.apache.iotdb.commons.utils.RetryUtils;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferResp;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.PipeConsensusAsyncConnector;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceWithModReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealWithModReq;
-import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusConnectorMetrics;
+import org.apache.iotdb.db.pipe.consensus.metric.PipeConsensusSinkMetrics;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.PipeConsensusAsyncSink;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFilePieceWithModReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTsFileSealWithModReq;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.thrift.TException;
@@ -56,7 +56,7 @@ public class PipeConsensusTsFileInsertionEventHandler
LoggerFactory.getLogger(PipeConsensusTsFileInsertionEventHandler.class);
private final PipeTsFileInsertionEvent event;
- private final PipeConsensusAsyncConnector connector;
+ private final PipeConsensusAsyncSink connector;
private final TCommitId commitId;
private final TConsensusGroupId consensusGroupId;
private final String consensusPipeName;
@@ -77,7 +77,7 @@ public class PipeConsensusTsFileInsertionEventHandler
private AsyncPipeConsensusServiceClient client;
- private final PipeConsensusConnectorMetrics metric;
+ private final PipeConsensusSinkMetrics metric;
private final long createTime;
@@ -85,12 +85,12 @@ public class PipeConsensusTsFileInsertionEventHandler
public PipeConsensusTsFileInsertionEventHandler(
final PipeTsFileInsertionEvent event,
- final PipeConsensusAsyncConnector connector,
+ final PipeConsensusAsyncSink connector,
final TCommitId commitId,
final TConsensusGroupId consensusGroupId,
final String consensusPipeName,
final int thisDataNodeId,
- final PipeConsensusConnectorMetrics metric)
+ final PipeConsensusSinkMetrics metric)
throws FileNotFoundException {
this.event = event;
this.connector = connector;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusAsyncBatchReqBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusAsyncBatchReqBuilder.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusAsyncBatchReqBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusAsyncBatchReqBuilder.java
index b2205df5c1a..ae4876cd838 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusAsyncBatchReqBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusAsyncBatchReqBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.builder;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.builder;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusSyncBatchReqBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusSyncBatchReqBuilder.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusSyncBatchReqBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusSyncBatchReqBuilder.java
index 07f5af5079e..e041b0da93b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusSyncBatchReqBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusSyncBatchReqBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.builder;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.builder;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusTransferBatchReqBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusTransferBatchReqBuilder.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusTransferBatchReqBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusTransferBatchReqBuilder.java
index b6f555b4ebc..3ef083f827e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusTransferBatchReqBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/builder/PipeConsensusTransferBatchReqBuilder.java
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.builder;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.builder;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletBatchReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
-import org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlock;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletBatchReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletBinaryReq;
+import org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request.PipeConsensusTabletInsertNodeReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.storageengine.dataregion.wal.exception.WALPipeException;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
@@ -46,14 +46,14 @@ import java.util.Arrays;
import java.util.List;
import java.util.Objects;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_DELAY_MS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_DELAY_SECONDS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_SIZE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PLAIN_BATCH_DELAY_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PLAIN_BATCH_SIZE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_DELAY_MS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_DELAY_SECONDS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_SIZE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_BATCH_DELAY_MS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_BATCH_DELAY_SECONDS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_BATCH_SIZE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PLAIN_BATCH_DELAY_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_PLAIN_BATCH_SIZE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_BATCH_DELAY_MS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_BATCH_DELAY_SECONDS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_BATCH_SIZE_KEY;
public abstract class PipeConsensusTransferBatchReqBuilder implements AutoCloseable {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusDeleteNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusDeleteNodeReq.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusDeleteNodeReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusDeleteNodeReq.java
index f0e71db4f8e..0a5fe08ea6a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusDeleteNodeReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusDeleteNodeReq.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestVersion;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletBatchReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletBatchReq.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletBatchReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletBatchReq.java
index 1401b19adaf..df498663348 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletBatchReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletBatchReq.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusBatchTransferReq;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletBinaryReq.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletBinaryReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletBinaryReq.java
index 88ac59e30f5..96f02d7b3c4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletBinaryReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletBinaryReq.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestVersion;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletInsertNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletInsertNodeReq.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletInsertNodeReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletInsertNodeReq.java
index e4fcf7ec457..617c4161aa1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTabletInsertNodeReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTabletInsertNodeReq.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestVersion;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestVersion;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceReq.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceReq.java
index 3afc373e2aa..eedfc58758b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceReq.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusTransferFilePieceReq;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceWithModReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceWithModReq.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceWithModReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceWithModReq.java
index fd16625b81a..2d1c731b8fe 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceWithModReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFilePieceWithModReq.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusTransferFilePieceReq;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusTransferFilePieceReq;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealReq.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealReq.java
index 2f8de50a638..f9091160c53 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealReq.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusTransferFileSealReq;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusTransferFileSealReq;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealWithModReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealWithModReq.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealWithModReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealWithModReq.java
index e28333bf9f4..07c4a96be8f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealWithModReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/pipeconsensus/payload/request/PipeConsensusTsFileSealWithModReq.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.pipeconsensus.payload.request;
+package org.apache.iotdb.db.pipe.sink.protocol.pipeconsensus.payload.request;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusRequestType;
-import org.apache.iotdb.commons.pipe.connector.payload.pipeconsensus.request.PipeConsensusTransferFileSealWithModReq;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusRequestType;
+import org.apache.iotdb.commons.pipe.sink.payload.pipeconsensus.request.PipeConsensusTransferFileSealWithModReq;
import org.apache.iotdb.consensus.pipe.thrift.TCommitId;
import org.apache.iotdb.consensus.pipe.thrift.TPipeConsensusTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/IoTDBDataRegionAsyncConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/IoTDBDataRegionAsyncSink.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/IoTDBDataRegionAsyncConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/IoTDBDataRegionAsyncSink.java
index 1b743530421..9fd63a054be 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/IoTDBDataRegionAsyncConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/IoTDBDataRegionAsyncSink.java
@@ -17,35 +17,35 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.async;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.async;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.connector.client.IoTDBDataNodeAsyncClientManager;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventBatch;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventPlainBatch;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventTsFileBatch;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTransferBatchReqBuilder;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReqV2;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler.PipeTransferTabletBatchEventHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler.PipeTransferTabletInsertNodeEventHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler.PipeTransferTabletRawEventHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler.PipeTransferTrackableHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler.PipeTransferTsFileHandler;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.sync.IoTDBDataRegionSyncConnector;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSink;
import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.terminate.PipeTerminateEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
-import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionConnectorMetrics;
+import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics;
import org.apache.iotdb.db.pipe.metric.source.PipeDataRegionEventCounter;
+import org.apache.iotdb.db.pipe.sink.client.IoTDBDataNodeAsyncClientManager;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventBatch;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventPlainBatch;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventTsFileBatch;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTransferBatchReqBuilder;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReqV2;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler.PipeTransferTabletBatchEventHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler.PipeTransferTabletInsertNodeEventHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler.PipeTransferTabletRawEventHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler.PipeTransferTrackableHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler.PipeTransferTsFileHandler;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.sync.IoTDBDataRegionSyncSink;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.pipe.api.PipeConnector;
import org.apache.iotdb.pipe.api.annotation.TableModel;
@@ -80,21 +80,21 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_LEADER_CACHE_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_LEADER_CACHE_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_ENABLE_SEND_TSFILE_LIMIT;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_SSL_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_LEADER_CACHE_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_LEADER_CACHE_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_LEADER_CACHE_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_ENABLE_SEND_TSFILE_LIMIT;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_SSL_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_LEADER_CACHE_ENABLE_KEY;
@TreeModel
@TableModel
-public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
+public class IoTDBDataRegionAsyncSink extends IoTDBSink {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataRegionAsyncConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataRegionAsyncSink.class);
private static final String THRIFT_ERROR_FORMATTER_WITHOUT_ENDPOINT =
"Failed to borrow client from client pool when sending to receiver.";
@@ -103,7 +103,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
private static final boolean isSplitTSFileBatchModeEnabled = true;
- private final IoTDBDataRegionSyncConnector syncConnector = new IoTDBDataRegionSyncConnector();
+ private final IoTDBDataRegionSyncSink syncSink = new IoTDBDataRegionSyncSink();
private final BlockingQueue<Event> retryEventQueue = new LinkedBlockingQueue<>();
private final BlockingQueue<TsFileInsertionEvent> retryTsFileQueue = new LinkedBlockingQueue<>();
@@ -128,7 +128,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
@Override
public void validate(final PipeParameterValidator validator) throws Exception {
super.validate(validator);
- syncConnector.validate(validator);
+ syncSink.validate(validator);
final PipeParameters parameters = validator.getParameters();
@@ -145,7 +145,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
final PipeParameters parameters, final PipeConnectorRuntimeConfiguration configuration)
throws Exception {
super.customize(parameters, configuration);
- syncConnector.customize(parameters, configuration);
+ syncSink.customize(parameters, configuration);
clientManager =
new IoTDBDataNodeAsyncClientManager(
@@ -190,13 +190,13 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
@Override
// Synchronized to avoid close connector when transfer event
public synchronized void handshake() throws Exception {
- syncConnector.handshake();
+ syncSink.handshake();
}
@Override
public void heartbeat() throws Exception {
if (!isClosed()) {
- syncConnector.heartbeat();
+ syncSink.heartbeat();
}
}
@@ -277,7 +277,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
(PipeInsertNodeTabletInsertionEvent) tabletInsertionEvent;
// We increase the reference count for this event to determine if the event may be released.
if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionAsyncConnector.class.getName())) {
+ IoTDBDataRegionAsyncSink.class.getName())) {
return false;
}
@@ -304,7 +304,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
(PipeRawTabletInsertionEvent) tabletInsertionEvent;
// We increase the reference count for this event to determine if the event may be released.
if (!pipeRawTabletInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionAsyncConnector.class.getName())) {
+ IoTDBDataRegionAsyncSink.class.getName())) {
return false;
}
@@ -385,7 +385,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
(PipeTsFileInsertionEvent) tsFileInsertionEvent;
// We increase the reference count for this event to determine if the event may be released.
if (!pipeTsFileInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionAsyncConnector.class.getName())) {
+ IoTDBDataRegionAsyncSink.class.getName())) {
return false;
}
@@ -420,7 +420,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
} catch (final Exception e) {
// Just in case. To avoid the case that exception occurred when constructing the handler.
pipeTsFileInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionAsyncConnector.class.getName(), false);
+ IoTDBDataRegionAsyncSink.class.getName(), false);
throw e;
}
}
@@ -472,7 +472,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
return;
}
- syncConnector.transfer(event);
+ syncSink.transfer(event);
}
/** Try its best to commit data in order. Flush can also be a trigger to transfer batched data. */
@@ -491,7 +491,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
public TPipeTransferReq compressIfNeeded(final TPipeTransferReq req) throws IOException {
if (Objects.isNull(compressionTimer) && Objects.nonNull(attributeSortedString)) {
compressionTimer =
- PipeDataRegionConnectorMetrics.getInstance().getCompressionTimer(attributeSortedString);
+ PipeDataRegionSinkMetrics.getInstance().getCompressionTimer(attributeSortedString);
}
return super.compressIfNeeded(req);
}
@@ -623,7 +623,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
transferBatchedEventsIfNecessary();
if (tabletInsertionEvent instanceof EnrichedEvent) {
((EnrichedEvent) tabletInsertionEvent)
- .decreaseReferenceCount(IoTDBDataRegionAsyncConnector.class.getName(), false);
+ .decreaseReferenceCount(IoTDBDataRegionAsyncSink.class.getName(), false);
}
} catch (final Exception e) {
addFailureEventToRetryQueue(tabletInsertionEvent);
@@ -636,7 +636,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
if (transferInEventWithoutCheck(tabletInsertionEvent)) {
if (tabletInsertionEvent instanceof EnrichedEvent) {
((EnrichedEvent) tabletInsertionEvent)
- .decreaseReferenceCount(IoTDBDataRegionAsyncConnector.class.getName(), false);
+ .decreaseReferenceCount(IoTDBDataRegionAsyncSink.class.getName(), false);
}
} else {
addFailureEventToRetryQueue(tabletInsertionEvent);
@@ -644,7 +644,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
} catch (final Exception e) {
if (tabletInsertionEvent instanceof EnrichedEvent) {
((EnrichedEvent) tabletInsertionEvent)
- .decreaseReferenceCount(IoTDBDataRegionAsyncConnector.class.getName(), false);
+ .decreaseReferenceCount(IoTDBDataRegionAsyncSink.class.getName(), false);
}
addFailureEventToRetryQueue(tabletInsertionEvent);
}
@@ -654,13 +654,12 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
try {
if (transferWithoutCheck(tsFileInsertionEvent)) {
tsFileInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionAsyncConnector.class.getName(), false);
+ IoTDBDataRegionAsyncSink.class.getName(), false);
} else {
addFailureEventToRetryQueue(tsFileInsertionEvent);
}
} catch (final Exception e) {
- tsFileInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionAsyncConnector.class.getName(), false);
+ tsFileInsertionEvent.decreaseReferenceCount(IoTDBDataRegionAsyncSink.class.getName(), false);
addFailureEventToRetryQueue(tsFileInsertionEvent);
}
}
@@ -678,7 +677,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
if (isClosed.get()) {
if (event instanceof EnrichedEvent) {
- ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncConnector.class.getName());
+ ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncSink.class.getName());
}
return;
}
@@ -697,7 +696,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
if (isClosed.get()) {
if (event instanceof EnrichedEvent) {
- ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncConnector.class.getName());
+ ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncSink.class.getName());
}
}
}
@@ -727,8 +726,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
if (event instanceof EnrichedEvent
&& pipeNameToDrop.equals(((EnrichedEvent) event).getPipeName())
&& regionId == ((EnrichedEvent) event).getRegionId()) {
- ((EnrichedEvent) event)
- .clearReferenceCount(IoTDBDataRegionAsyncConnector.class.getName());
+ ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncSink.class.getName());
retryEventQueueEventCounter.decreaseEventCount(event);
return true;
}
@@ -740,8 +738,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
if (event instanceof EnrichedEvent
&& pipeNameToDrop.equals(((EnrichedEvent) event).getPipeName())
&& regionId == ((EnrichedEvent) event).getRegionId()) {
- ((EnrichedEvent) event)
- .clearReferenceCount(IoTDBDataRegionAsyncConnector.class.getName());
+ ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncSink.class.getName());
retryEventQueueEventCounter.decreaseEventCount(event);
return true;
}
@@ -754,7 +751,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
public synchronized void close() {
isClosed.set(true);
- syncConnector.close();
+ syncSink.close();
if (tabletBatchBuilder != null) {
tabletBatchBuilder.close();
@@ -794,7 +791,7 @@ public class IoTDBDataRegionAsyncConnector extends IoTDBConnector {
retryTsFileQueue.isEmpty() ? retryEventQueue.poll() : retryTsFileQueue.poll();
retryEventQueueEventCounter.decreaseEventCount(event);
if (event instanceof EnrichedEvent) {
- ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncConnector.class.getName());
+ ((EnrichedEvent) event).clearReferenceCount(IoTDBDataRegionAsyncSink.class.getName());
}
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletBatchEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletBatchEventHandler.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletBatchEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletBatchEventHandler.java
index d8100250d2a..90ab8bcfa55 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletBatchEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletBatchEventHandler.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventPlainBatch;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
-import org.apache.iotdb.db.pipe.connector.util.cacher.LeaderCacheUtils;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventPlainBatch;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
+import org.apache.iotdb.db.pipe.sink.util.cacher.LeaderCacheUtils;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -53,7 +53,7 @@ public class PipeTransferTabletBatchEventHandler extends PipeTransferTrackableHa
private final double reqCompressionRatio;
public PipeTransferTabletBatchEventHandler(
- final PipeTabletEventPlainBatch batch, final IoTDBDataRegionAsyncConnector connector)
+ final PipeTabletEventPlainBatch batch, final IoTDBDataRegionAsyncSink connector)
throws IOException {
super(connector);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletInsertNodeEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletInsertNodeEventHandler.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletInsertNodeEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletInsertNodeEventHandler.java
index 107dccceec7..70ba7f4cfc5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletInsertNodeEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletInsertNodeEventHandler.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.thrift.TException;
@@ -33,7 +33,7 @@ public class PipeTransferTabletInsertNodeEventHandler
public PipeTransferTabletInsertNodeEventHandler(
final PipeInsertNodeTabletInsertionEvent event,
final TPipeTransferReq req,
- final IoTDBDataRegionAsyncConnector connector) {
+ final IoTDBDataRegionAsyncSink connector) {
super(event, req, connector);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
index f439768846f..07e11f64624 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
import org.apache.iotdb.db.pipe.event.common.PipeInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -43,7 +43,7 @@ public abstract class PipeTransferTabletInsertionEventHandler extends PipeTransf
protected PipeTransferTabletInsertionEventHandler(
final PipeInsertionEvent event,
final TPipeTransferReq req,
- final IoTDBDataRegionAsyncConnector connector) {
+ final IoTDBDataRegionAsyncSink connector) {
super(connector);
this.event = event;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletRawEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletRawEventHandler.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletRawEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletRawEventHandler.java
index e8c5c2c2f07..ff1daa05c28 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTabletRawEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTabletRawEventHandler.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.thrift.TException;
@@ -32,7 +32,7 @@ public class PipeTransferTabletRawEventHandler extends PipeTransferTabletInserti
public PipeTransferTabletRawEventHandler(
final PipeRawTabletInsertionEvent event,
final TPipeTransferReq req,
- final IoTDBDataRegionAsyncConnector connector) {
+ final IoTDBDataRegionAsyncSink connector) {
super(event, req, connector);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTrackableHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTrackableHandler.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTrackableHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTrackableHandler.java
index e78cd9adbf3..25a341d954d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTrackableHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTrackableHandler.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferResp;
@@ -30,9 +30,9 @@ import org.apache.thrift.async.AsyncMethodCallback;
public abstract class PipeTransferTrackableHandler
implements AsyncMethodCallback<TPipeTransferResp>, AutoCloseable {
- protected final IoTDBDataRegionAsyncConnector connector;
+ protected final IoTDBDataRegionAsyncSink connector;
- public PipeTransferTrackableHandler(final IoTDBDataRegionAsyncConnector connector) {
+ public PipeTransferTrackableHandler(final IoTDBDataRegionAsyncSink connector) {
this.connector = connector;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTsFileHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTsFileHandler.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTsFileHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTsFileHandler.java
index f3b48a6ff8a..9f8fbcf44b0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/async/handler/PipeTransferTsFileHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/async/handler/PipeTransferTsFileHandler.java
@@ -17,25 +17,25 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.async.handler;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.async.handler;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.commons.pipe.connector.limiter.TsFileSendRateLimiter;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.response.PipeTransferFilePieceResp;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
+import org.apache.iotdb.commons.pipe.sink.limiter.TsFileSendRateLimiter;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.response.PipeTransferFilePieceResp;
import org.apache.iotdb.commons.utils.RetryUtils;
-import org.apache.iotdb.db.pipe.connector.client.IoTDBDataNodeAsyncClientManager;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
-import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
import org.apache.iotdb.db.pipe.metric.overview.PipeResourceMetrics;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryManager;
import org.apache.iotdb.db.pipe.resource.memory.PipeTsFileMemoryBlock;
+import org.apache.iotdb.db.pipe.sink.client.IoTDBDataNodeAsyncClientManager;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
+import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
@@ -92,7 +92,7 @@ public class PipeTransferTsFileHandler extends PipeTransferTrackableHandler {
private volatile AsyncPipeDataTransferServiceClient client;
public PipeTransferTsFileHandler(
- final IoTDBDataRegionAsyncConnector connector,
+ final IoTDBDataRegionAsyncSink connector,
final Map<Pair<String, Long>, Double> pipeName2WeightMap,
final List<EnrichedEvent> events,
final AtomicInteger eventsReferenceCount,
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBDataNodeSyncSink.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBDataNodeSyncSink.java
index 020c2b127b5..ec26a613ef4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBDataNodeSyncSink.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.sync;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.sync;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClientManager;
-import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBSslSyncConnector;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClientManager;
+import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSslSyncSink;
import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.pipe.connector.client.IoTDBDataNodeSyncClientManager;
+import org.apache.iotdb.db.pipe.sink.client.IoTDBDataNodeSyncClientManager;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -32,7 +32,7 @@ import java.util.Objects;
@TreeModel
@TableModel
-public abstract class IoTDBDataNodeSyncConnector extends IoTDBSslSyncConnector {
+public abstract class IoTDBDataNodeSyncSink extends IoTDBSslSyncSink {
protected IoTDBDataNodeSyncClientManager clientManager;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataRegionSyncConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBDataRegionSyncSink.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataRegionSyncConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBDataRegionSyncSink.java
index 1075cebac60..6b8327170c4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataRegionSyncConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBDataRegionSyncSink.java
@@ -17,28 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.sync;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.sync;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
-import org.apache.iotdb.commons.pipe.connector.limiter.TsFileSendRateLimiter;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClient;
+import org.apache.iotdb.commons.pipe.sink.limiter.TsFileSendRateLimiter;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.commons.utils.RetryUtils;
-import org.apache.iotdb.db.pipe.connector.client.IoTDBDataNodeSyncClientManager;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventBatch;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventPlainBatch;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTabletEventTsFileBatch;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.batch.PipeTransferBatchReqBuilder;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferPlanNodeReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
-import org.apache.iotdb.db.pipe.connector.util.cacher.LeaderCacheUtils;
import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
@@ -46,7 +33,20 @@ import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.terminate.PipeTerminateEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
import org.apache.iotdb.db.pipe.metric.overview.PipeResourceMetrics;
-import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionConnectorMetrics;
+import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics;
+import org.apache.iotdb.db.pipe.sink.client.IoTDBDataNodeSyncClientManager;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventBatch;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventPlainBatch;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTabletEventTsFileBatch;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.batch.PipeTransferBatchReqBuilder;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferPlanNodeReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceWithModReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealWithModReq;
+import org.apache.iotdb.db.pipe.sink.util.cacher.LeaderCacheUtils;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -76,15 +76,15 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_ENABLE_SEND_TSFILE_LIMIT;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_ENABLE_SEND_TSFILE_LIMIT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_ENABLE_SEND_TSFILE_LIMIT;
@TreeModel
@TableModel
-public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
+public class IoTDBDataRegionSyncSink extends IoTDBDataNodeSyncSink {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataRegionSyncConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataRegionSyncSink.class);
private PipeTransferBatchReqBuilder tabletBatchBuilder;
private boolean enableSendTsFileLimit;
@@ -207,15 +207,14 @@ public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
private void doTransferWrapper(final PipeDeleteDataNodeEvent pipeDeleteDataNodeEvent)
throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeDeleteDataNodeEvent.increaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName())) {
+ if (!pipeDeleteDataNodeEvent.increaseReferenceCount(IoTDBDataRegionSyncSink.class.getName())) {
return;
}
try {
doTransfer(pipeDeleteDataNodeEvent);
} finally {
pipeDeleteDataNodeEvent.decreaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName(), false);
+ IoTDBDataRegionSyncSink.class.getName(), false);
}
}
@@ -278,7 +277,7 @@ public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
} else {
LOGGER.warn("Unsupported batch type {}.", batch.getClass());
}
- batch.decreaseEventsReferenceCount(IoTDBDataRegionSyncConnector.class.getName(), true);
+ batch.decreaseEventsReferenceCount(IoTDBDataRegionSyncSink.class.getName(), true);
batch.onSuccess();
}
@@ -356,14 +355,14 @@ public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName())) {
+ IoTDBDataRegionSyncSink.class.getName())) {
return;
}
try {
doTransfer(pipeInsertNodeTabletInsertionEvent);
} finally {
pipeInsertNodeTabletInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName(), false);
+ IoTDBDataRegionSyncSink.class.getName(), false);
}
}
@@ -430,14 +429,14 @@ public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeRawTabletInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName())) {
+ IoTDBDataRegionSyncSink.class.getName())) {
return;
}
try {
doTransfer(pipeRawTabletInsertionEvent);
} finally {
pipeRawTabletInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName(), false);
+ IoTDBDataRegionSyncSink.class.getName(), false);
}
}
@@ -491,8 +490,7 @@ public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
private void doTransferWrapper(final PipeTsFileInsertionEvent pipeTsFileInsertionEvent)
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeTsFileInsertionEvent.increaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName())) {
+ if (!pipeTsFileInsertionEvent.increaseReferenceCount(IoTDBDataRegionSyncSink.class.getName())) {
return;
}
try {
@@ -509,7 +507,7 @@ public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
: null);
} finally {
pipeTsFileInsertionEvent.decreaseReferenceCount(
- IoTDBDataRegionSyncConnector.class.getName(), false);
+ IoTDBDataRegionSyncSink.class.getName(), false);
}
}
@@ -600,7 +598,7 @@ public class IoTDBDataRegionSyncConnector extends IoTDBDataNodeSyncConnector {
public TPipeTransferReq compressIfNeeded(final TPipeTransferReq req) throws IOException {
if (Objects.isNull(compressionTimer) && Objects.nonNull(attributeSortedString)) {
compressionTimer =
- PipeDataRegionConnectorMetrics.getInstance().getCompressionTimer(attributeSortedString);
+ PipeDataRegionSinkMetrics.getInstance().getCompressionTimer(attributeSortedString);
}
return super.compressIfNeeded(req);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBSchemaRegionConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBSchemaRegionSink.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBSchemaRegionConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBSchemaRegionSink.java
index 4c19afb026a..e1e1e7868d7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBSchemaRegionConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/thrift/sync/IoTDBSchemaRegionSink.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.thrift.sync;
+package org.apache.iotdb.db.pipe.sink.protocol.thrift.sync;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
-import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferPlanNodeReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferSchemaSnapshotPieceReq;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferSchemaSnapshotSealReq;
+import org.apache.iotdb.commons.pipe.sink.client.IoTDBSyncClient;
+import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent;
import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferPlanNodeReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferSchemaSnapshotPieceReq;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferSchemaSnapshotSealReq;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
import org.apache.iotdb.pipe.api.event.Event;
@@ -50,9 +50,9 @@ import java.util.Objects;
@TreeModel
@TableModel
-public class IoTDBSchemaRegionConnector extends IoTDBDataNodeSyncConnector {
+public class IoTDBSchemaRegionSink extends IoTDBDataNodeSyncSink {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSchemaRegionConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSchemaRegionSink.class);
@Override
public void transfer(final TabletInsertionEvent tabletInsertionEvent) throws Exception {
@@ -82,14 +82,14 @@ public class IoTDBSchemaRegionConnector extends IoTDBDataNodeSyncConnector {
final PipeSchemaRegionWritePlanEvent pipeSchemaRegionWritePlanEvent) throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeSchemaRegionWritePlanEvent.increaseReferenceCount(
- IoTDBDataNodeSyncConnector.class.getName())) {
+ IoTDBDataNodeSyncSink.class.getName())) {
return;
}
try {
doTransfer(pipeSchemaRegionWritePlanEvent);
} finally {
pipeSchemaRegionWritePlanEvent.decreaseReferenceCount(
- IoTDBDataNodeSyncConnector.class.getName(), false);
+ IoTDBDataNodeSyncSink.class.getName(), false);
}
}
@@ -139,14 +139,14 @@ public class IoTDBSchemaRegionConnector extends IoTDBDataNodeSyncConnector {
throws PipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
if (!pipeSchemaRegionSnapshotEvent.increaseReferenceCount(
- IoTDBSchemaRegionConnector.class.getName())) {
+ IoTDBSchemaRegionSink.class.getName())) {
return;
}
try {
doTransfer(pipeSchemaRegionSnapshotEvent);
} finally {
pipeSchemaRegionSnapshotEvent.decreaseReferenceCount(
- IoTDBSchemaRegionConnector.class.getName(), false);
+ IoTDBSchemaRegionSink.class.getName(), false);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/websocket/WebSocketConnectorServer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/websocket/WebSocketConnectorServer.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/websocket/WebSocketConnectorServer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/websocket/WebSocketConnectorServer.java
index 2db12e0a10e..940d6ff63db 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/websocket/WebSocketConnectorServer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/websocket/WebSocketConnectorServer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.websocket;
+package org.apache.iotdb.db.pipe.sink.protocol.websocket;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
@@ -73,14 +73,14 @@ public class WebSocketConnectorServer extends WebSocketServer {
return instance.get();
}
- public synchronized void register(WebSocketConnector connector) {
+ public synchronized void register(WebSocketSink connector) {
eventsWaitingForTransfer.putIfAbsent(
connector.getPipeName(),
new PriorityBlockingQueue<>(11, Comparator.comparing(o -> o.eventId)));
eventsWaitingForAck.putIfAbsent(connector.getPipeName(), new ConcurrentHashMap<>());
}
- public synchronized void unregister(WebSocketConnector connector) {
+ public synchronized void unregister(WebSocketSink connector) {
final String pipeName = connector.getPipeName();
// close invoked in validation stage
if (pipeName == null) {
@@ -291,7 +291,7 @@ public class WebSocketConnectorServer extends WebSocketServer {
}
}
- public void addEvent(Event event, WebSocketConnector connector) {
+ public void addEvent(Event event, WebSocketSink connector) {
final PriorityBlockingQueue<EventWaitingForTransfer> queue =
eventsWaitingForTransfer.get(connector.getPipeName());
@@ -363,7 +363,7 @@ public class WebSocketConnectorServer extends WebSocketServer {
private void transfer(String pipeName, EventWaitingForTransfer element) {
final Long eventId = element.eventId;
final Event event = element.event;
- final WebSocketConnector connector = element.connector;
+ final WebSocketSink connector = element.connector;
try {
ByteBuffer tabletBuffer;
@@ -434,10 +434,10 @@ public class WebSocketConnectorServer extends WebSocketServer {
private static class EventWaitingForTransfer {
private final Long eventId;
- private final WebSocketConnector connector;
+ private final WebSocketSink connector;
private final Event event;
- public EventWaitingForTransfer(Long eventId, WebSocketConnector connector, Event event) {
+ public EventWaitingForTransfer(Long eventId, WebSocketSink connector, Event event) {
this.eventId = eventId;
this.connector = connector;
this.event = event;
@@ -446,10 +446,10 @@ public class WebSocketConnectorServer extends WebSocketServer {
private static class EventWaitingForAck {
- private final WebSocketConnector connector;
+ private final WebSocketSink connector;
private final Event event;
- public EventWaitingForAck(WebSocketConnector connector, Event event) {
+ public EventWaitingForAck(WebSocketSink connector, Event event) {
this.connector = connector;
this.event = event;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/websocket/WebSocketConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/websocket/WebSocketSink.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/websocket/WebSocketConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/websocket/WebSocketSink.java
index 57c51af161e..4e593e673fd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/websocket/WebSocketConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/websocket/WebSocketSink.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.websocket;
+package org.apache.iotdb.db.pipe.sink.protocol.websocket;
-import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant;
import org.apache.iotdb.commons.pipe.event.EnrichedEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
@@ -41,9 +41,9 @@ import java.util.Arrays;
import java.util.Optional;
@TreeModel
-public class WebSocketConnector implements PipeConnector {
+public class WebSocketSink implements PipeConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(WebSocketConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(WebSocketSink.class);
private Integer port;
private WebSocketConnectorServer server;
@@ -56,9 +56,9 @@ public class WebSocketConnector implements PipeConnector {
port =
parameters.getIntOrDefault(
Arrays.asList(
- PipeConnectorConstant.CONNECTOR_WEBSOCKET_PORT_KEY,
- PipeConnectorConstant.SINK_WEBSOCKET_PORT_KEY),
- PipeConnectorConstant.CONNECTOR_WEBSOCKET_PORT_DEFAULT_VALUE);
+ PipeSinkConstant.CONNECTOR_WEBSOCKET_PORT_KEY,
+ PipeSinkConstant.SINK_WEBSOCKET_PORT_KEY),
+ PipeSinkConstant.CONNECTOR_WEBSOCKET_PORT_DEFAULT_VALUE);
server = WebSocketConnectorServer.getOrCreateInstance(port);
if (server.getPort() != port) {
@@ -121,7 +121,7 @@ public class WebSocketConnector implements PipeConnector {
}
if (!((EnrichedEvent) tabletInsertionEvent)
- .increaseReferenceCount(WebSocketConnector.class.getName())) {
+ .increaseReferenceCount(WebSocketSink.class.getName())) {
LOGGER.warn(
"WebsocketConnector failed to increase the reference count of the event. Ignore it. Current event: {}.",
tabletInsertionEvent);
@@ -168,7 +168,7 @@ public class WebSocketConnector implements PipeConnector {
public void commit(EnrichedEvent enrichedEvent) {
Optional.ofNullable(enrichedEvent)
- .ifPresent(event -> event.decreaseReferenceCount(WebSocketConnector.class.getName(), true));
+ .ifPresent(event -> event.decreaseReferenceCount(WebSocketSink.class.getName(), true));
}
public String getPipeName() {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/writeback/WriteBackConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/writeback/WriteBackConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java
index 18a4feb3a3f..4a14810be5a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/writeback/WriteBackConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.protocol.writeback;
+package org.apache.iotdb.db.pipe.sink.protocol.writeback;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.IoTDBConstant;
@@ -26,12 +26,12 @@ import org.apache.iotdb.commons.utils.StatusUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
-import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReqV2;
import org.apache.iotdb.db.pipe.event.common.statement.PipeStatementInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletBinaryReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2;
+import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReqV2;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.protocol.session.InternalClientSession;
import org.apache.iotdb.db.protocol.session.SessionManager;
@@ -76,25 +76,25 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_SKIP_IF_NO_PRIVILEGES;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USERNAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_SKIP_IF_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_USE_EVENT_USER_NAME_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_USE_EVENT_USER_NAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_USERNAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_USER_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_SKIP_IF_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_USE_EVENT_USER_NAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.WRITE_BACK_CONNECTOR_SKIP_IF_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_SKIP_IF_NO_PRIVILEGES;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USERNAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_IOTDB_USER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_SKIP_IF_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_USE_EVENT_USER_NAME_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.CONNECTOR_USE_EVENT_USER_NAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USERNAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_IOTDB_USER_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_SKIP_IF_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.SINK_USE_EVENT_USER_NAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant.WRITE_BACK_CONNECTOR_SKIP_IF_DEFAULT_VALUE;
import static org.apache.iotdb.db.exception.metadata.DatabaseNotSetException.DATABASE_NOT_SET;
import static org.apache.iotdb.db.utils.ErrorHandlingUtils.getRootCause;
@TreeModel
@TableModel
-public class WriteBackConnector implements PipeConnector {
+public class WriteBackSink implements PipeConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(WriteBackConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(WriteBackSink.class);
// Simulate the behavior of the client-to-server communication
// for correctly handling data insertion in IoTDBReceiverAgent#receive method
@@ -130,7 +130,7 @@ public class WriteBackConnector implements PipeConnector {
new InternalClientSession(
String.format(
"%s_%s_%s_%s",
- WriteBackConnector.class.getSimpleName(),
+ WriteBackSink.class.getSimpleName(),
environment.getPipeName(),
environment.getCreationTime(),
environment.getRegionId()));
@@ -149,7 +149,7 @@ public class WriteBackConnector implements PipeConnector {
new InternalClientSession(
String.format(
"%s_%s_%s_%s_tree",
- WriteBackConnector.class.getSimpleName(),
+ WriteBackSink.class.getSimpleName(),
environment.getPipeName(),
environment.getCreationTime(),
environment.getRegionId()));
@@ -215,15 +215,14 @@ public class WriteBackConnector implements PipeConnector {
final PipeInsertNodeTabletInsertionEvent pipeInsertNodeTabletInsertionEvent)
throws PipeException, WALPipeException, IOException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(
- WriteBackConnector.class.getName())) {
+ if (!pipeInsertNodeTabletInsertionEvent.increaseReferenceCount(WriteBackSink.class.getName())) {
return;
}
try {
doTransfer(pipeInsertNodeTabletInsertionEvent);
} finally {
pipeInsertNodeTabletInsertionEvent.decreaseReferenceCount(
- WriteBackConnector.class.getName(), false);
+ WriteBackSink.class.getName(), false);
}
}
@@ -267,13 +266,13 @@ public class WriteBackConnector implements PipeConnector {
private void doTransferWrapper(final PipeRawTabletInsertionEvent pipeRawTabletInsertionEvent)
throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeRawTabletInsertionEvent.increaseReferenceCount(WriteBackConnector.class.getName())) {
+ if (!pipeRawTabletInsertionEvent.increaseReferenceCount(WriteBackSink.class.getName())) {
return;
}
try {
doTransfer(pipeRawTabletInsertionEvent);
} finally {
- pipeRawTabletInsertionEvent.decreaseReferenceCount(WriteBackConnector.class.getName(), false);
+ pipeRawTabletInsertionEvent.decreaseReferenceCount(WriteBackSink.class.getName(), false);
}
}
@@ -319,13 +318,13 @@ public class WriteBackConnector implements PipeConnector {
private void doTransferWrapper(final PipeStatementInsertionEvent pipeStatementInsertionEvent)
throws PipeException {
// We increase the reference count for this event to determine if the event may be released.
- if (!pipeStatementInsertionEvent.increaseReferenceCount(WriteBackConnector.class.getName())) {
+ if (!pipeStatementInsertionEvent.increaseReferenceCount(WriteBackSink.class.getName())) {
return;
}
try {
doTransfer(pipeStatementInsertionEvent);
} finally {
- pipeStatementInsertionEvent.decreaseReferenceCount(WriteBackConnector.class.getName(), false);
+ pipeStatementInsertionEvent.decreaseReferenceCount(WriteBackSink.class.getName(), false);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilder.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilder.java
index 7f4d2db501c..01084aad0d0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.builder;
+package org.apache.iotdb.db.pipe.sink.util.builder;
import org.apache.iotdb.pipe.api.exception.PipeException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java
index 46b63f4e0f4..81d3a20e1a1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.builder;
+package org.apache.iotdb.db.pipe.sink.util.builder;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilder.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilder.java
index 824bc35eb4e..59fd35f4af0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.builder;
+package org.apache.iotdb.db.pipe.sink.util.builder;
import org.apache.commons.io.FileUtils;
import org.apache.tsfile.exception.write.WriteProcessException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilderV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java
index 7f43d57de45..a9654d062c0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTreeModelTsFileBuilderV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.builder;
+package org.apache.iotdb.db.pipe.sink.util.builder;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTsFileBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTsFileBuilder.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTsFileBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTsFileBuilder.java
index 873d55d2b7e..bdb6d47c41c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTsFileBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTsFileBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.builder;
+package org.apache.iotdb.db.pipe.sink.util.builder;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/cacher/LeaderCacheUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/cacher/LeaderCacheUtils.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/cacher/LeaderCacheUtils.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/cacher/LeaderCacheUtils.java
index 0151a83a9cf..754b406dcd7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/cacher/LeaderCacheUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/cacher/LeaderCacheUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.cacher;
+package org.apache.iotdb.db.pipe.sink.util.cacher;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTableModelTabletEventSorter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTableModelTabletEventSorter.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTableModelTabletEventSorter.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTableModelTabletEventSorter.java
index 83f118c971e..5735b51c6d0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTableModelTabletEventSorter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTableModelTabletEventSorter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.sorter;
+package org.apache.iotdb.db.pipe.sink.util.sorter;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTabletEventSorter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTabletEventSorter.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTabletEventSorter.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTabletEventSorter.java
index 3ea470de38a..20847173ffc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTabletEventSorter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTabletEventSorter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.sorter;
+package org.apache.iotdb.db.pipe.sink.util.sorter;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.Binary;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTreeModelTabletEventSorter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTreeModelTabletEventSorter.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTreeModelTabletEventSorter.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTreeModelTabletEventSorter.java
index a1b1923543b..c26f59220f9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/sorter/PipeTreeModelTabletEventSorter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/sorter/PipeTreeModelTabletEventSorter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.util.sorter;
+package org.apache.iotdb.db.pipe.sink.util.sorter;
import org.apache.tsfile.write.record.Tablet;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/DataRegionListeningFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/DataRegionListeningFilter.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/DataRegionListeningFilter.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/DataRegionListeningFilter.java
index 1f04679a4af..e2a15a64480 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/DataRegionListeningFilter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/DataRegionListeningFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion;
+package org.apache.iotdb.db.pipe.source.dataregion;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.exception.IllegalPathException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/DataRegionWatermarkInjector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/DataRegionWatermarkInjector.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/DataRegionWatermarkInjector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/DataRegionWatermarkInjector.java
index 612b1a9701f..625c6156a2b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/DataRegionWatermarkInjector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/DataRegionWatermarkInjector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion;
+package org.apache.iotdb.db.pipe.source.dataregion;
import org.apache.iotdb.db.pipe.event.common.watermark.PipeWatermarkEvent;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/IoTDBDataRegionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java
similarity index 82%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/IoTDBDataRegionExtractor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java
index aa89dd28d81..12bf5bc6db2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/IoTDBDataRegionExtractor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java
@@ -17,28 +17,28 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion;
+package org.apache.iotdb.db.pipe.source.dataregion;
import org.apache.iotdb.commons.consensus.DataRegionId;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern;
-import org.apache.iotdb.commons.pipe.extractor.IoTDBExtractor;
+import org.apache.iotdb.commons.pipe.source.IoTDBSource;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
-import org.apache.iotdb.db.pipe.extractor.dataregion.historical.PipeHistoricalDataRegionExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.historical.PipeHistoricalDataRegionTsFileAndDeletionExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionHeartbeatExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionHybridExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionLogExtractor;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionTsFileExtractor;
import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics;
import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics;
-import org.apache.iotdb.db.pipe.metric.source.PipeDataRegionExtractorMetrics;
+import org.apache.iotdb.db.pipe.metric.source.PipeDataRegionSourceMetrics;
+import org.apache.iotdb.db.pipe.source.dataregion.historical.PipeHistoricalDataRegionSource;
+import org.apache.iotdb.db.pipe.source.dataregion.historical.PipeHistoricalDataRegionTsFileAndDeletionSource;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionHeartbeatSource;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionHybridSource;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionLogSource;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionSource;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionTsFileSource;
import org.apache.iotdb.db.storageengine.StorageEngine;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
@@ -59,79 +59,79 @@ import java.util.Arrays;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_DATABASE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_DATABASE_NAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_QUERY_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_STREAMING_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_STREAMING_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_STRICT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODS_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATH_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATTERN_FORMAT_IOTDB_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATTERN_FORMAT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATTERN_FORMAT_PREFIX_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_PATTERN_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_LOOSE_RANGE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_BATCH_MODE_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_FILE_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_FORCED_LOG_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_HYBRID_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_LOG_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_REALTIME_MODE_STREAM_MODE_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_TABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_TABLE_NAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_WATERMARK_INTERVAL_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_WATERMARK_INTERVAL_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_DATABASE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_DATABASE_NAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_LOOSE_RANGE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_SNAPSHOT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_STREAMING_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_STRICT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODS_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_PATH_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_PATTERN_FORMAT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_PATTERN_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_REALTIME_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_REALTIME_LOOSE_RANGE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_REALTIME_MODE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_TABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_TABLE_NAME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_WATERMARK_INTERVAL_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant._EXTRACTOR_WATERMARK_INTERVAL_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant._SOURCE_WATERMARK_INTERVAL_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_DATABASE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_DATABASE_NAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_QUERY_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_SNAPSHOT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_STREAMING_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_STREAMING_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_STRICT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODS_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_PATH_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_PATTERN_FORMAT_IOTDB_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_PATTERN_FORMAT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_PATTERN_FORMAT_PREFIX_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_PATTERN_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_LOOSE_RANGE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_BATCH_MODE_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_FILE_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_FORCED_LOG_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_HYBRID_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_LOG_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_REALTIME_MODE_STREAM_MODE_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_TABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_TABLE_NAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_WATERMARK_INTERVAL_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_WATERMARK_INTERVAL_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_DATABASE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_DATABASE_NAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_LOOSE_RANGE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_SNAPSHOT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_STREAMING_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_STRICT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODS_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_PATH_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_PATTERN_FORMAT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_PATTERN_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_REALTIME_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_REALTIME_LOOSE_RANGE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_REALTIME_MODE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_TABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_TABLE_NAME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_WATERMARK_INTERVAL_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant._EXTRACTOR_WATERMARK_INTERVAL_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant._SOURCE_WATERMARK_INTERVAL_KEY;
@TreeModel
@TableModel
-public class IoTDBDataRegionExtractor extends IoTDBExtractor {
+public class IoTDBDataRegionSource extends IoTDBSource {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataRegionExtractor.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataRegionSource.class);
- private PipeHistoricalDataRegionExtractor historicalExtractor;
- private PipeRealtimeDataRegionExtractor realtimeExtractor;
+ private PipeHistoricalDataRegionSource historicalExtractor;
+ private PipeRealtimeDataRegionSource realtimeExtractor;
private DataRegionWatermarkInjector watermarkInjector;
@@ -154,16 +154,16 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
.getParameters()
.getBooleanOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTRACTOR_CAPTURE_TREE_KEY,
- PipeExtractorConstant.SOURCE_CAPTURE_TREE_KEY),
+ PipeSourceConstant.EXTRACTOR_CAPTURE_TREE_KEY,
+ PipeSourceConstant.SOURCE_CAPTURE_TREE_KEY),
isTreeDialect);
final boolean isCaptureTable =
validator
.getParameters()
.getBooleanOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTRACTOR_CAPTURE_TABLE_KEY,
- PipeExtractorConstant.SOURCE_CAPTURE_TABLE_KEY),
+ PipeSourceConstant.EXTRACTOR_CAPTURE_TABLE_KEY,
+ PipeSourceConstant.SOURCE_CAPTURE_TABLE_KEY),
!isTreeDialect);
if (!isCaptureTree && !isCaptureTable) {
throw new PipeParameterNotValidException(
@@ -175,9 +175,9 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
.getParameters()
.getBooleanOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTRACTOR_MODE_DOUBLE_LIVING_KEY,
- PipeExtractorConstant.SOURCE_MODE_DOUBLE_LIVING_KEY),
- PipeExtractorConstant.EXTRACTOR_MODE_DOUBLE_LIVING_DEFAULT_VALUE);
+ PipeSourceConstant.EXTRACTOR_MODE_DOUBLE_LIVING_KEY,
+ PipeSourceConstant.SOURCE_MODE_DOUBLE_LIVING_KEY),
+ PipeSourceConstant.EXTRACTOR_MODE_DOUBLE_LIVING_DEFAULT_VALUE);
final boolean isTreeModelDataAllowedToBeCaptured = isDoubleLiving || isCaptureTree;
final boolean isTableModelDataAllowedToBeCaptured = isDoubleLiving || isCaptureTable;
if (!isTreeModelDataAllowedToBeCaptured
@@ -425,7 +425,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
}
private void constructHistoricalExtractor() {
- historicalExtractor = new PipeHistoricalDataRegionTsFileAndDeletionExtractor();
+ historicalExtractor = new PipeHistoricalDataRegionTsFileAndDeletionSource();
}
private void constructRealtimeExtractor(final PipeParameters parameters) {
@@ -433,7 +433,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
if (!parameters.getBooleanOrDefault(
Arrays.asList(EXTRACTOR_REALTIME_ENABLE_KEY, SOURCE_REALTIME_ENABLE_KEY),
EXTRACTOR_REALTIME_ENABLE_DEFAULT_VALUE)) {
- realtimeExtractor = new PipeRealtimeDataRegionHeartbeatExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionHeartbeatSource();
LOGGER.info(
"Pipe: '{}' ('{}') is set to false, use heartbeat realtime extractor.",
EXTRACTOR_REALTIME_ENABLE_KEY,
@@ -458,7 +458,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
// Use heartbeat only extractor if enable snapshot mode
if (isSnapshotMode) {
- realtimeExtractor = new PipeRealtimeDataRegionHeartbeatExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionHeartbeatSource();
LOGGER.info("Pipe: snapshot mode is enabled, use heartbeat realtime extractor.");
return;
}
@@ -466,7 +466,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
// Use hybrid mode by default
if (!parameters.hasAnyAttributes(EXTRACTOR_MODE_STREAMING_KEY, SOURCE_MODE_STREAMING_KEY)
&& !parameters.hasAnyAttributes(EXTRACTOR_REALTIME_MODE_KEY, SOURCE_REALTIME_MODE_KEY)) {
- realtimeExtractor = new PipeRealtimeDataRegionHybridExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionHybridSource();
LOGGER.info(
"Pipe: '{}' ('{}') and '{}' ('{}') is not set, use hybrid mode by default.",
EXTRACTOR_MODE_STREAMING_KEY,
@@ -482,9 +482,9 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
Arrays.asList(EXTRACTOR_MODE_STREAMING_KEY, SOURCE_MODE_STREAMING_KEY),
EXTRACTOR_MODE_STREAMING_DEFAULT_VALUE);
if (isStreamingMode) {
- realtimeExtractor = new PipeRealtimeDataRegionHybridExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionHybridSource();
} else {
- realtimeExtractor = new PipeRealtimeDataRegionTsFileExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionTsFileSource();
}
return;
}
@@ -492,18 +492,18 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
switch (parameters.getStringByKeys(EXTRACTOR_REALTIME_MODE_KEY, SOURCE_REALTIME_MODE_KEY)) {
case EXTRACTOR_REALTIME_MODE_FILE_VALUE:
case EXTRACTOR_REALTIME_MODE_BATCH_MODE_VALUE:
- realtimeExtractor = new PipeRealtimeDataRegionTsFileExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionTsFileSource();
break;
case EXTRACTOR_REALTIME_MODE_HYBRID_VALUE:
case EXTRACTOR_REALTIME_MODE_LOG_VALUE:
case EXTRACTOR_REALTIME_MODE_STREAM_MODE_VALUE:
- realtimeExtractor = new PipeRealtimeDataRegionHybridExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionHybridSource();
break;
case EXTRACTOR_REALTIME_MODE_FORCED_LOG_VALUE:
- realtimeExtractor = new PipeRealtimeDataRegionLogExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionLogSource();
break;
default:
- realtimeExtractor = new PipeRealtimeDataRegionHybridExtractor();
+ realtimeExtractor = new PipeRealtimeDataRegionHybridSource();
if (LOGGER.isWarnEnabled()) {
LOGGER.warn(
"Pipe: Unsupported extractor realtime mode: {}, create a hybrid extractor.",
@@ -550,7 +550,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
}
// register metric after generating taskID
- PipeDataRegionExtractorMetrics.getInstance().register(this);
+ PipeDataRegionSourceMetrics.getInstance().register(this);
PipeTsFileToTabletsMetrics.getInstance().register(this);
PipeDataNodeSinglePipeMetrics.getInstance().register(this);
}
@@ -583,8 +583,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
dataRegionIdObject,
(dataRegion -> {
dataRegion.writeLock(
- String.format(
- "Pipe: starting %s", IoTDBDataRegionExtractor.class.getName()));
+ String.format("Pipe: starting %s", IoTDBDataRegionSource.class.getName()));
try {
startHistoricalExtractorAndRealtimeExtractor(exceptionHolder);
} finally {
@@ -658,11 +657,11 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
if (Objects.nonNull(event)) {
if (event instanceof TabletInsertionEvent) {
- PipeDataRegionExtractorMetrics.getInstance().markTabletEvent(taskID);
+ PipeDataRegionSourceMetrics.getInstance().markTabletEvent(taskID);
} else if (event instanceof TsFileInsertionEvent) {
- PipeDataRegionExtractorMetrics.getInstance().markTsFileEvent(taskID);
+ PipeDataRegionSourceMetrics.getInstance().markTsFileEvent(taskID);
} else if (event instanceof PipeHeartbeatEvent) {
- PipeDataRegionExtractorMetrics.getInstance().markPipeHeartbeatEvent(taskID);
+ PipeDataRegionSourceMetrics.getInstance().markPipeHeartbeatEvent(taskID);
}
}
@@ -678,7 +677,7 @@ public class IoTDBDataRegionExtractor extends IoTDBExtractor {
historicalExtractor.close();
realtimeExtractor.close();
if (Objects.nonNull(taskID)) {
- PipeDataRegionExtractorMetrics.getInstance().deregister(taskID);
+ PipeDataRegionSourceMetrics.getInstance().deregister(taskID);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionSource.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionExtractor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionSource.java
index 067c5143c78..c3aba613363 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionExtractor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionSource.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion.historical;
+package org.apache.iotdb.db.pipe.source.dataregion.historical;
import org.apache.iotdb.pipe.api.PipeExtractor;
-public interface PipeHistoricalDataRegionExtractor extends PipeExtractor {
+public interface PipeHistoricalDataRegionSource extends PipeExtractor {
boolean hasConsumedAll();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionExtractor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java
index b9d536db936..b14de1699ed 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionExtractor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion.historical;
+package org.apache.iotdb.db.pipe.source.dataregion.historical;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
@@ -29,7 +29,7 @@ import org.apache.iotdb.commons.consensus.index.impl.TimeWindowStateProgressInde
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
-import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant;
+import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant;
import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskExtractorRuntimeEnvironment;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
@@ -46,9 +46,9 @@ import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager;
import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.terminate.PipeTerminateEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
-import org.apache.iotdb.db.pipe.extractor.dataregion.DataRegionListeningFilter;
import org.apache.iotdb.db.pipe.processor.pipeconsensus.PipeConsensusProcessor;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
+import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter;
import org.apache.iotdb.db.storageengine.StorageEngine;
import org.apache.iotdb.db.storageengine.dataregion.DataRegion;
import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor;
@@ -82,41 +82,41 @@ import java.util.Queue;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_ALL_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_PATH_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_TIME_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_HISTORY_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_STRICT_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODE_STRICT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODS_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODS_ENABLE_DEFAULT_VALUE;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODS_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_MODS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.EXTRACTOR_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_END_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_LOOSE_RANGE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_HISTORY_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODE_STRICT_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODS_ENABLE_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_MODS_KEY;
-import static org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant.SOURCE_START_TIME_KEY;
-import static org.apache.iotdb.commons.pipe.extractor.IoTDBExtractor.getSkipIfNoPrivileges;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_ALL_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_PATH_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_LOOSE_RANGE_TIME_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_HISTORY_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_STRICT_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODE_STRICT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODS_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODS_ENABLE_DEFAULT_VALUE;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODS_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_MODS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.EXTRACTOR_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_END_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_LOOSE_RANGE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_HISTORY_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODE_STRICT_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODS_ENABLE_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_MODS_KEY;
+import static org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant.SOURCE_START_TIME_KEY;
+import static org.apache.iotdb.commons.pipe.source.IoTDBSource.getSkipIfNoPrivileges;
import static org.apache.tsfile.common.constant.TsFileConstant.PATH_ROOT;
import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR;
-public class PipeHistoricalDataRegionTsFileAndDeletionExtractor
- implements PipeHistoricalDataRegionExtractor {
+public class PipeHistoricalDataRegionTsFileAndDeletionSource
+ implements PipeHistoricalDataRegionSource {
private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeHistoricalDataRegionTsFileAndDeletionExtractor.class);
+ LoggerFactory.getLogger(PipeHistoricalDataRegionTsFileAndDeletionSource.class);
private static final Map<Integer, Long> DATA_REGION_ID_TO_PIPE_FLUSHED_TIME_MAP = new HashMap<>();
private static final long PIPE_MIN_FLUSH_INTERVAL_IN_MS = 2000;
@@ -356,19 +356,19 @@ public class PipeHistoricalDataRegionTsFileAndDeletionExtractor
userName =
parameters.getStringByKeys(
- PipeExtractorConstant.EXTRACTOR_IOTDB_USER_KEY,
- PipeExtractorConstant.SOURCE_IOTDB_USER_KEY,
- PipeExtractorConstant.EXTRACTOR_IOTDB_USERNAME_KEY,
- PipeExtractorConstant.SOURCE_IOTDB_USERNAME_KEY);
+ PipeSourceConstant.EXTRACTOR_IOTDB_USER_KEY,
+ PipeSourceConstant.SOURCE_IOTDB_USER_KEY,
+ PipeSourceConstant.EXTRACTOR_IOTDB_USERNAME_KEY,
+ PipeSourceConstant.SOURCE_IOTDB_USERNAME_KEY);
skipIfNoPrivileges = getSkipIfNoPrivileges(parameters);
isForwardingPipeRequests =
parameters.getBooleanOrDefault(
Arrays.asList(
- PipeExtractorConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_KEY,
- PipeExtractorConstant.SOURCE_FORWARDING_PIPE_REQUESTS_KEY),
- PipeExtractorConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_DEFAULT_VALUE);
+ PipeSourceConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_KEY,
+ PipeSourceConstant.SOURCE_FORWARDING_PIPE_REQUESTS_KEY),
+ PipeSourceConstant.EXTRACTOR_FORWARDING_PIPE_REQUESTS_DEFAULT_VALUE);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(
@@ -773,7 +773,7 @@ public class PipeHistoricalDataRegionTsFileAndDeletionExtractor
final PipeTerminateEvent terminateEvent =
new PipeTerminateEvent(pipeName, creationTime, pipeTaskMeta, dataRegionId);
if (!terminateEvent.increaseReferenceCount(
- PipeHistoricalDataRegionTsFileAndDeletionExtractor.class.getName())) {
+ PipeHistoricalDataRegionTsFileAndDeletionSource.class.getName())) {
LOGGER.warn(
"Pipe {}@{}: failed to increase reference count for terminate event, will resend it",
pipeName,
@@ -800,7 +800,7 @@ public class PipeHistoricalDataRegionTsFileAndDeletionExtractor
progressReportEvent.bindProgressIndex(resource.getMaxProgressIndex());
final boolean isReferenceCountIncreased =
progressReportEvent.increaseReferenceCount(
- PipeHistoricalDataRegionTsFileAndDeletionExtractor.class.getName());
+ PipeHistoricalDataRegionTsFileAndDeletionSource.class.getName());
if (!isReferenceCountIncreased) {
LOGGER.warn(
"The reference count of the event {} cannot be increased, skipping it.",
@@ -849,7 +849,7 @@ public class PipeHistoricalDataRegionTsFileAndDeletionExtractor
try {
final boolean isReferenceCountIncreased =
event.increaseReferenceCount(
- PipeHistoricalDataRegionTsFileAndDeletionExtractor.class.getName());
+ PipeHistoricalDataRegionTsFileAndDeletionSource.class.getName());
if (!isReferenceCountIncreased) {
LOGGER.warn(
"Pipe {}@{}: failed to increase reference count for historical tsfile event {}, will discard it",
@@ -893,7 +893,7 @@ public class PipeHistoricalDataRegionTsFileAndDeletionExtractor
final boolean isReferenceCountIncreased =
event.increaseReferenceCount(
- PipeHistoricalDataRegionTsFileAndDeletionExtractor.class.getName());
+ PipeHistoricalDataRegionTsFileAndDeletionSource.class.getName());
if (!isReferenceCountIncreased) {
LOGGER.warn(
"Pipe {}@{}: failed to increase reference count for historical deletion event {}, will discard it",
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionHeartbeatExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionHeartbeatSource.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionHeartbeatExtractor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionHeartbeatSource.java
index 1df62eecc92..4aac0617f3f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionHeartbeatExtractor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionHeartbeatSource.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion.realtime;
+package org.apache.iotdb.db.pipe.source.dataregion.realtime;
import org.apache.iotdb.commons.pipe.event.ProgressReportEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeEvent;
import org.apache.iotdb.pipe.api.event.Event;
-public class PipeRealtimeDataRegionHeartbeatExtractor extends PipeRealtimeDataRegionExtractor {
+public class PipeRealtimeDataRegionHeartbeatSource extends PipeRealtimeDataRegionSource {
@Override
public Event supply() {
@@ -41,7 +41,7 @@ public class PipeRealtimeDataRegionHeartbeatExtractor extends PipeRealtimeDataRe
}
realtimeEvent.decreaseReferenceCount(
- PipeRealtimeDataRegionHeartbeatExtractor.class.getName(), false);
+ PipeRealtimeDataRegionHeartbeatSource.class.getName(), false);
if (suppliedEvent != null) {
return suppliedEvent;
@@ -59,7 +59,7 @@ public class PipeRealtimeDataRegionHeartbeatExtractor extends PipeRealtimeDataRe
if (event.getEvent() instanceof PipeHeartbeatEvent) {
extractHeartbeat(event);
} else {
- event.decreaseReferenceCount(PipeRealtimeDataRegionHeartbeatExtractor.class.getName(), false);
+ event.decreaseReferenceCount(PipeRealtimeDataRegionHeartbeatSource.class.getName(), false);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionHybridExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionHybridSource.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionHybridExtractor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionHybridSource.java
index 516ab4d05ef..f28dada73ab 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionHybridExtractor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionHybridSource.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion.realtime;
+package org.apache.iotdb.db.pipe.source.dataregion.realtime;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException;
import org.apache.iotdb.commons.pipe.event.ProgressReportEvent;
@@ -26,11 +26,11 @@ import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeEvent;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.assigner.PipeTsFileEpochProgressIndexKeeper;
-import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.epoch.TsFileEpoch;
import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeRemainingEventAndTimeOperator;
import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics;
import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.assigner.PipeTsFileEpochProgressIndexKeeper;
+import org.apache.iotdb.db.pipe.source.dataregion.realtime.epoch.TsFileEpoch;
import org.apache.iotdb.pipe.api.event.Event;
import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent;
@@ -40,10 +40,10 @@ import org.slf4j.LoggerFactory;
import java.util.Optional;
-public class PipeRealtimeDataRegionHybridExtractor extends PipeRealtimeDataRegionExtractor {
+public class PipeRealtimeDataRegionHybridSource extends PipeRealtimeDataRegionSource {
private static final Logger LOGGER =
- LoggerFactory.getLogger(PipeRealtimeDataRegionHybridExtractor.class);
+ LoggerFactory.getLogger(PipeRealtimeDataRegionHybridSource.class);
@Override
protected void doExtract(final PipeRealtimeEvent event) {
@@ -104,7 +104,7 @@ public class PipeRealtimeDataRegionHybridExtractor extends PipeRealtimeDataRegio
switch (state) {
case USING_TSFILE:
// Ignore the tablet event.
- event.decreaseReferenceCount(PipeRealtimeDataRegionHybridExtractor.class.getName(), false);
+ event.decreaseReferenceCount(PipeRealtimeDataRegionHybridSource.class.getName(), false);
break;
case EMPTY:
case USING_TABLET:
@@ -127,15 +127,14 @@ public class PipeRealtimeDataRegionHybridExtractor extends PipeRealtimeDataRegio
.report(pipeTaskMeta, new PipeRuntimeNonCriticalException(errorMessage));
// Ignore the tablet event.
- event.decreaseReferenceCount(
- PipeRealtimeDataRegionHybridExtractor.class.getName(), false);
+ event.decreaseReferenceCount(PipeRealtimeDataRegionHybridSource.class.getName(), false);
}
break;
default:
throw new UnsupportedOperationException(
String.format(
"Unsupported state %s for hybrid realtime extractor %s",
- state, PipeRealtimeDataRegionHybridExtractor.class.getName()));
+ state, PipeRealtimeDataRegionHybridSource.class.getName()));
}
}
@@ -187,15 +186,14 @@ public class PipeRealtimeDataRegionHybridExtractor extends PipeRealtimeDataRegio
.report(pipeTaskMeta, new PipeRuntimeNonCriticalException(errorMessage));
// Ignore the tsfile event.
- event.decreaseReferenceCount(
- PipeRealtimeDataRegionHybridExtractor.class.getName(), false);
+ event.decreaseReferenceCount(PipeRealtimeDataRegionHybridSource.class.getName(), false);
}
break;
default:
throw new UnsupportedOperationException(
String.format(
"Unsupported state %s for hybrid realtime extractor %s",
- state, PipeRealtimeDataRegionHybridExtractor.class.getName()));
+ state, PipeRealtimeDataRegionHybridSource.class.getName()));
}
}
@@ -252,7 +250,7 @@ public class PipeRealtimeDataRegionHybridExtractor extends PipeRealtimeDataRegio
}
realtimeEvent.decreaseReferenceCount(
- PipeRealtimeDataRegionHybridExtractor.class.getName(), false);
+ PipeRealtimeDataRegionHybridSource.class.getName(), false);
if (suppliedEvent != null) {
maySkipIndex4Event(realtimeEvent);
@@ -267,7 +265,7 @@ public class PipeRealtimeDataRegionHybridExtractor extends PipeRealtimeDataRegio
}
private Event supplyTabletInsertion(final PipeRealtimeEvent event) {
- if (event.increaseReferenceCount(PipeRealtimeDataRegionHybridExtractor.class.getName())) {
+ if (event.increaseReferenceCount(PipeRealtimeDataRegionHybridSource.class.getName())) {
return event.getEvent();
} else {
// If the event's reference count can not be increased, it means the data represented by
@@ -283,7 +281,7 @@ public class PipeRealtimeDataRegionHybridExtractor extends PipeRealtimeDataRegio
}
private Event supplyTsFileInsertion(final PipeRealtimeEvent event) {
- if (event.increaseReferenceCount(PipeRealtimeDataRegionHybridExtractor.class.getName())) {
+ if (event.increaseReferenceCount(PipeRealtimeDataRegionHybridSource.class.getName())) {
return event.getEvent();
} else {
// If the event's reference count can not be increased, it means the data represented by
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionLogExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionLogSource.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionLogExtractor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionLogSource.java
index 3d2a39128cf..def6649b943 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionLogExtractor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionLogSource.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.extractor.dataregion.realtime;
+package org.apache.iotdb.db.pipe.source.dataregion.realtime;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException;
import org.apache.iotdb.commons.pipe.event.ProgressReportEvent;
@@ -26,7 +26,7 @@ import org.apache.iotdb.db.pipe.event.common.deletion.PipeDeleteDataNodeEvent;
import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeEvent;
... 5730 lines suppressed ...