From 58d6645865abfc9a06567fabb75ac092a74574ad Mon Sep 17 00:00:00 2001 From: Steve Yurong Su Date: Mon, 23 Sep 2024 17:16:54 +0800 Subject: [PATCH] Pipe: Refactor pipe related packages (#13578) (#13584) (cherry picked from commit 7ceddaee37d167ab6f371ee469ddd858ca5b3157) --- .../it/autocreate/IoTDBPipeProtocolIT.java | 2 +- .../pipe/plugin/CreatePipePluginPlan.java | 2 +- .../runtime/PipeHandleMetaChangePlan.java | 2 +- .../write/pipe/task/AlterPipePlanV2.java | 4 +- .../write/pipe/task/CreatePipePlanV2.java | 4 +- .../write/pipe/task/SetPipeStatusPlanV2.java | 2 +- .../pipe/plugin/PipePluginTableResp.java | 2 +- .../response/pipe/task/PipeTableResp.java | 10 ++-- .../confignode/manager/ProcedureManager.java | 2 +- .../plugin/PipeConfigNodePluginAgent.java | 8 +-- .../PipeConfigRegionConnectorConstructor.java | 6 +-- .../PipeConfigRegionExtractorConstructor.java | 6 +-- .../PipeConfigRegionProcessorConstructor.java | 6 +-- .../runtime/PipeConfigNodeRuntimeAgent.java | 2 +- .../task}/PipeConfigNodeSubtask.java | 10 ++-- .../task}/PipeConfigNodeSubtaskExecutor.java | 4 +- .../{ => agent}/task/PipeConfigNodeTask.java | 4 +- .../agent/task/PipeConfigNodeTaskAgent.java | 11 ++-- .../task/PipeConfigNodeTaskBuilder.java | 12 ++--- .../task/PipeConfigNodeTaskStage.java | 8 ++- .../plugin/PipePluginCoordinator.java | 2 +- .../runtime/heartbeat/PipeHeartbeat.java | 4 +- .../heartbeat/PipeHeartbeatParser.java | 12 ++--- .../event/PipeConfigRegionSnapshotEvent.java | 4 +- .../event/PipeConfigRegionWritePlanEvent.java | 4 +- .../extractor/IoTDBConfigRegionExtractor.java | 2 +- ...ConfigPhysicalPlanPatternParseVisitor.java | 2 +- .../PipeConfigNodeRemainingTimeMetrics.java | 2 +- .../PipeConfigNodeRemainingTimeOperator.java | 2 +- .../PipeConfigRegionConnectorMetrics.java | 2 +- .../pipe/metric/PipeTemporaryMetaMetrics.java | 4 +- .../protocol/IoTDBConfigNodeReceiver.java | 4 +- ...ConfigNodeCopiedFileDirStartupCleaner.java | 2 +- .../PipeConfigNodeResourceManager.java | 3 +- ...PipeConfigNodeSnapshotResourceManager.java | 4 +- .../confignode/persistence/pipe/PipeInfo.java | 4 +- .../persistence/pipe/PipePluginInfo.java | 12 ++--- .../persistence/pipe/PipeTaskInfo.java | 20 ++++---- .../procedure/env/ConfigNodeProcedureEnv.java | 2 +- .../pipe/AbstractOperatePipeProcedureV2.java | 2 +- .../plugin/CreatePipePluginProcedure.java | 2 +- .../PipeHandleMetaChangeProcedure.java | 2 +- .../pipe/runtime/PipeMetaSyncProcedure.java | 2 +- .../impl/pipe/task/AlterPipeProcedureV2.java | 10 ++-- .../impl/pipe/task/CreatePipeProcedureV2.java | 10 ++-- .../impl/pipe/task/StartPipeProcedureV2.java | 2 +- .../impl/pipe/task/StopPipeProcedureV2.java | 2 +- ...ctOperateSubscriptionAndPipeProcedure.java | 2 +- .../CreateSubscriptionProcedure.java | 2 +- .../DropSubscriptionProcedure.java | 2 +- .../request/ConfigPhysicalPlanSerDeTest.java | 19 +++---- .../pipe/PipePluginTableRespTest.java | 6 +-- .../response/pipe/PipeTableRespTest.java | 8 +-- .../PipeConfigNodeSubtaskExecutorTest.java | 12 +++-- .../IoTDBConfigRegionConnectorTest.java | 2 +- ...igPhysicalPlanPatternParseVisitorTest.java | 2 +- .../confignode/persistence/PipeInfoTest.java | 10 ++-- .../plugin/CreatePipePluginProcedureTest.java | 2 +- .../consensus/config/PipeConsensusConfig.java | 2 +- .../iotdb/consensus/pipe/PipeConsensus.java | 2 +- .../pipe/PipeConsensusServerImpl.java | 2 +- .../consensuspipe/ConsensusPipeManager.java | 2 +- .../pipe/consensuspipe/ConsensusPipeName.java | 2 +- .../consensuspipe/ConsensusPipeSelector.java | 2 +- .../db/consensus/DataRegionConsensusImpl.java | 2 +- .../agent/plugin/PipeDataNodePluginAgent.java | 10 ++-- .../PipeDataRegionConnectorConstructor.java | 8 +-- .../PipeDataRegionExtractorConstructor.java | 8 +-- .../dataregion/PipeDataRegionPluginAgent.java | 10 ++-- .../PipeDataRegionProcessorConstructor.java | 10 ++-- .../PipeSchemaRegionConnectorConstructor.java | 6 +-- .../PipeSchemaRegionExtractorConstructor.java | 6 +-- .../PipeSchemaRegionPluginAgent.java | 8 +-- .../PipeSchemaRegionProcessorConstructor.java | 6 +-- .../pipe/agent/runtime/PipeAgentLauncher.java | 8 +-- .../runtime/PipeDataNodeRuntimeAgent.java | 3 +- .../PipeSchemaRegionListenerManager.java | 2 +- .../runtime}/SimpleProgressIndexAssigner.java | 2 +- .../{ => agent}/task/PipeDataNodeTask.java | 6 +-- .../agent/task/PipeDataNodeTaskAgent.java | 17 +++---- .../task/builder/PipeDataNodeBuilder.java | 12 ++--- .../task/builder/PipeDataNodeTaskBuilder.java | 22 ++++---- .../task/connection/EnrichedDeque.java | 2 +- .../task/connection/PipeEventCollector.java | 8 +-- .../PipeConnectorSubtaskExecutor.java | 4 +- .../PipeProcessorSubtaskExecutor.java | 4 +- .../execution/PipeSubtaskExecutorManager.java | 4 +- .../task/stage/PipeTaskConnectorStage.java | 10 ++-- .../task/stage/PipeTaskExtractorStage.java | 8 +-- .../task/stage/PipeTaskProcessorStage.java | 18 +++---- .../connector/PipeConnectorSubtask.java | 6 +-- .../PipeConnectorSubtaskLifeCycle.java | 6 +-- .../PipeConnectorSubtaskManager.java | 10 ++-- .../PipeRealtimePriorityBlockingQueue.java | 8 +-- .../processor/PipeProcessorSubtask.java | 12 ++--- .../processor/PipeProcessorSubtaskWorker.java | 2 +- .../PipeProcessorSubtaskWorkerManager.java | 2 +- .../PipeConsensusAsyncConnector.java | 2 +- .../async/IoTDBDataRegionAsyncConnector.java | 2 +- .../PipeConsensusSubtaskExecutor.java | 2 +- .../pipe/event/UserDefinedEnrichedEvent.java | 4 +- .../common/heartbeat/PipeHeartbeatEvent.java | 6 +-- .../event/common/row/PipeRowCollector.java | 2 +- .../schema/PipeSchemaRegionSnapshotEvent.java | 4 +- .../PipeSchemaRegionWritePlanEvent.java | 4 +- .../PipeInsertNodeTabletInsertionEvent.java | 4 +- .../tablet/PipeRawTabletInsertionEvent.java | 4 +- .../tablet/TabletInsertionDataContainer.java | 4 +- .../common/terminate/PipeTerminateEvent.java | 6 +-- .../tsfile/PipeTsFileInsertionEvent.java | 4 +- .../tsfile/TsFileInsertionPointCounter.java | 2 +- .../TsFileInsertionDataContainer.java | 4 +- .../TsFileInsertionDataContainerProvider.java | 6 +-- .../TsFileInsertionQueryDataContainer.java | 4 +- .../TsFileInsertionScanDataContainer.java | 4 +- .../event/realtime/PipeRealtimeEvent.java | 4 +- .../dataregion/DataRegionListeningFilter.java | 2 +- .../dataregion/IoTDBDataRegionExtractor.java | 4 +- ...peHistoricalDataRegionTsFileExtractor.java | 4 +- .../PipeRealtimeDataRegionExtractor.java | 6 +-- .../assigner/PipeDataRegionAssigner.java | 4 +- .../matcher}/CachedSchemaPatternMatcher.java | 4 +- .../matcher}/PipeDataRegionMatcher.java | 2 +- .../PipePlanPatternParseVisitor.java | 2 +- ...eDataNodeRemainingEventAndTimeMetrics.java | 6 +-- ...DataNodeRemainingEventAndTimeOperator.java | 4 +- .../PipeDataRegionConnectorMetrics.java | 2 +- .../db/pipe/metric/PipeProcessorMetrics.java | 2 +- .../PipeSchemaRegionConnectorMetrics.java | 2 +- .../aggregate/AggregateProcessor.java | 2 +- .../plugin/TwoStageCountProcessor.java | 2 +- .../thrift/IoTDBDataNodeReceiver.java | 4 +- ...tementDataTypeConvertExecutionVisitor.java | 2 +- .../PipeStatementPatternParseVisitor.java | 2 +- ...HardlinkOrCopiedFileDirStartupCleaner.java | 2 +- .../resource/PipeDataNodeResourceManager.java | 2 +- .../PipeDataNodeSnapshotResourceManager.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 4 +- .../executor/ClusterConfigTaskExecutor.java | 6 +-- .../config/metadata/ShowPipePluginsTask.java | 4 +- .../org/apache/iotdb/db/service/DataNode.java | 2 +- .../service/ResourcesInformationHolder.java | 2 +- .../SubscriptionBlockingPendingQueue.java | 2 +- .../broker/SubscriptionBroker.java | 2 +- ...FileDeduplicationBlockingPendingQueue.java | 2 +- .../SubscriptionSubtaskExecutor.java | 4 +- .../stage/SubscriptionTaskConnectorStage.java | 6 +-- .../subtask/SubscriptionConnectorSubtask.java | 4 +- ...SubscriptionConnectorSubtaskLifeCycle.java | 8 +-- .../SubscriptionConnectorSubtaskManager.java | 16 +++--- .../plugin/PipeDataNodePluginAgentTest.java | 8 +-- .../PipeConnectorSubtaskExecutorTest.java | 7 +-- .../PipeProcessorSubtaskExecutorTest.java | 9 ++-- .../task}/PipeSubtaskExecutorTest.java | 6 +-- .../db/pipe/connector/PipeConnectorTest.java | 2 +- .../PipeStatementPatternParseVisitorTest.java | 2 +- .../event/PipeTabletInsertionEventTest.java | 2 +- .../TsFileInsertionDataContainerTest.java | 6 +-- .../PipePlanPatternParseVisitorTest.java | 2 +- .../CachedSchemaPatternMatcherTest.java | 5 +- .../db/pipe/pattern/IoTDBPipePatternTest.java | 2 +- .../pipe/pattern/PrefixPipePatternTest.java | 2 +- ...PipeRuntimeConnectorCriticalException.java | 2 +- .../pipe/PipeRuntimeCriticalException.java | 2 +- .../pipe/PipeRuntimeExceptionType.java | 2 +- .../pipe/PipeRuntimeNonCriticalException.java | 2 +- ...peRuntimeOutOfMemoryCriticalException.java | 2 +- .../pipe/agent/plugin/PipePluginAgent.java | 5 +- .../plugin/builtin/BuiltinPipePlugin.java | 50 +++++++++---------- .../connector/PlaceholderConnector.java | 2 +- .../donothing/DoNothingConnector.java | 2 +- .../iotdb/airgap/IoTDBAirGapConnector.java | 4 +- .../PipeConsensusAsyncConnector.java | 4 +- .../thrift/IoTDBLegacyPipeConnector.java | 4 +- .../thrift/IoTDBThriftAsyncConnector.java | 2 +- .../iotdb/thrift/IoTDBThriftConnector.java | 4 +- .../iotdb/thrift/IoTDBThriftSslConnector.java | 4 +- .../thrift/IoTDBThriftSyncConnector.java | 2 +- .../connector/opcua/OpcUaConnector.java | 4 +- .../websocket/WebSocketConnector.java | 4 +- .../writeback/WriteBackConnector.java | 4 +- .../donothing/DoNothingExtractor.java | 2 +- .../extractor/iotdb/IoTDBExtractor.java | 2 +- .../processor/PlaceHolderProcessor.java | 2 +- .../aggregate/AggregateProcessor.java | 4 +- .../StandardStatisticsProcessor.java | 4 +- .../aggregate/TumblingWindowingProcessor.java | 4 +- .../donothing/DoNothingProcessor.java | 2 +- .../ChangingValueSamplingProcessor.java | 4 +- ...SwingingDoorTrendingSamplingProcessor.java | 4 +- .../TumblingTimeSamplingProcessor.java | 4 +- .../pipeconsensus/PipeConsensusProcessor.java | 4 +- .../throwing/ThrowingExceptionProcessor.java | 2 +- .../twostage/TwoStageCountProcessor.java | 4 +- .../PipeConnectorConstructor.java | 6 +-- .../PipeExtractorConstructor.java | 6 +-- .../PipePluginConstructor.java | 8 +-- .../PipeProcessorConstructor.java | 6 +-- .../meta/ConfigNodePipePluginMetaKeeper.java | 2 +- .../meta/DataNodePipePluginMetaKeeper.java | 2 +- .../plugin/meta/PipePluginMeta.java | 2 +- .../plugin/meta/PipePluginMetaKeeper.java | 4 +- .../plugin/service/PipePluginClassLoader.java | 2 +- .../service/PipePluginClassLoaderManager.java | 2 +- .../service/PipePluginExecutableManager.java | 4 +- .../pipe/{ => agent}/task/PipeTask.java | 2 +- .../pipe/agent/task/PipeTaskAgent.java | 14 +++--- .../{ => agent}/task/PipeTaskManager.java | 4 +- .../task/connection/BlockingPendingQueue.java | 2 +- .../BoundedBlockingPendingQueue.java | 2 +- .../task/connection}/EventSupplier.java | 2 +- .../UnboundedBlockingPendingQueue.java | 2 +- .../task/execution}/PipeSubtaskExecutor.java | 5 +- .../task/execution}/PipeSubtaskScheduler.java | 3 +- .../pipe/{ => agent}/task/meta/PipeMeta.java | 2 +- .../{ => agent}/task/meta/PipeMetaKeeper.java | 2 +- .../task/meta/PipeRuntimeMeta.java | 2 +- .../task/meta/PipeRuntimeMetaVersion.java | 2 +- .../{ => agent}/task/meta/PipeStaticMeta.java | 2 +- .../{ => agent}/task/meta/PipeStatus.java | 2 +- .../{ => agent}/task/meta/PipeTaskMeta.java | 2 +- .../task/meta/PipeTemporaryMeta.java | 2 +- .../pipe/{ => agent}/task/meta/PipeType.java | 2 +- .../task}/progress/CommitterKey.java | 2 +- .../progress/PipeEventCommitManager.java | 2 +- .../task}/progress/PipeEventCommitter.java | 2 +- .../{ => agent}/task/stage/PipeTaskStage.java | 4 +- .../subtask/PipeAbstractConnectorSubtask.java | 4 +- .../task/subtask/PipeReportableSubtask.java | 2 +- .../{ => agent}/task/subtask/PipeSubtask.java | 4 +- .../PipeTaskExtractorRuntimeEnvironment.java | 2 +- .../PipeTaskProcessorRuntimeEnvironment.java | 2 +- .../connector/protocol/IoTDBConnector.java | 2 +- .../protocol/IoTDBSslSyncConnector.java | 6 +-- .../pattern/IoTDBPipePattern.java | 2 +- .../pattern/PipePattern.java | 2 +- .../pattern/PrefixPipePattern.java | 2 +- .../listening/AbstractPipeListeningQueue.java | 2 +- .../commons/pipe/event/EnrichedEvent.java | 8 +-- .../commons/pipe/event/PipeSnapshotEvent.java | 6 +-- .../pipe/event/PipeWritePlanEvent.java | 4 +- .../pipe/event/ProgressReportEvent.java | 4 +- .../pipe/extractor/IoTDBExtractor.java | 2 +- .../IoTDBNonDataRegionExtractor.java | 4 +- .../pipe/metric/PipeEventCommitMetrics.java | 2 +- .../PipeReceiverStatusHandler.java | 4 +- .../PipeSnapshotResourceManager.java | 2 +- .../pipe/PipeRuntimeExceptionTest.java | 2 +- .../plugin/builtin/BuiltinPipePluginTest.java | 10 ++-- .../pipe/plugin/meta/PipePluginMetaTest.java | 4 +- .../task/{meta => }/PipeMetaDeSerTest.java | 7 ++- 251 files changed, 578 insertions(+), 574 deletions(-) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/{execution => agent/task}/PipeConfigNodeSubtask.java (96%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/{execution => agent/task}/PipeConfigNodeSubtaskExecutor.java (92%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/{ => agent}/task/PipeConfigNodeTask.java (91%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/{ => agent}/task/PipeConfigNodeTaskBuilder.java (87%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/{ => agent}/task/PipeConfigNodeTaskStage.java (86%) rename iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/{snapshot => }/PipeConfigNodeSnapshotResourceManager.java (89%) rename iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/{execution => agent}/PipeConfigNodeSubtaskExecutorTest.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{progress => agent/runtime}/SimpleProgressIndexAssigner.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/PipeDataNodeTask.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/builder/PipeDataNodeBuilder.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/builder/PipeDataNodeTaskBuilder.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/connection/EnrichedDeque.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/connection/PipeEventCollector.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent/task}/execution/PipeConnectorSubtaskExecutor.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent/task}/execution/PipeProcessorSubtaskExecutor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent/task}/execution/PipeSubtaskExecutorManager.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/stage/PipeTaskConnectorStage.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/stage/PipeTaskExtractorStage.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/stage/PipeTaskProcessorStage.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/subtask/connector/PipeConnectorSubtask.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/subtask/connector/PipeConnectorSubtaskManager.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/subtask/processor/PipeProcessorSubtask.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/subtask/processor/PipeProcessorSubtaskWorker.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{ => agent}/task/subtask/processor/PipeProcessorSubtaskWorkerManager.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{pattern => extractor/dataregion/realtime/matcher}/CachedSchemaPatternMatcher.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/{pattern => extractor/dataregion/realtime/matcher}/PipeDataRegionMatcher.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/{execution/executor => task/execution}/SubscriptionSubtaskExecutor.java (89%) rename iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/{execution => agent/task}/PipeConnectorSubtaskExecutorTest.java (83%) rename iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/{execution => agent/task}/PipeProcessorSubtaskExecutorTest.java (80%) rename iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/{execution => agent/task}/PipeSubtaskExecutorTest.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/BuiltinPipePlugin.java (74%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/PlaceholderConnector.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/donothing/DoNothingConnector.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/iotdb/airgap/IoTDBAirGapConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/iotdb/consensus/PipeConsensusAsyncConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/iotdb/thrift/IoTDBLegacyPipeConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/iotdb/thrift/IoTDBThriftAsyncConnector.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/iotdb/thrift/IoTDBThriftConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSslConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSyncConnector.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/opcua/OpcUaConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/websocket/WebSocketConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/connector/writeback/WriteBackConnector.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/extractor/donothing/DoNothingExtractor.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/extractor/iotdb/IoTDBExtractor.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/PlaceHolderProcessor.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/aggregate/AggregateProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/aggregate/StandardStatisticsProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/aggregate/TumblingWindowingProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/donothing/DoNothingProcessor.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/downsampling/ChangingValueSamplingProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/downsampling/SwingingDoorTrendingSamplingProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/downsampling/TumblingTimeSamplingProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/pipeconsensus/PipeConsensusProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/throwing/ThrowingExceptionProcessor.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/builtin/processor/twostage/TwoStageCountProcessor.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/{ => constructor}/PipeConnectorConstructor.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/{ => constructor}/PipeExtractorConstructor.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/{ => constructor}/PipePluginConstructor.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/{ => constructor}/PipeProcessorConstructor.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/meta/ConfigNodePipePluginMetaKeeper.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/meta/DataNodePipePluginMetaKeeper.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/meta/PipePluginMeta.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/meta/PipePluginMetaKeeper.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/service/PipePluginClassLoader.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/service/PipePluginClassLoaderManager.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/plugin/service/PipePluginExecutableManager.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/PipeTask.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/PipeTaskManager.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/connection/BlockingPendingQueue.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/connection/BoundedBlockingPendingQueue.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{task => agent/task/connection}/EventSupplier.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/connection/UnboundedBlockingPendingQueue.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{execution/executor => agent/task/execution}/PipeSubtaskExecutor.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{execution/scheduler => agent/task/execution}/PipeSubtaskScheduler.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeMeta.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeMetaKeeper.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeRuntimeMeta.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeRuntimeMetaVersion.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeStaticMeta.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeStatus.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeTaskMeta.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeTemporaryMeta.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/meta/PipeType.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent/task}/progress/CommitterKey.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent/task}/progress/PipeEventCommitManager.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent/task}/progress/PipeEventCommitter.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/stage/PipeTaskStage.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/subtask/PipeAbstractConnectorSubtask.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/subtask/PipeReportableSubtask.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => agent}/task/subtask/PipeSubtask.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => datastructure}/pattern/IoTDBPipePattern.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => datastructure}/pattern/PipePattern.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{ => datastructure}/pattern/PrefixPipePattern.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/{connector => receiver}/PipeReceiverStatusHandler.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/resource/{ => snapshot}/PipeSnapshotResourceManager.java (99%) rename iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/task/{meta => }/PipeMetaDeSerTest.java (94%) diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java index 373e9d4dbea7..328e1af5fd77 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.it.utils.TestUtils; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/plugin/CreatePipePluginPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/plugin/CreatePipePluginPlan.java index ea4c986142be..29cc394ca1e6 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/plugin/CreatePipePluginPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/plugin/CreatePipePluginPlan.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.consensus.request.write.pipe.plugin; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/runtime/PipeHandleMetaChangePlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/runtime/PipeHandleMetaChangePlan.java index b08905880b9e..07d70e92db4d 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/runtime/PipeHandleMetaChangePlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/runtime/PipeHandleMetaChangePlan.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.consensus.request.write.pipe.runtime; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/AlterPipePlanV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/AlterPipePlanV2.java index af4caffe0092..e38021899179 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/AlterPipePlanV2.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/AlterPipePlanV2.java @@ -19,8 +19,8 @@ package org.apache.iotdb.confignode.consensus.request.write.pipe.task; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/CreatePipePlanV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/CreatePipePlanV2.java index 11dd2ae7c9c9..006d0523130f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/CreatePipePlanV2.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/CreatePipePlanV2.java @@ -19,8 +19,8 @@ package org.apache.iotdb.confignode.consensus.request.write.pipe.task; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/SetPipeStatusPlanV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/SetPipeStatusPlanV2.java index b3cdb043a338..7f417702dd38 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/SetPipeStatusPlanV2.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/task/SetPipeStatusPlanV2.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.consensus.request.write.pipe.task; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/plugin/PipePluginTableResp.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/plugin/PipePluginTableResp.java index 62532350c0ae..44f6f1d779fc 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/plugin/PipePluginTableResp.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/plugin/PipePluginTableResp.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.consensus.response.pipe.plugin; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.confignode.rpc.thrift.TGetPipePluginTableResp; import org.apache.iotdb.consensus.common.DataSet; 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 4cbe230a977f..ef2f9bea26b5 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 @@ -22,11 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTemporaryMeta; +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; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTemporaryMeta; import org.apache.iotdb.confignode.manager.pipe.extractor.ConfigRegionListeningFilter; import org.apache.iotdb.confignode.rpc.thrift.TGetAllPipeInfoResp; import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java index fccdb66127ea..f81dda103a06 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java @@ -32,7 +32,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.trigger.TriggerInformation; 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 8e748c38b684..7593dbd79b75 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.confignode.manager.pipe.agent.plugin; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeConnectorConstructor; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeExtractorConstructor; import org.apache.iotdb.commons.pipe.agent.plugin.PipePluginAgent; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeProcessorConstructor; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; +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.meta.PipePluginMetaKeeper; public class PipeConfigNodePluginAgent extends PipePluginAgent { 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/PipeConfigRegionConnectorConstructor.java index 3bcd1d6b7498..74a34e503be2 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/PipeConfigRegionConnectorConstructor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.confignode.manager.pipe.agent.plugin; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeConnectorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.donothing.DoNothingConnector; +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.pipe.api.PipeConnector; 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/PipeConfigRegionExtractorConstructor.java index beae07642fd4..e4e6fb0caa7f 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/PipeConfigRegionExtractorConstructor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.confignode.manager.pipe.agent.plugin; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeExtractorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.donothing.DoNothingExtractor; +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.pipe.api.PipeExtractor; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionProcessorConstructor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionProcessorConstructor.java index 1f9f84ffdefc..8ea9576b7976 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionProcessorConstructor.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/plugin/PipeConfigRegionProcessorConstructor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.confignode.manager.pipe.agent.plugin; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeProcessorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.donothing.DoNothingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.donothing.DoNothingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeProcessorConstructor; import org.apache.iotdb.pipe.api.PipeProcessor; class PipeConfigRegionProcessorConstructor extends PipeProcessorConstructor { 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 160c710ea4d2..c3262c681818 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtask.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtask.java similarity index 96% rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtask.java rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtask.java index cfd16480f62b..1a645388947f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtask.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtask.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.execution; +package org.apache.iotdb.confignode.manager.pipe.agent.task; 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.config.constant.PipeProcessorConstant; import org.apache.iotdb.commons.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskExtractorRuntimeEnvironment; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskRuntimeEnvironment; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.ProgressReportEvent; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.subtask.PipeAbstractConnectorSubtask; 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.PipeConfigRegionConnectorMetrics; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtaskExecutor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtaskExecutor.java similarity index 92% rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtaskExecutor.java rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtaskExecutor.java index 6041c5bf82da..9aea3edfa38b 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtaskExecutor.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeSubtaskExecutor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.execution; +package org.apache.iotdb.confignode.manager.pipe.agent.task; import org.apache.iotdb.commons.concurrent.ThreadName; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskExecutor; import org.apache.iotdb.commons.utils.TestOnly; public class PipeConfigNodeSubtaskExecutor extends PipeSubtaskExecutor { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTask.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTask.java similarity index 91% rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTask.java rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTask.java index 7eea3b8482e2..10e2c79df09f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTask.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTask.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.task; +package org.apache.iotdb.confignode.manager.pipe.agent.task; -import org.apache.iotdb.commons.pipe.task.PipeTask; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; public class PipeConfigNodeTask implements PipeTask { 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 4536789daf61..d5204b1c99b9 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 @@ -22,21 +22,18 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MetaProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; +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.PipeConfig; -import org.apache.iotdb.commons.pipe.task.PipeTask; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; 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.PipeConfigNodeRemainingTimeMetrics; import org.apache.iotdb.confignode.manager.pipe.metric.PipeConfigRegionExtractorMetrics; import org.apache.iotdb.confignode.manager.pipe.resource.PipeConfigNodeResourceManager; -import org.apache.iotdb.confignode.manager.pipe.task.PipeConfigNodeTask; -import org.apache.iotdb.confignode.manager.pipe.task.PipeConfigNodeTaskBuilder; -import org.apache.iotdb.confignode.manager.pipe.task.PipeConfigNodeTaskStage; import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatReq; import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatResp; import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaRespExceptionMessage; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskBuilder.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskBuilder.java similarity index 87% rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskBuilder.java rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskBuilder.java index 31f5aa1ea9b5..6a6b6f34d3aa 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskBuilder.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskBuilder.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.task; +package org.apache.iotdb.confignode.manager.pipe.agent.task; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.pipe.task.PipeTask; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; +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; +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; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskStage.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskStage.java similarity index 86% rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskStage.java rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskStage.java index 7e676903857e..670062be6ba6 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskStage.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/agent/task/PipeConfigNodeTaskStage.java @@ -17,12 +17,10 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.task; +package org.apache.iotdb.confignode.manager.pipe.agent.task; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.stage.PipeTaskStage; -import org.apache.iotdb.confignode.manager.pipe.execution.PipeConfigNodeSubtask; -import org.apache.iotdb.confignode.manager.pipe.execution.PipeConfigNodeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.stage.PipeTaskStage; import org.apache.iotdb.pipe.api.exception.PipeException; import java.util.Map; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/plugin/PipePluginCoordinator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/plugin/PipePluginCoordinator.java index 07259f842fbe..b26e8ab3ce14 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/plugin/PipePluginCoordinator.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/plugin/PipePluginCoordinator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.manager.pipe.coordinator.plugin; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.confignode.consensus.request.read.pipe.plugin.GetPipePluginJarPlan; import org.apache.iotdb.confignode.consensus.request.read.pipe.plugin.GetPipePluginTablePlan; import org.apache.iotdb.confignode.consensus.response.JarResp; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeat.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeat.java index 1f54b8745d53..9c909149896a 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeat.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/coordinator/runtime/heartbeat/PipeHeartbeat.java @@ -19,8 +19,8 @@ package org.apache.iotdb.confignode.manager.pipe.coordinator.runtime.heartbeat; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import javax.validation.constraints.NotNull; 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 18c964f06c10..16e2e6a5b731 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 @@ -23,13 +23,13 @@ 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.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; +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.PipeTemporaryMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTemporaryMeta; import org.apache.iotdb.confignode.consensus.response.pipe.task.PipeTableResp; import org.apache.iotdb.confignode.manager.ConfigManager; import org.apache.iotdb.confignode.manager.pipe.resource.PipeConfigNodeResourceManager; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionSnapshotEvent.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionSnapshotEvent.java index 40918e1b6a7a..8e17cb9b5150 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionSnapshotEvent.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionSnapshotEvent.java @@ -19,10 +19,10 @@ package org.apache.iotdb.confignode.manager.pipe.event; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.confignode.manager.pipe.resource.PipeConfigNodeResourceManager; import org.apache.iotdb.confignode.persistence.schema.CNSnapshotFileType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionWritePlanEvent.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionWritePlanEvent.java index 0d780bafca1e..1515724c1e57 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionWritePlanEvent.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/event/PipeConfigRegionWritePlanEvent.java @@ -19,10 +19,10 @@ package org.apache.iotdb.confignode.manager.pipe.event; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.tsfile.utils.ReadWriteIOUtils; 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/extractor/IoTDBConfigRegionExtractor.java index ea897465b8b7..1115be3fa624 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/extractor/IoTDBConfigRegionExtractor.java @@ -20,13 +20,13 @@ package org.apache.iotdb.confignode.manager.pipe.extractor; import org.apache.iotdb.commons.consensus.ConfigRegionId; +import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeListeningQueue; 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.progress.PipeEventCommitManager; import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitor.java index 40d7141070d6..f789e3629a8c 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitor.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanVisitor; import org.apache.iotdb.confignode.consensus.request.auth.AuthorPlan; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeMetrics.java index e3dbbed5d6c6..ab5440eab2db 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeMetrics.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeMetrics.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.manager.pipe.metric; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; +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; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeOperator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeOperator.java index 7a5044b0c616..e53a4bb1cb27 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeOperator.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeOperator.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.enums.PipeRemainingTimeRateAverageTime; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.metric.PipeRemainingOperator; -import org.apache.iotdb.confignode.manager.pipe.execution.PipeConfigNodeSubtask; +import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtask; import org.apache.iotdb.confignode.manager.pipe.extractor.IoTDBConfigRegionExtractor; import com.codahale.metrics.Clock; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigRegionConnectorMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigRegionConnectorMetrics.java index 8fcb6fd90296..48461cdf65b0 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigRegionConnectorMetrics.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigRegionConnectorMetrics.java @@ -21,7 +21,7 @@ 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.execution.PipeConfigNodeSubtask; +import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtask; import org.apache.iotdb.metrics.AbstractMetricService; import org.apache.iotdb.metrics.metricsets.IMetricSet; import org.apache.iotdb.metrics.type.Rate; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeTemporaryMetaMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeTemporaryMetaMetrics.java index 4732ec236580..2296a53d91e8 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeTemporaryMetaMetrics.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeTemporaryMetaMetrics.java @@ -19,8 +19,8 @@ package org.apache.iotdb.confignode.manager.pipe.metric; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTemporaryMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTemporaryMeta; import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; import org.apache.iotdb.metrics.AbstractMetricService; 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 711d7bdf26c6..0dd4c5c0e8d5 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 @@ -21,14 +21,14 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.pipe.connector.PipeReceiverStatusHandler; 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.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.commons.pipe.receiver.IoTDBFileReceiver; +import org.apache.iotdb.commons.pipe.receiver.PipeReceiverStatusHandler; import org.apache.iotdb.commons.schema.ttl.TTLCache; import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeCopiedFileDirStartupCleaner.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeCopiedFileDirStartupCleaner.java index 1c4e2288c4e9..a60d3a7fa659 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeCopiedFileDirStartupCleaner.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeCopiedFileDirStartupCleaner.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.manager.pipe.resource; -import org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager; +import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeResourceManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeResourceManager.java index 3500d26e3c21..c13548c1d096 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeResourceManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeResourceManager.java @@ -19,9 +19,8 @@ package org.apache.iotdb.confignode.manager.pipe.resource; -import org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager; import org.apache.iotdb.commons.pipe.resource.log.PipeLogManager; -import org.apache.iotdb.confignode.manager.pipe.resource.snapshot.PipeConfigNodeSnapshotResourceManager; +import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; public class PipeConfigNodeResourceManager { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/snapshot/PipeConfigNodeSnapshotResourceManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeSnapshotResourceManager.java similarity index 89% rename from iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/snapshot/PipeConfigNodeSnapshotResourceManager.java rename to iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeSnapshotResourceManager.java index 177696545609..43f9f851ffa3 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/snapshot/PipeConfigNodeSnapshotResourceManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/resource/PipeConfigNodeSnapshotResourceManager.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.resource.snapshot; +package org.apache.iotdb.confignode.manager.pipe.resource; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager; +import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; import java.util.Collections; import java.util.HashSet; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeInfo.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeInfo.java index 7c1823a7d0ce..fff581646262 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeInfo.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/pipe/PipeInfo.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.persistence.pipe; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.commons.snapshot.SnapshotProcessor; import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleLeaderChangePlan; import org.apache.iotdb.confignode.consensus.request.write.pipe.runtime.PipeHandleMetaChangePlan; @@ -31,8 +31,8 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2; import org.apache.iotdb.confignode.manager.pipe.agent.PipeConfigNodeAgent; import org.apache.iotdb.confignode.manager.pipe.agent.runtime.PipeConfigRegionListener; +import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtask; import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeTaskAgent; -import org.apache.iotdb.confignode.manager.pipe.execution.PipeConfigNodeSubtask; import org.apache.iotdb.confignode.manager.pipe.metric.PipeTemporaryMetaMetrics; import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaRespExceptionMessage; import org.apache.iotdb.pipe.api.exception.PipeException; 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 64d235e7f231..818cb585fa47 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 @@ -21,12 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.executable.ExecutableManager; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.ConfigNodePipePluginMetaKeeper; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +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.plugin.meta.ConfigNodePipePluginMetaKeeper; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginExecutableManager; import org.apache.iotdb.commons.snapshot.SnapshotProcessor; import org.apache.iotdb.confignode.conf.ConfigNodeConfig; import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor; @@ -58,9 +58,9 @@ import java.util.Objects; import java.util.concurrent.locks.ReentrantLock; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.DO_NOTHING_PROCESSOR; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.IOTDB_EXTRACTOR; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.DO_NOTHING_PROCESSOR; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.IOTDB_EXTRACTOR; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR; public class PipePluginInfo implements SnapshotProcessor { 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 ddc6ae6ac60d..936220f77b31 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 @@ -23,19 +23,19 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; 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.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMetaKeeper; +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.agent.task.meta.PipeTemporaryMeta; +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.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeMetaKeeper; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTemporaryMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeType; 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; @@ -76,7 +76,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR; public class PipeTaskInfo implements SnapshotProcessor { diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java index c2040a05328a..23811a86fd09 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/ConfigNodeProcedureEnv.java @@ -29,8 +29,8 @@ import org.apache.iotdb.commons.cluster.NodeStatus; import org.apache.iotdb.commons.cluster.NodeType; import org.apache.iotdb.commons.cluster.RegionStatus; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.trigger.TriggerInformation; import org.apache.iotdb.confignode.client.CnToCnNodeRequestType; import org.apache.iotdb.confignode.client.CnToDnRequestType; 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 325832a3869f..1963d520d3f2 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.procedure.impl.pipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.confignode.manager.pipe.metric.PipeProcedureMetrics; import org.apache.iotdb.confignode.persistence.pipe.PipeTaskInfo; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java index fd4850798903..cfd7c970e0f5 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedure.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.plugin; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.CreatePipePluginPlan; import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.DropPipePluginPlan; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java index e91a6ba974dd..401859f0a7e0 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/runtime/PipeHandleMetaChangeProcedure.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.runtime; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; 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; 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 c4907d1f9e7e..431858f06792 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.runtime; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; 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; 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 59a04f9a806e..d4ab2a2cf5b7 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.task; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +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; +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.schema.SchemaConstant; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor; 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 cd581d013329..b8c712fdc16b 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 @@ -25,11 +25,11 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.RecoverProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.SimpleProgressIndex; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeType; +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.agent.task.meta.PipeType; 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; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java index 58254dc1ab00..fe36137b35f4 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StartPipeProcedureV2.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.task; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.impl.pipe.AbstractOperatePipeProcedureV2; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java index a817e16c7aee..5349cc65640d 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.task; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStatusPlanV2; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.impl.pipe.AbstractOperatePipeProcedureV2; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/AbstractOperateSubscriptionAndPipeProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/AbstractOperateSubscriptionAndPipeProcedure.java index e3d180a8f306..2b420136253a 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/AbstractOperateSubscriptionAndPipeProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/AbstractOperateSubscriptionAndPipeProcedure.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.procedure.impl.subscription.subscription; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.confignode.persistence.pipe.PipeTaskInfo; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.impl.subscription.AbstractOperateSubscriptionProcedure; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/CreateSubscriptionProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/CreateSubscriptionProcedure.java index 166f7b3da5e0..2f977b9a47b7 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/CreateSubscriptionProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/CreateSubscriptionProcedure.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.procedure.impl.subscription.subscription; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.subscription.meta.consumer.ConsumerGroupMeta; import org.apache.iotdb.commons.subscription.meta.topic.TopicMeta; import org.apache.iotdb.commons.utils.TestOnly; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/DropSubscriptionProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/DropSubscriptionProcedure.java index 7d0c1e09cbdb..1fa775844d27 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/DropSubscriptionProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/subscription/subscription/DropSubscriptionProcedure.java @@ -20,7 +20,7 @@ package org.apache.iotdb.confignode.procedure.impl.subscription.subscription; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.subscription.meta.consumer.ConsumerGroupMeta; import org.apache.iotdb.commons.subscription.meta.topic.TopicMeta; import org.apache.iotdb.commons.utils.TestOnly; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java index cfa372be8dd0..8f8a9d07109b 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java @@ -41,11 +41,11 @@ import org.apache.iotdb.commons.partition.SeriesPartitionTable; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +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; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.subscription.meta.consumer.ConsumerGroupMeta; import org.apache.iotdb.commons.subscription.meta.consumer.ConsumerMeta; import org.apache.iotdb.commons.subscription.meta.topic.TopicMeta; @@ -1191,9 +1191,10 @@ public void AlterPipePlanV2Test() throws IOException { @Test public void SetPipeStatusPlanV2Test() throws IOException { - SetPipeStatusPlanV2 setPipeStatusPlanV2 = - new SetPipeStatusPlanV2("pipe", org.apache.iotdb.commons.pipe.task.meta.PipeStatus.RUNNING); - SetPipeStatusPlanV2 setPipeStatusPlanV21 = + final SetPipeStatusPlanV2 setPipeStatusPlanV2 = + new SetPipeStatusPlanV2( + "pipe", org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus.RUNNING); + final SetPipeStatusPlanV2 setPipeStatusPlanV21 = (SetPipeStatusPlanV2) ConfigPhysicalPlan.Factory.create(setPipeStatusPlanV2.serializeToByteBuffer()); Assert.assertEquals(setPipeStatusPlanV2.getPipeName(), setPipeStatusPlanV21.getPipeName()); @@ -1240,7 +1241,7 @@ public void OperateMultiplePipesPlanV2Test() throws IOException { SetPipeStatusPlanV2 setPipeStatusPlanV2 = new SetPipeStatusPlanV2( - "testSet", org.apache.iotdb.commons.pipe.task.meta.PipeStatus.RUNNING); + "testSet", org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus.RUNNING); List subPlans = new ArrayList<>(); subPlans.add(createPipePlanV2); 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 f2e6b92fbbb8..45454d56ca5b 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,9 +19,9 @@ package org.apache.iotdb.confignode.consensus.response.pipe; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.iotdb.IoTDBExtractor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.donothing.DoNothingProcessor; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +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.meta.PipePluginMeta; import org.apache.iotdb.confignode.consensus.response.pipe.plugin.PipePluginTableResp; import org.apache.iotdb.confignode.rpc.thrift.TGetPipePluginTableResp; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeTableRespTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeTableRespTest.java index 144b988df1e9..94189a19d997 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeTableRespTest.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/response/pipe/PipeTableRespTest.java @@ -20,10 +20,10 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +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; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.confignode.consensus.response.pipe.task.PipeTableResp; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtaskExecutorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/agent/PipeConfigNodeSubtaskExecutorTest.java similarity index 91% rename from iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtaskExecutorTest.java rename to iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/agent/PipeConfigNodeSubtaskExecutorTest.java index 16d949d1dcbd..f2fa5b0205ae 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/execution/PipeConfigNodeSubtaskExecutorTest.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/agent/PipeConfigNodeSubtaskExecutorTest.java @@ -17,14 +17,16 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.execution; +package org.apache.iotdb.confignode.manager.pipe.agent; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +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.execution.executor.PipeSubtaskExecutor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.subtask.PipeSubtask; +import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtask; +import org.apache.iotdb.confignode.manager.pipe.agent.task.PipeConfigNodeSubtaskExecutor; import org.junit.After; import org.junit.Assert; 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/connector/IoTDBConfigRegionConnectorTest.java index 30ed0ee75806..3e438d0816ea 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/connector/IoTDBConfigRegionConnectorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.confignode.manager.pipe.connector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.confignode.manager.pipe.connector.protocol.IoTDBConfigRegionConnector; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitorTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitorTest.java index 8d38006cdf99..0f3ac2825334 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitorTest.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/extractor/PipeConfigPhysicalPlanPatternParseVisitorTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.confignode.consensus.request.auth.AuthorPlan; import org.apache.iotdb.confignode.consensus.request.write.database.DatabaseSchemaPlan; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java index f3571bed57ea..c3e7916108fe 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/PipeInfoTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.confignode.persistence; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +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.confignode.consensus.request.write.pipe.plugin.CreatePipePluginPlan; import org.apache.iotdb.confignode.consensus.request.write.pipe.plugin.DropPipePluginPlan; import org.apache.iotdb.confignode.consensus.request.write.pipe.task.CreatePipePlanV2; diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedureTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedureTest.java index 93b95a3f3362..ba9aa01f2562 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedureTest.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/plugin/CreatePipePluginProcedureTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.procedure.impl.pipe.plugin; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.confignode.procedure.store.ProcedureFactory; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/config/PipeConsensusConfig.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/config/PipeConsensusConfig.java index bec2c7d8e1e0..2cb149b601b0 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/config/PipeConsensusConfig.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/config/PipeConsensusConfig.java @@ -19,7 +19,7 @@ package org.apache.iotdb.consensus.config; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeDispatcher; import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeGuardian; import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeReceiver; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensus.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensus.java index 7cd0470f9772..bea781772c3d 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensus.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensus.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.client.sync.SyncPipeConsensusServiceClient; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import org.apache.iotdb.commons.service.RegisterManager; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.StatusUtils; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensusServerImpl.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensusServerImpl.java index d4b5552b7ec8..b6b6829894af 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensusServerImpl.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/PipeConsensusServerImpl.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.consensus.IStateMachine; 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 eab94de768f0..32cc4f88c028 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.consensus.pipe.consensuspipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.consensus.config.PipeConsensusConfig; import org.apache.iotdb.consensus.config.PipeConsensusConfig.ReplicateMode; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeName.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeName.java index c653b0fee37b..1beabf2b3bd9 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeName.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeName.java @@ -20,7 +20,7 @@ package org.apache.iotdb.consensus.pipe.consensuspipe; import org.apache.iotdb.commons.consensus.ConsensusGroupId; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.consensus.common.Peer; import java.util.Objects; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeSelector.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeSelector.java index 1b130a0ea95c..6af75b5718e6 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeSelector.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/consensuspipe/ConsensusPipeSelector.java @@ -19,7 +19,7 @@ package org.apache.iotdb.consensus.pipe.consensuspipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java index 515a9f54ddca..453bd9a1bdb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java @@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.IConsensus; import org.apache.iotdb.consensus.config.ConsensusConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgent.java index c93bb5a58820..31f404de9d29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgent.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.agent.plugin; -import org.apache.iotdb.commons.pipe.plugin.meta.DataNodePipePluginMetaKeeper; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginClassLoader; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginClassLoaderManager; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginExecutableManager; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper; +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.db.pipe.agent.plugin.dataregion.PipeDataRegionPluginAgent; import org.apache.iotdb.db.pipe.agent.plugin.schemaregion.PipeSchemaRegionPluginAgent; import org.apache.iotdb.pipe.api.PipePlugin; 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/PipeDataRegionConnectorConstructor.java index c9b073a01db8..e11e8dc56853 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/PipeDataRegionConnectorConstructor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.agent.plugin.dataregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeConnectorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.donothing.DoNothingConnector; -import org.apache.iotdb.commons.pipe.plugin.meta.DataNodePipePluginMetaKeeper; +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.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.opcua.OpcUaConnector; 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/PipeDataRegionExtractorConstructor.java index 4cebec06d5f4..ddf6cdb6b8b8 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/PipeDataRegionExtractorConstructor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.agent.plugin.dataregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeExtractorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.donothing.DoNothingExtractor; -import org.apache.iotdb.commons.pipe.plugin.meta.DataNodePipePluginMetaKeeper; +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.meta.DataNodePipePluginMetaKeeper; import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor; class PipeDataRegionExtractorConstructor extends PipeExtractorConstructor { 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 92d130a12fe6..22d9a75fba10 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.pipe.agent.plugin.dataregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeConnectorConstructor; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeExtractorConstructor; import org.apache.iotdb.commons.pipe.agent.plugin.PipePluginAgent; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeProcessorConstructor; -import org.apache.iotdb.commons.pipe.plugin.meta.DataNodePipePluginMetaKeeper; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; +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.meta.DataNodePipePluginMetaKeeper; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper; public class PipeDataRegionPluginAgent extends PipePluginAgent { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionProcessorConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionProcessorConstructor.java index 6f172ae5fb83..44c6ef17800b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionProcessorConstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/dataregion/PipeDataRegionProcessorConstructor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.agent.plugin.dataregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeProcessorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.donothing.DoNothingProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.throwing.ThrowingExceptionProcessor; -import org.apache.iotdb.commons.pipe.plugin.meta.DataNodePipePluginMetaKeeper; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.donothing.DoNothingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.throwing.ThrowingExceptionProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeProcessorConstructor; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper; import org.apache.iotdb.db.pipe.processor.aggregate.AggregateProcessor; import org.apache.iotdb.db.pipe.processor.aggregate.operator.processor.StandardStatisticsOperatorProcessor; import org.apache.iotdb.db.pipe.processor.aggregate.window.processor.TumblingWindowingProcessor; 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/PipeSchemaRegionConnectorConstructor.java index 20132a9756ae..6c96aaaeddc2 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/PipeSchemaRegionConnectorConstructor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.agent.plugin.schemaregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeConnectorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.donothing.DoNothingConnector; +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.pipe.api.PipeConnector; 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/PipeSchemaRegionExtractorConstructor.java index 876ab9f85174..10d8257c1e63 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/PipeSchemaRegionExtractorConstructor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.agent.plugin.schemaregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeExtractorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.donothing.DoNothingExtractor; +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.pipe.api.PipeExtractor; 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 348b7ce0585b..fc0974099cce 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.agent.plugin.schemaregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeConnectorConstructor; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeExtractorConstructor; import org.apache.iotdb.commons.pipe.agent.plugin.PipePluginAgent; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeProcessorConstructor; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; +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.meta.PipePluginMetaKeeper; public class PipeSchemaRegionPluginAgent extends PipePluginAgent { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionProcessorConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionProcessorConstructor.java index 099283dbf572..51e5e64e598e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionProcessorConstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/plugin/schemaregion/PipeSchemaRegionProcessorConstructor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.agent.plugin.schemaregion; -import org.apache.iotdb.commons.pipe.agent.plugin.PipeProcessorConstructor; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.donothing.DoNothingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.donothing.DoNothingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.constructor.PipeProcessorConstructor; import org.apache.iotdb.pipe.api.PipeProcessor; class PipeSchemaRegionProcessorConstructor extends PipeProcessorConstructor { 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 4e92f94bf515..0b8fb380cd93 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginClassLoaderManager; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginExecutableManager; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +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.agent.task.meta.PipeMeta; import org.apache.iotdb.confignode.rpc.thrift.TGetAllPipeInfoResp; import org.apache.iotdb.confignode.rpc.thrift.TGetJarInListReq; import org.apache.iotdb.confignode.rpc.thrift.TGetJarInListResp; 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 dcf9f8b0435b..cb9484c49e70 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 @@ -25,16 +25,15 @@ import org.apache.iotdb.commons.exception.StartupException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.service.IService; 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.progress.SimpleProgressIndexAssigner; import org.apache.iotdb.db.pipe.resource.PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.service.ResourcesInformationHolder; 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 bf7c6ed103a6..2948e644b721 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 @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.agent.runtime; import org.apache.iotdb.commons.consensus.SchemaRegionId; -import org.apache.iotdb.commons.pipe.task.PipeTask; +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.PipeSchemaRegionListenerMetrics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/progress/SimpleProgressIndexAssigner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/SimpleProgressIndexAssigner.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/progress/SimpleProgressIndexAssigner.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/SimpleProgressIndexAssigner.java index 766945a934b6..2288e5467852 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/progress/SimpleProgressIndexAssigner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/SimpleProgressIndexAssigner.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.progress; +package org.apache.iotdb.db.pipe.agent.runtime; import org.apache.iotdb.commons.consensus.index.impl.SimpleProgressIndex; import org.apache.iotdb.commons.exception.StartupException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/PipeDataNodeTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTask.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/PipeDataNodeTask.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTask.java index 502bdec2c7cb..d33ec44a86e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/PipeDataNodeTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTask.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task; +package org.apache.iotdb.db.pipe.agent.task; -import org.apache.iotdb.commons.pipe.task.PipeTask; -import org.apache.iotdb.commons.pipe.task.stage.PipeTaskStage; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; +import org.apache.iotdb.commons.pipe.agent.task.stage.PipeTaskStage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 8a73a19684f7..4ef91b9e37a5 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 @@ -24,15 +24,15 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MetaProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; +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.PipeConfig; import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant; -import org.apache.iotdb.commons.pipe.task.PipeTask; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeType; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.enums.Tag; import org.apache.iotdb.consensus.exception.ConsensusException; @@ -41,6 +41,8 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; 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.IoTDBDataRegionExtractor; import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.listener.PipeInsertionDataNodeListener; @@ -48,9 +50,6 @@ import org.apache.iotdb.db.pipe.metric.PipeDataNodeRemainingEventAndTimeMetrics; import org.apache.iotdb.db.pipe.metric.PipeDataRegionExtractorMetrics; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; -import org.apache.iotdb.db.pipe.task.PipeDataNodeTask; -import org.apache.iotdb.db.pipe.task.builder.PipeDataNodeBuilder; -import org.apache.iotdb.db.pipe.task.builder.PipeDataNodeTaskBuilder; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/builder/PipeDataNodeBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeBuilder.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/builder/PipeDataNodeBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeBuilder.java index 6586e771847d..49c55f2dc96c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/builder/PipeDataNodeBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeBuilder.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.builder; +package org.apache.iotdb.db.pipe.agent.task.builder; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.pipe.task.PipeTask; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; +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; +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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/builder/PipeDataNodeTaskBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeTaskBuilder.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/builder/PipeDataNodeTaskBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeTaskBuilder.java index 85ea69802126..2bfc343fda78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/builder/PipeDataNodeTaskBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/builder/PipeDataNodeTaskBuilder.java @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.builder; +package org.apache.iotdb.db.pipe.agent.task.builder; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; 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.agent.task.meta.PipeType; import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant; import org.apache.iotdb.commons.pipe.config.constant.SystemConstant; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeType; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; -import org.apache.iotdb.db.pipe.execution.PipeProcessorSubtaskExecutor; -import org.apache.iotdb.db.pipe.execution.PipeSubtaskExecutorManager; +import org.apache.iotdb.db.pipe.agent.task.PipeDataNodeTask; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor; +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.pipe.task.PipeDataNodeTask; -import org.apache.iotdb.db.pipe.task.stage.PipeTaskConnectorStage; -import org.apache.iotdb.db.pipe.task.stage.PipeTaskExtractorStage; -import org.apache.iotdb.db.pipe.task.stage.PipeTaskProcessorStage; import org.apache.iotdb.db.subscription.task.stage.SubscriptionTaskConnectorStage; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/connection/EnrichedDeque.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/EnrichedDeque.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/connection/EnrichedDeque.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/EnrichedDeque.java index fa352c0055e6..5ae0a4ed2bc9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/connection/EnrichedDeque.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/EnrichedDeque.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.connection; +package org.apache.iotdb.db.pipe.agent.task.connection; import org.apache.iotdb.db.pipe.metric.PipeDataRegionEventCounter; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/connection/PipeEventCollector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/PipeEventCollector.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/connection/PipeEventCollector.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/PipeEventCollector.java index de0ede996231..7b78febf428c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/connection/PipeEventCollector.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/connection/PipeEventCollector.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.connection; +package org.apache.iotdb.db.pipe.agent.task.connection; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.ProgressReportEvent; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeConnectorSubtaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeConnectorSubtaskExecutor.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeConnectorSubtaskExecutor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeConnectorSubtaskExecutor.java index ea03c8ce4a00..fcb4888dbde5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeConnectorSubtaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeConnectorSubtaskExecutor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.agent.task.execution; import org.apache.iotdb.commons.concurrent.ThreadName; +import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskExecutor; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; public class PipeConnectorSubtaskExecutor extends PipeSubtaskExecutor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeProcessorSubtaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeProcessorSubtaskExecutor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeProcessorSubtaskExecutor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeProcessorSubtaskExecutor.java index 6d5a8ca89fc9..f25d28b0c2c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeProcessorSubtaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeProcessorSubtaskExecutor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.agent.task.execution; import org.apache.iotdb.commons.concurrent.ThreadName; +import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskExecutor; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; public class PipeProcessorSubtaskExecutor extends PipeSubtaskExecutor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeSubtaskExecutorManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSubtaskExecutorManager.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeSubtaskExecutorManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSubtaskExecutorManager.java index 78db89315229..eadb75463bb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/execution/PipeSubtaskExecutorManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/execution/PipeSubtaskExecutorManager.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.agent.task.execution; import org.apache.iotdb.db.pipe.consensus.PipeConsensusSubtaskExecutor; -import org.apache.iotdb.db.subscription.execution.executor.SubscriptionSubtaskExecutor; +import org.apache.iotdb.db.subscription.task.execution.SubscriptionSubtaskExecutor; /** * PipeTaskExecutor is responsible for executing the pipe tasks, and it is scheduled by the diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskConnectorStage.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskConnectorStage.java index a5ec4fed78bb..345e6ab040c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskConnectorStage.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.stage; +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.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.commons.pipe.task.stage.PipeTaskStage; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtaskManager; +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.pipe.api.customizer.parameter.PipeParameters; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.exception.PipeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskExtractorStage.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskExtractorStage.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskExtractorStage.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskExtractorStage.java index 32b8ca8f7754..f6a2030e5fa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskExtractorStage.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskExtractorStage.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.stage; +package org.apache.iotdb.db.pipe.agent.task.stage; import org.apache.iotdb.commons.consensus.DataRegionId; +import org.apache.iotdb.commons.pipe.agent.task.connection.EventSupplier; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.stage.PipeTaskStage; import org.apache.iotdb.commons.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskExtractorRuntimeEnvironment; -import org.apache.iotdb.commons.pipe.task.EventSupplier; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.stage.PipeTaskStage; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.pipe.api.PipeExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskProcessorStage.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskProcessorStage.java index e7ab0cb1997a..7767792ce52d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/stage/PipeTaskProcessorStage.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.stage; +package org.apache.iotdb.db.pipe.agent.task.stage; 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.EventSupplier; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.stage.PipeTaskStage; 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.PipeTaskProcessorRuntimeEnvironment; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.task.EventSupplier; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.commons.pipe.task.stage.PipeTaskStage; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; -import org.apache.iotdb.db.pipe.execution.PipeProcessorSubtaskExecutor; -import org.apache.iotdb.db.pipe.task.connection.PipeEventCollector; -import org.apache.iotdb.db.pipe.task.subtask.processor.PipeProcessorSubtask; +import org.apache.iotdb.db.pipe.agent.task.connection.PipeEventCollector; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeProcessorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.pipe.api.PipeConnector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtask.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtask.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtask.java index 7c88c962466c..3f5529b02a16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtask.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.subtask.connector; +package org.apache.iotdb.db.pipe.agent.task.subtask.connector; 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.config.PipeConfig; import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.commons.pipe.task.subtask.PipeAbstractConnectorSubtask; 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.event.UserDefinedEnrichedEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java index 26c18b3dad6a..14d4f604c22c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.subtask.connector; +package org.apache.iotdb.db.pipe.agent.task.subtask.connector; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.pipe.api.event.Event; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskManager.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskManager.java index 5bb140736483..a156eae3b04d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeConnectorSubtaskManager.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.subtask.connector; +package org.apache.iotdb.db.pipe.agent.task.subtask.connector; 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.progress.PipeEventCommitManager; import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant; 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.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.db.pipe.metric.PipeDataNodeRemainingEventAndTimeMetrics; import org.apache.iotdb.db.pipe.metric.PipeDataRegionEventCounter; import org.apache.iotdb.db.storageengine.StorageEngine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java index beabba3128a2..185b60c29e98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/connector/PipeRealtimePriorityBlockingQueue.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.subtask.connector; +package org.apache.iotdb.db.pipe.agent.task.subtask.connector; +import org.apache.iotdb.commons.pipe.agent.task.connection.BlockingPendingQueue; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.connection.BlockingPendingQueue; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.agent.task.connection.PipeEventCollector; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.metric.PipeDataRegionEventCounter; -import org.apache.iotdb.db.pipe.task.connection.PipeEventCollector; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtask.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtask.java index ff17a11d8b18..be7e23bed0bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtask.java @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.subtask.processor; +package org.apache.iotdb.db.pipe.agent.task.subtask.processor; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeOutOfMemoryCriticalException; +import org.apache.iotdb.commons.pipe.agent.task.connection.EventSupplier; +import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskScheduler; +import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager; +import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeReportableSubtask; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.execution.scheduler.PipeSubtaskScheduler; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; -import org.apache.iotdb.commons.pipe.task.EventSupplier; -import org.apache.iotdb.commons.pipe.task.subtask.PipeReportableSubtask; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; +import org.apache.iotdb.db.pipe.agent.task.connection.PipeEventCollector; import org.apache.iotdb.db.pipe.event.UserDefinedEnrichedEvent; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.metric.PipeDataNodeRemainingEventAndTimeMetrics; import org.apache.iotdb.db.pipe.metric.PipeProcessorMetrics; import org.apache.iotdb.db.pipe.processor.pipeconsensus.PipeConsensusProcessor; -import org.apache.iotdb.db.pipe.task.connection.PipeEventCollector; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.utils.ErrorHandlingUtils; import org.apache.iotdb.pipe.api.PipeProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtaskWorker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtaskWorker.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtaskWorker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtaskWorker.java index 684fa5ebb0c9..44fd578c84db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtaskWorker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtaskWorker.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.subtask.processor; +package org.apache.iotdb.db.pipe.agent.task.subtask.processor; import org.apache.iotdb.commons.concurrent.WrappedRunnable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtaskWorkerManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtaskWorkerManager.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtaskWorkerManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtaskWorkerManager.java index a7c073633212..33d58c4b5d49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtaskWorkerManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/processor/PipeProcessorSubtaskWorkerManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.subtask.processor; +package org.apache.iotdb.db.pipe.agent.task.subtask.processor; import org.apache.iotdb.commons.pipe.config.PipeConfig; 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/connector/protocol/pipeconsensus/PipeConsensusAsyncConnector.java index 3f6ed02aeb1b..a74057c75c7f 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/connector/protocol/pipeconsensus/PipeConsensusAsyncConnector.java @@ -28,9 +28,9 @@ 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.agent.task.progress.PipeEventCommitManager; import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.consensus.pipe.consensuspipe.ConsensusPipeConnector; import org.apache.iotdb.consensus.pipe.metric.PipeConsensusSyncLagManager; 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/connector/protocol/thrift/async/IoTDBDataRegionAsyncConnector.java index b266d8cca3b1..5aa4324a2f39 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/connector/protocol/thrift/async/IoTDBDataRegionAsyncConnector.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient; import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; +import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask; 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; @@ -42,7 +43,6 @@ 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.task.subtask.connector.PipeConnectorSubtask; 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.customizer.configuration.PipeConnectorRuntimeConfiguration; 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 175a95992cfa..72782ad228e7 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,7 +20,7 @@ import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor; public class PipeConsensusSubtaskExecutor extends PipeConnectorSubtaskExecutor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/UserDefinedEnrichedEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/UserDefinedEnrichedEvent.java index 82829a4542be..6a9b312e61bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/UserDefinedEnrichedEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/UserDefinedEnrichedEvent.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.pipe.event; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.event.UserDefinedEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java index d3830b6dcf02..5a72be19bc86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.metric.PipeHeartbeatEventMetrics; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java index 94f2d8af440b..4cb7d972dac5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.event.common.row; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryWeightUtil; import org.apache.iotdb.pipe.api.access.Row; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java index 39bd51d5f53a..0d3b9540f283 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.event.common.schema; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java index d6eefe086e55..435b38d61c65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.event.common.schema; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java index de3e39ed4127..d2b6e0c8a32f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java index 1fbcb204902a..6b85bae9d9fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/TabletInsertionDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/TabletInsertionDataContainer.java index 454854115544..747962fdd039 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/TabletInsertionDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/TabletInsertionDataContainer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.event.common.tablet; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.pipe.event.common.row.PipeRow; import org.apache.iotdb.db.pipe.event.common.row.PipeRowCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/terminate/PipeTerminateEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/terminate/PipeTerminateEvent.java index bf152dfbf174..dbe8aada88d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/terminate/PipeTerminateEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/terminate/PipeTerminateEvent.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; +import org.apache.iotdb.db.pipe.agent.task.PipeDataNodeTask; import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; -import org.apache.iotdb.db.pipe.task.PipeDataNodeTask; /** * The {@link PipeTerminateEvent} is an {@link EnrichedEvent} that controls the termination of pipe, 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 71450f93c1e7..aa170be2d9fa 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tsfile.container.TsFileInsertionDataContainer; import org.apache.iotdb.db.pipe.event.common.tsfile.container.TsFileInsertionDataContainerProvider; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionPointCounter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionPointCounter.java index 219a8933a73c..991d05e8660f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionPointCounter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionPointCounter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.event.common.tsfile; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.file.metadata.PlainDeviceID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java index d41ed8b08680..66a6ebb0d25d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.event.common.tsfile.container; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlock; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java index 9ce61d70eab6..cffe6e87d9ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.event.common.tsfile.container; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tsfile.container.query.TsFileInsertionQueryDataContainer; import org.apache.iotdb.db.pipe.event.common.tsfile.container.scan.TsFileInsertionScanDataContainer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java index 6024d7092310..d5106b3f1356 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/query/TsFileInsertionQueryDataContainer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.event.common.tsfile.container.query; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tsfile.container.TsFileInsertionDataContainer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java index 7bbed7737e4b..07cc9088cdfe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/scan/TsFileInsertionScanDataContainer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.event.common.tsfile.container.scan; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tsfile.container.TsFileInsertionDataContainer; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; 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 7e12a909b1f1..25f6c4017798 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.pipe.event.realtime; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.epoch.TsFileEpoch; import java.util.Map; 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/extractor/dataregion/DataRegionListeningFilter.java index fa617334d6af..a54f51560484 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/extractor/dataregion/DataRegionListeningFilter.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.commons.pipe.task.PipeTask; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; 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/extractor/dataregion/IoTDBDataRegionExtractor.java index 0b447ffe7a4f..f05bcf2bea5e 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/extractor/dataregion/IoTDBDataRegionExtractor.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.extractor.IoTDBExtractor; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileExtractor.java index 4ecc6fc0c67b..917bd6ae5946 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileExtractor.java @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.consensus.index.impl.StateProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.TimeWindowStateProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +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.SystemConstant; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskExtractorRuntimeEnvironment; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionExtractor.java index 55faf2db59ca..40c6bdc906f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionExtractor.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; +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.plugin.env.PipeTaskExtractorRuntimeEnvironment; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.ProgressReportEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/assigner/PipeDataRegionAssigner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/assigner/PipeDataRegionAssigner.java index 1f2500c1839d..0a5d12305887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/assigner/PipeDataRegionAssigner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/assigner/PipeDataRegionAssigner.java @@ -29,9 +29,9 @@ import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeEvent; import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeEventFactory; import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionExtractor; +import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.matcher.CachedSchemaPatternMatcher; +import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.matcher.PipeDataRegionMatcher; import org.apache.iotdb.db.pipe.metric.PipeAssignerMetrics; -import org.apache.iotdb.db.pipe.pattern.CachedSchemaPatternMatcher; -import org.apache.iotdb.db.pipe.pattern.PipeDataRegionMatcher; import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/pattern/CachedSchemaPatternMatcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/matcher/CachedSchemaPatternMatcher.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/pattern/CachedSchemaPatternMatcher.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/matcher/CachedSchemaPatternMatcher.java index 4be44a0fecc4..015ece38f8bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/pattern/CachedSchemaPatternMatcher.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/matcher/CachedSchemaPatternMatcher.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.pattern; +package org.apache.iotdb.db.pipe.extractor.dataregion.realtime.matcher; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; 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.event.realtime.PipeRealtimeEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/pattern/PipeDataRegionMatcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/matcher/PipeDataRegionMatcher.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/pattern/PipeDataRegionMatcher.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/matcher/PipeDataRegionMatcher.java index 5132d6fb4948..4e102a1f7cf6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/pattern/PipeDataRegionMatcher.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/dataregion/realtime/matcher/PipeDataRegionMatcher.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.pattern; +package org.apache.iotdb.db.pipe.extractor.dataregion.realtime.matcher; import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeEvent; import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.PipeRealtimeDataRegionExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/schemaregion/PipePlanPatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/schemaregion/PipePlanPatternParseVisitor.java index c3669d1b0b27..1f8a5777fba5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/schemaregion/PipePlanPatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/extractor/schemaregion/PipePlanPatternParseVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.extractor.schemaregion; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; 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/metric/PipeDataNodeRemainingEventAndTimeMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java index 83426a500c3a..597c62cb7da1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.pipe.metric; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; +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.task.subtask.connector.PipeConnectorSubtask; +import org.apache.iotdb.db.pipe.agent.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor; import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; -import org.apache.iotdb.db.pipe.task.subtask.processor.PipeProcessorSubtask; 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/PipeDataNodeRemainingEventAndTimeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeOperator.java index e85a212b96d6..bf0c4ba2386e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeOperator.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.enums.PipeRemainingTimeRateAverageTime; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.metric.PipeRemainingOperator; +import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask; +import org.apache.iotdb.db.pipe.agent.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor; import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; -import org.apache.iotdb.db.pipe.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.metrics.core.IoTDBMetricManager; import org.apache.iotdb.metrics.core.type.IoTDBHistogram; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataRegionConnectorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataRegionConnectorMetrics.java index bf2ce7b5763e..570e19703ceb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataRegionConnectorMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataRegionConnectorMetrics.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; +import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask; import org.apache.iotdb.metrics.AbstractMetricService; import org.apache.iotdb.metrics.metricsets.IMetricSet; import org.apache.iotdb.metrics.type.Rate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java index d29defdc1fb1..ed41374e2621 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeProcessorMetrics.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; -import org.apache.iotdb.db.pipe.task.subtask.processor.PipeProcessorSubtask; +import org.apache.iotdb.db.pipe.agent.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.metrics.AbstractMetricService; import org.apache.iotdb.metrics.metricsets.IMetricSet; import org.apache.iotdb.metrics.type.Rate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeSchemaRegionConnectorMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeSchemaRegionConnectorMetrics.java index 482317b47906..7baffeae8ade 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeSchemaRegionConnectorMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeSchemaRegionConnectorMetrics.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; +import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask; import org.apache.iotdb.metrics.AbstractMetricService; import org.apache.iotdb.metrics.metricsets.IMetricSet; import org.apache.iotdb.metrics.type.Rate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java index d24e747cfa91..157c6e2103da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.TimeWindowStateProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskProcessorRuntimeEnvironment; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.agent.plugin.dataregion.PipeDataRegionPluginAgent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/plugin/TwoStageCountProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/plugin/TwoStageCountProcessor.java index 8a40422af00f..16a20a5f509a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/plugin/TwoStageCountProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/twostage/plugin/TwoStageCountProcessor.java @@ -24,10 +24,10 @@ import org.apache.iotdb.commons.consensus.index.impl.StateProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.constant.PipeProcessorConstant; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskProcessorRuntimeEnvironment; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; 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 4f4779e75dab..56789b69a996 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 @@ -22,7 +22,6 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.commons.pipe.connector.PipeReceiverStatusHandler; 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; @@ -30,8 +29,9 @@ 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.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.commons.pipe.receiver.IoTDBFileReceiver; +import org.apache.iotdb.commons.pipe.receiver.PipeReceiverStatusHandler; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementDataTypeConvertExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementDataTypeConvertExecutionVisitor.java index 868785ec8fbc..b4ad6a6da46e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementDataTypeConvertExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementDataTypeConvertExecutionVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.receiver.visitor; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferTabletRawReq; import org.apache.iotdb.db.pipe.event.common.tsfile.container.scan.TsFileInsertionScanDataContainer; import org.apache.iotdb.db.pipe.receiver.transform.statement.PipeConvertedInsertRowStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementPatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementPatternParseVisitor.java index d5fe0dfe3ae8..75394e98cc5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementPatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementPatternParseVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.receiver.visitor; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; 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/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java index a97ae5b1d474..b58d934988f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.resource; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager; +import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.commons.io.FileUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeResourceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeResourceManager.java index 83901ddcfca6..74afd58681f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeResourceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeResourceManager.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.pipe.resource; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager; import org.apache.iotdb.commons.pipe.resource.log.PipeLogManager; +import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryManager; import org.apache.iotdb.db.pipe.resource.snapshot.PipeDataNodeSnapshotResourceManager; import org.apache.iotdb.db.pipe.resource.tsfile.PipeTsFileResourceManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/snapshot/PipeDataNodeSnapshotResourceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/snapshot/PipeDataNodeSnapshotResourceManager.java index 8e286a9a5693..8e197d31a9bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/snapshot/PipeDataNodeSnapshotResourceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/snapshot/PipeDataNodeSnapshotResourceManager.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.resource.snapshot; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager; +import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; import java.util.Arrays; import java.util.HashSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index c7f076a476e1..69a6ee36bf1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -53,8 +53,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.service.metric.MetricService; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index 2fcb541f711c..ed10039d425d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -43,10 +43,10 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.pipe.agent.plugin.service.PipePluginClassLoader; +import org.apache.iotdb.commons.pipe.agent.plugin.service.PipePluginExecutableManager; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.pipe.connector.payload.airgap.AirGapPseudoTPipeTransferRequest; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginClassLoader; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginExecutableManager; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.subscription.meta.topic.TopicMeta; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java index d3316eec2d6e..ec33bcc3d663 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.db.queryengine.common.header.ColumnHeader; import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index 1c018c0e5074..7c83e688ceac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -37,8 +37,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.service.JMXService; import org.apache.iotdb.commons.service.RegisterManager; import org.apache.iotdb.commons.service.ServiceType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/ResourcesInformationHolder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/ResourcesInformationHolder.java index e650ca485690..22d35777f378 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/ResourcesInformationHolder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/ResourcesInformationHolder.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.trigger.TriggerInformation; import org.apache.iotdb.commons.udf.UDFInformation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBlockingPendingQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBlockingPendingQueue.java index b95501e0742d..df3791cc3270 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBlockingPendingQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBlockingPendingQueue.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.subscription.broker; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.event.Event; public abstract class SubscriptionBlockingPendingQueue { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBroker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBroker.java index adbe2396db41..f6fc757f5ceb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBroker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/SubscriptionBroker.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.subscription.broker; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.subscription.agent.SubscriptionAgent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/TsFileDeduplicationBlockingPendingQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/TsFileDeduplicationBlockingPendingQueue.java index 5b4001890e58..bf2583c0791d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/TsFileDeduplicationBlockingPendingQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/broker/TsFileDeduplicationBlockingPendingQueue.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.subscription.broker; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.subscription.config.SubscriptionConfig; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/execution/executor/SubscriptionSubtaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/execution/SubscriptionSubtaskExecutor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/execution/executor/SubscriptionSubtaskExecutor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/execution/SubscriptionSubtaskExecutor.java index 84a8e08d2327..76b0a7db2f6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/execution/executor/SubscriptionSubtaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/execution/SubscriptionSubtaskExecutor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.subscription.execution.executor; +package org.apache.iotdb.db.subscription.task.execution; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.subscription.config.SubscriptionConfig; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor; public class SubscriptionSubtaskExecutor extends PipeConnectorSubtaskExecutor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/stage/SubscriptionTaskConnectorStage.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/stage/SubscriptionTaskConnectorStage.java index 040eccced459..003d712cc5b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/stage/SubscriptionTaskConnectorStage.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/stage/SubscriptionTaskConnectorStage.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.subscription.task.stage; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskConnectorRuntimeEnvironment; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; -import org.apache.iotdb.db.pipe.task.stage.PipeTaskConnectorStage; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.stage.PipeTaskConnectorStage; import org.apache.iotdb.db.subscription.task.subtask.SubscriptionConnectorSubtaskManager; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtask.java index b429b8399420..8524e77d040e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtask.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.subscription.task.subtask; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; +import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask; import org.apache.iotdb.db.subscription.agent.SubscriptionAgent; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskLifeCycle.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskLifeCycle.java index 7e7f5fa1d215..57fb2c7004de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskLifeCycle.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskLifeCycle.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.subscription.task.subtask; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtaskLifeCycle; +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.subtask.connector.PipeConnectorSubtask; +import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtaskLifeCycle; import org.apache.iotdb.db.subscription.agent.SubscriptionAgent; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskManager.java index 377790836fb7..dfce62faac8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/task/subtask/SubscriptionConnectorSubtaskManager.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.subscription.task.subtask; +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.progress.PipeEventCommitManager; import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant; 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.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.subtask.connector.PipeConnectorSubtask; +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.metric.PipeDataRegionEventCounter; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtaskLifeCycle; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeRealtimePriorityBlockingQueue; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; @@ -48,7 +48,7 @@ import java.util.Objects; import java.util.TreeMap; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.SUBSCRIPTION_SINK; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.SUBSCRIPTION_SINK; public class SubscriptionConnectorSubtaskManager { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgentTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgentTest.java index 8af0dff55119..8467540a4a39 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgentTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/plugin/PipeDataNodePluginAgentTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.pipe.agent.plugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +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.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginClassLoaderManager; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginExecutableManager; import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector; import org.apache.iotdb.db.pipe.extractor.dataregion.IoTDBDataRegionExtractor; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeConnectorSubtaskExecutorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeConnectorSubtaskExecutorTest.java similarity index 83% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeConnectorSubtaskExecutorTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeConnectorSubtaskExecutorTest.java index e83c8500a48f..d78144a5e5f1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeConnectorSubtaskExecutorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeConnectorSubtaskExecutorTest.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.agent.task; -import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; +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.subtask.connector.PipeConnectorSubtask; import org.apache.iotdb.pipe.api.PipeConnector; import org.junit.Before; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeProcessorSubtaskExecutorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeProcessorSubtaskExecutorTest.java similarity index 80% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeProcessorSubtaskExecutorTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeProcessorSubtaskExecutorTest.java index 53e62831dfe8..9b001f66e7fd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeProcessorSubtaskExecutorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeProcessorSubtaskExecutorTest.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.agent.task; -import org.apache.iotdb.commons.pipe.task.EventSupplier; -import org.apache.iotdb.db.pipe.task.connection.PipeEventCollector; -import org.apache.iotdb.db.pipe.task.subtask.processor.PipeProcessorSubtask; +import org.apache.iotdb.commons.pipe.agent.task.connection.EventSupplier; +import org.apache.iotdb.db.pipe.agent.task.connection.PipeEventCollector; +import org.apache.iotdb.db.pipe.agent.task.execution.PipeProcessorSubtaskExecutor; +import org.apache.iotdb.db.pipe.agent.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.pipe.api.PipeProcessor; import org.junit.Before; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeSubtaskExecutorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeSubtaskExecutorTest.java similarity index 96% rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeSubtaskExecutorTest.java rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeSubtaskExecutorTest.java index a48924a1a463..892c61536e17 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/execution/PipeSubtaskExecutorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/agent/task/PipeSubtaskExecutorTest.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.agent.task; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; -import org.apache.iotdb.commons.pipe.task.subtask.PipeSubtask; +import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeSubtask; import org.junit.After; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java index 3437938acbe3..f06c5de11687 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.connector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.db.pipe.connector.protocol.legacy.IoTDBLegacyPipeConnector; import org.apache.iotdb.db.pipe.connector.protocol.thrift.async.IoTDBDataRegionAsyncConnector; import org.apache.iotdb.db.pipe.connector.protocol.thrift.sync.IoTDBDataRegionSyncConnector; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeStatementPatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeStatementPatternParseVisitorTest.java index 42e4e31c45c9..b3b5db52eae6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeStatementPatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeStatementPatternParseVisitorTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; import org.apache.iotdb.db.pipe.receiver.visitor.PipeStatementPatternParseVisitor; import org.apache.iotdb.db.queryengine.plan.statement.metadata.AlterTimeSeriesStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java index 44fa83cca623..4a7d77eab8d2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.commons.pipe.pattern.PrefixPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PrefixPipePattern; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.TabletInsertionDataContainer; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java index e2a4a6ccbf9c..50816ebf9688 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.pipe.event; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.pattern.PrefixPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PrefixPipePattern; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tsfile.container.TsFileInsertionDataContainer; import org.apache.iotdb.db.pipe.event.common.tsfile.container.query.TsFileInsertionQueryDataContainer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/extractor/PipePlanPatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/extractor/PipePlanPatternParseVisitorTest.java index c36e29b6449e..db402e995e4c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/extractor/PipePlanPatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/extractor/PipePlanPatternParseVisitorTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; import org.apache.iotdb.db.pipe.extractor.schemaregion.IoTDBSchemaRegionExtractor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/CachedSchemaPatternMatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/CachedSchemaPatternMatcherTest.java index 8649183c1ec7..2e3e57cd49e3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/CachedSchemaPatternMatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/CachedSchemaPatternMatcherTest.java @@ -22,12 +22,13 @@ import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant; import org.apache.iotdb.commons.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskExtractorRuntimeEnvironment; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PrefixPipePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.pattern.PrefixPipePattern; import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeEvent; 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.extractor.dataregion.realtime.matcher.CachedSchemaPatternMatcher; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/IoTDBPipePatternTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/IoTDBPipePatternTest.java index db42d713012d..78d96a920aa2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/IoTDBPipePatternTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/IoTDBPipePatternTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.pattern; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; import org.apache.iotdb.pipe.api.exception.PipeException; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/PrefixPipePatternTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/PrefixPipePatternTest.java index d81c50a57ce0..f667bd36c284 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/PrefixPipePatternTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/PrefixPipePatternTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.pattern; -import org.apache.iotdb.commons.pipe.pattern.PrefixPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PrefixPipePattern; import org.junit.Assert; import org.junit.Test; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeConnectorCriticalException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeConnectorCriticalException.java index 1cd37f50b562..d33cfc165145 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeConnectorCriticalException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeConnectorCriticalException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.exception.pipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMetaVersion; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMetaVersion; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeCriticalException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeCriticalException.java index 683a48e35c9c..aa725d94f749 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeCriticalException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeCriticalException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.exception.pipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMetaVersion; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMetaVersion; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionType.java index f826f7316adb..26aba3550238 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionType.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.exception.pipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMetaVersion; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMetaVersion; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeNonCriticalException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeNonCriticalException.java index dbd8bc18ff2a..6cc5304d26d4 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeNonCriticalException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeNonCriticalException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.exception.pipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMetaVersion; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMetaVersion; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeOutOfMemoryCriticalException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeOutOfMemoryCriticalException.java index 4691d24c6ec5..9abf0e3d079a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeOutOfMemoryCriticalException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeOutOfMemoryCriticalException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.exception.pipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMetaVersion; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMetaVersion; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java index eba037115358..240ab8c44de0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginAgent.java @@ -19,10 +19,13 @@ package org.apache.iotdb.commons.pipe.agent.plugin; +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.meta.PipePluginMetaKeeper; 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.PipeTaskTemporaryRuntimeEnvironment; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.PipeExtractor; import org.apache.iotdb.pipe.api.PipeProcessor; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/BuiltinPipePlugin.java similarity index 74% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/BuiltinPipePlugin.java index 2831dbc8b26a..3d86dcc663d1 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/BuiltinPipePlugin.java @@ -17,31 +17,31 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin; - -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.donothing.DoNothingConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.airgap.IoTDBAirGapConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.consensus.PipeConsensusAsyncConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift.IoTDBLegacyPipeConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift.IoTDBThriftAsyncConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift.IoTDBThriftConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift.IoTDBThriftSslConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift.IoTDBThriftSyncConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.opcua.OpcUaConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.websocket.WebSocketConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.writeback.WriteBackConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.donothing.DoNothingExtractor; -import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.iotdb.IoTDBExtractor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.aggregate.AggregateProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.aggregate.StandardStatisticsProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.aggregate.TumblingWindowingProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.donothing.DoNothingProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.downsampling.ChangingValueSamplingProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.downsampling.SwingingDoorTrendingSamplingProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.downsampling.TumblingTimeSamplingProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.pipeconsensus.PipeConsensusProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.throwing.ThrowingExceptionProcessor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.twostage.TwoStageCountProcessor; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin; + +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.donothing.DoNothingConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.airgap.IoTDBAirGapConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.consensus.PipeConsensusAsyncConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBLegacyPipeConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBThriftAsyncConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBThriftConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBThriftSslConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBThriftSyncConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.opcua.OpcUaConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.websocket.WebSocketConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.writeback.WriteBackConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.donothing.DoNothingExtractor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.iotdb.IoTDBExtractor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.aggregate.AggregateProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.aggregate.StandardStatisticsProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.aggregate.TumblingWindowingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.donothing.DoNothingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.downsampling.ChangingValueSamplingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.downsampling.SwingingDoorTrendingSamplingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.downsampling.TumblingTimeSamplingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.pipeconsensus.PipeConsensusProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.throwing.ThrowingExceptionProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.twostage.TwoStageCountProcessor; import java.util.Arrays; import java.util.Collections; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/PlaceholderConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/PlaceholderConnector.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/PlaceholderConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/PlaceholderConnector.java index dc8f4d25579d..2ad6e893d3cc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/PlaceholderConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/PlaceholderConnector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.configuration.PipeConnectorRuntimeConfiguration; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/donothing/DoNothingConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/donothing/DoNothingConnector.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/donothing/DoNothingConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/donothing/DoNothingConnector.java index 7361506f7566..12132f85cd2a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/donothing/DoNothingConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/donothing/DoNothingConnector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.donothing; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.donothing; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.configuration.PipeConnectorRuntimeConfiguration; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/airgap/IoTDBAirGapConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/airgap/IoTDBAirGapConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/airgap/IoTDBAirGapConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/airgap/IoTDBAirGapConnector.java index e12d3c910653..641a0c993a61 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/airgap/IoTDBAirGapConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/airgap/IoTDBAirGapConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.airgap; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.airgap; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the IoTDB Air Gap diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/consensus/PipeConsensusAsyncConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/consensus/PipeConsensusAsyncConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/consensus/PipeConsensusAsyncConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/consensus/PipeConsensusAsyncConnector.java index b6d1e85809ac..fb55bc71a10a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/consensus/PipeConsensusAsyncConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/consensus/PipeConsensusAsyncConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.consensus; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.consensus; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBLegacyPipeConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBLegacyPipeConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBLegacyPipeConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBLegacyPipeConnector.java index ecf13b5a12a7..ec5e73f5298e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBLegacyPipeConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBLegacyPipeConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the IoTDB legacy pipe diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftAsyncConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftAsyncConnector.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftAsyncConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftAsyncConnector.java index 9926c9ff1885..8f3d02d5adaa 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftAsyncConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftAsyncConnector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift; /** * This class is a placeholder and should not be initialized. It represents the IoTDB Thrift async diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftConnector.java index 68e8682a376e..a2786eba6164 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the IoTDB Thrift diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSslConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSslConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSslConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSslConnector.java index 921d03d7e089..165d91707d7a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSslConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSslConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the IoTDB SSL connector. diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSyncConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSyncConnector.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSyncConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSyncConnector.java index ff93ff6d30ee..ee80ef63c17a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSyncConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/iotdb/thrift/IoTDBThriftSyncConnector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift; /** * This class is a placeholder and should not be initialized. It represents the IoTDB Thrift sync diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/opcua/OpcUaConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/opcua/OpcUaConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/opcua/OpcUaConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/opcua/OpcUaConnector.java index 9435a37198b6..a6448d4209c2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/opcua/OpcUaConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/opcua/OpcUaConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.opcua; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.opcua; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the OPC UA connector. diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/websocket/WebSocketConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/websocket/WebSocketConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/websocket/WebSocketConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/websocket/WebSocketConnector.java index 6721d81459ab..a687a9c79a3e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/websocket/WebSocketConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/websocket/WebSocketConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.websocket; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.websocket; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the Web Socket diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/writeback/WriteBackConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/writeback/WriteBackConnector.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/writeback/WriteBackConnector.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/writeback/WriteBackConnector.java index 3b6077a1fc2f..11ab79200f41 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/writeback/WriteBackConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/connector/writeback/WriteBackConnector.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.connector.writeback; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.writeback; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.PlaceholderConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.PlaceholderConnector; /** * This class is a placeholder and should not be initialized. It represents the Write Back diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/extractor/donothing/DoNothingExtractor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/extractor/donothing/DoNothingExtractor.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/extractor/donothing/DoNothingExtractor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/extractor/donothing/DoNothingExtractor.java index 2dc43895a612..6c9fac230f7f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/extractor/donothing/DoNothingExtractor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/extractor/donothing/DoNothingExtractor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.extractor.donothing; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.donothing; import org.apache.iotdb.pipe.api.PipeExtractor; import org.apache.iotdb.pipe.api.customizer.configuration.PipeExtractorRuntimeConfiguration; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/extractor/iotdb/IoTDBExtractor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/extractor/iotdb/IoTDBExtractor.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/extractor/iotdb/IoTDBExtractor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/extractor/iotdb/IoTDBExtractor.java index 719ff9fc4e03..53f048f148d5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/extractor/iotdb/IoTDBExtractor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/extractor/iotdb/IoTDBExtractor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.extractor.iotdb; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.extractor.iotdb; import org.apache.iotdb.pipe.api.PipeExtractor; import org.apache.iotdb.pipe.api.customizer.configuration.PipeExtractorRuntimeConfiguration; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/PlaceHolderProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/PlaceHolderProcessor.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/PlaceHolderProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/PlaceHolderProcessor.java index 431c6ece3048..45920a84029d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/PlaceHolderProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/PlaceHolderProcessor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.collector.EventCollector; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/AggregateProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/AggregateProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/AggregateProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/AggregateProcessor.java index 4b0b41dea9ab..f0812e19ca52 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/AggregateProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/AggregateProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.aggregate; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.aggregate; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the Aggregate processor. diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/StandardStatisticsProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/StandardStatisticsProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/StandardStatisticsProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/StandardStatisticsProcessor.java index c1ed6d555b98..7341fb0e7da5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/StandardStatisticsProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/StandardStatisticsProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.aggregate; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.aggregate; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the Standard Statistics diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/TumblingWindowingProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/TumblingWindowingProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/TumblingWindowingProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/TumblingWindowingProcessor.java index 9733ab189d58..9d45abc722fa 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/aggregate/TumblingWindowingProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/aggregate/TumblingWindowingProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.aggregate; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.aggregate; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the Standard Statistics diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/donothing/DoNothingProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/donothing/DoNothingProcessor.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/donothing/DoNothingProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/donothing/DoNothingProcessor.java index 9ad92efdec0c..0a2dc4895bd7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/donothing/DoNothingProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/donothing/DoNothingProcessor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.donothing; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.donothing; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.collector.EventCollector; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/ChangingValueSamplingProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/ChangingValueSamplingProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/ChangingValueSamplingProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/ChangingValueSamplingProcessor.java index a9b060ff6bae..0cb723dca8cc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/ChangingValueSamplingProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/ChangingValueSamplingProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.downsampling; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.downsampling; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/SwingingDoorTrendingSamplingProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/SwingingDoorTrendingSamplingProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/SwingingDoorTrendingSamplingProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/SwingingDoorTrendingSamplingProcessor.java index dd4df672105d..12aed295f31c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/SwingingDoorTrendingSamplingProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/SwingingDoorTrendingSamplingProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.downsampling; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.downsampling; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/TumblingTimeSamplingProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/TumblingTimeSamplingProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/TumblingTimeSamplingProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/TumblingTimeSamplingProcessor.java index e57df60d7b1d..b7a3ae1c99e6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/downsampling/TumblingTimeSamplingProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/downsampling/TumblingTimeSamplingProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.downsampling; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.downsampling; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/pipeconsensus/PipeConsensusProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/pipeconsensus/PipeConsensusProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/pipeconsensus/PipeConsensusProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/pipeconsensus/PipeConsensusProcessor.java index 18c4656428d9..cdd32c8effd7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/pipeconsensus/PipeConsensusProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/pipeconsensus/PipeConsensusProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.pipeconsensus; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.pipeconsensus; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/throwing/ThrowingExceptionProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/throwing/ThrowingExceptionProcessor.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/throwing/ThrowingExceptionProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/throwing/ThrowingExceptionProcessor.java index 69b75be47f87..ca4cd6f7dded 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/throwing/ThrowingExceptionProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/throwing/ThrowingExceptionProcessor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.throwing; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.throwing; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.collector.EventCollector; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/twostage/TwoStageCountProcessor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/twostage/TwoStageCountProcessor.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/twostage/TwoStageCountProcessor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/twostage/TwoStageCountProcessor.java index b8bf5773cda8..58b6d4af92ec 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/processor/twostage/TwoStageCountProcessor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/builtin/processor/twostage/TwoStageCountProcessor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.builtin.processor.twostage; +package org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.twostage; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.PlaceHolderProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.processor.PlaceHolderProcessor; /** * This class is a placeholder and should not be initialized. It represents the diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeConnectorConstructor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeConnectorConstructor.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeConnectorConstructor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeConnectorConstructor.java index 72fa6511ec64..5025430d2379 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeConnectorConstructor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeConnectorConstructor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.agent.plugin; +package org.apache.iotdb.commons.pipe.agent.plugin.constructor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper; import org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeExtractorConstructor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeExtractorConstructor.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeExtractorConstructor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeExtractorConstructor.java index 1ba7d027be9a..001ae49e939c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeExtractorConstructor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeExtractorConstructor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.agent.plugin; +package org.apache.iotdb.commons.pipe.agent.plugin.constructor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper; import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; import org.apache.iotdb.pipe.api.PipeExtractor; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginConstructor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipePluginConstructor.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginConstructor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipePluginConstructor.java index e5253ad705b1..cbb25340f009 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipePluginConstructor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipePluginConstructor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.agent.plugin; +package org.apache.iotdb.commons.pipe.agent.plugin.constructor; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; -import org.apache.iotdb.commons.pipe.plugin.service.PipePluginClassLoaderManager; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper; +import org.apache.iotdb.commons.pipe.agent.plugin.service.PipePluginClassLoaderManager; import org.apache.iotdb.pipe.api.PipePlugin; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; import org.apache.iotdb.pipe.api.exception.PipeException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeProcessorConstructor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeProcessorConstructor.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeProcessorConstructor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeProcessorConstructor.java index b308a88138d9..fcee00045791 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/PipeProcessorConstructor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/constructor/PipeProcessorConstructor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.agent.plugin; +package org.apache.iotdb.commons.pipe.agent.plugin.constructor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMetaKeeper; import org.apache.iotdb.commons.pipe.config.constant.PipeProcessorConstant; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMetaKeeper; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/ConfigNodePipePluginMetaKeeper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/ConfigNodePipePluginMetaKeeper.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/ConfigNodePipePluginMetaKeeper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/ConfigNodePipePluginMetaKeeper.java index a5789a873b72..da4eb9cf714d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/ConfigNodePipePluginMetaKeeper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/ConfigNodePipePluginMetaKeeper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.meta; +package org.apache.iotdb.commons.pipe.agent.plugin.meta; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/DataNodePipePluginMetaKeeper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/DataNodePipePluginMetaKeeper.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/DataNodePipePluginMetaKeeper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/DataNodePipePluginMetaKeeper.java index 99ae4811f85d..e031f6c4007f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/DataNodePipePluginMetaKeeper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/DataNodePipePluginMetaKeeper.java @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.meta; +package org.apache.iotdb.commons.pipe.agent.plugin.meta; public class DataNodePipePluginMetaKeeper extends PipePluginMetaKeeper {} diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMeta.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/PipePluginMeta.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMeta.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/PipePluginMeta.java index 97a59da998c8..0fb2314a1cfc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMeta.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/PipePluginMeta.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.meta; +package org.apache.iotdb.commons.pipe.agent.plugin.meta; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMetaKeeper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/PipePluginMetaKeeper.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMetaKeeper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/PipePluginMetaKeeper.java index b1b515db95a7..52b6edd5744f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMetaKeeper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/meta/PipePluginMetaKeeper.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.meta; +package org.apache.iotdb.commons.pipe.agent.plugin.meta; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginClassLoader.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginClassLoader.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginClassLoader.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginClassLoader.java index 66b00a053936..a2bc1df1a279 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginClassLoader.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginClassLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.service; +package org.apache.iotdb.commons.pipe.agent.plugin.service; import org.apache.iotdb.commons.file.SystemFileFactory; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginClassLoaderManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginClassLoaderManager.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginClassLoaderManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginClassLoaderManager.java index ccc10e624ca9..a6bda955311c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginClassLoaderManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginClassLoaderManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.service; +package org.apache.iotdb.commons.pipe.agent.plugin.service; import org.apache.iotdb.commons.exception.StartupException; import org.apache.iotdb.commons.file.SystemFileFactory; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginExecutableManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginExecutableManager.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginExecutableManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginExecutableManager.java index a1477475c017..f113e33da07d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/service/PipePluginExecutableManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/plugin/service/PipePluginExecutableManager.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.plugin.service; +package org.apache.iotdb.commons.pipe.agent.plugin.service; import org.apache.iotdb.commons.executable.ExecutableManager; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.pipe.api.exception.PipeException; import org.apache.commons.codec.digest.DigestUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/PipeTask.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTask.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/PipeTask.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTask.java index e7cebafb0c84..f5717d780a2a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/PipeTask.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTask.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task; +package org.apache.iotdb.commons.pipe.agent.task; public interface PipeTask { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java index 67a224694f2c..56069df84173 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskAgent.java @@ -23,15 +23,13 @@ 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.pipe.agent.task.meta.PipeMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMetaKeeper; +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.connector.limiter.PipeEndPointRateLimiter; -import org.apache.iotdb.commons.pipe.task.PipeTask; -import org.apache.iotdb.commons.pipe.task.PipeTaskManager; -import org.apache.iotdb.commons.pipe.task.meta.PipeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeMetaKeeper; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatReq; import org.apache.iotdb.mpp.rpc.thrift.TPipeHeartbeatResp; import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaRespExceptionMessage; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/PipeTaskManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskManager.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/PipeTaskManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskManager.java index 42780cd66f0a..45c993f05da3 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/PipeTaskManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/PipeTaskManager.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task; +package org.apache.iotdb.commons.pipe.agent.task; -import org.apache.iotdb.commons.pipe.task.meta.PipeStaticMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import java.util.HashMap; import java.util.Map; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/BlockingPendingQueue.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/BlockingPendingQueue.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/BlockingPendingQueue.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/BlockingPendingQueue.java index e981818b87e7..83ad7f04727f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/BlockingPendingQueue.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/BlockingPendingQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.connection; +package org.apache.iotdb.commons.pipe.agent.task.connection; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/BoundedBlockingPendingQueue.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/BoundedBlockingPendingQueue.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/BoundedBlockingPendingQueue.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/BoundedBlockingPendingQueue.java index 737834f6e812..1146255a9d8d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/BoundedBlockingPendingQueue.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/BoundedBlockingPendingQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.connection; +package org.apache.iotdb.commons.pipe.agent.task.connection; import org.apache.iotdb.commons.pipe.metric.PipeEventCounter; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/EventSupplier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/EventSupplier.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/EventSupplier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/EventSupplier.java index 9e82b84552da..82b75ce19485 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/EventSupplier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/EventSupplier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task; +package org.apache.iotdb.commons.pipe.agent.task.connection; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/UnboundedBlockingPendingQueue.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/UnboundedBlockingPendingQueue.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/UnboundedBlockingPendingQueue.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/UnboundedBlockingPendingQueue.java index fe1542c75a91..785e89cfb9a8 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/connection/UnboundedBlockingPendingQueue.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/connection/UnboundedBlockingPendingQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.connection; +package org.apache.iotdb.commons.pipe.agent.task.connection; import org.apache.iotdb.commons.pipe.metric.PipeEventCounter; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/execution/executor/PipeSubtaskExecutor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/execution/PipeSubtaskExecutor.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/execution/executor/PipeSubtaskExecutor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/execution/PipeSubtaskExecutor.java index 886538050673..6130292cdf71 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/execution/executor/PipeSubtaskExecutor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/execution/PipeSubtaskExecutor.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.execution.executor; +package org.apache.iotdb.commons.pipe.agent.task.execution; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.concurrent.threadpool.WrappedThreadPoolExecutor; -import org.apache.iotdb.commons.pipe.execution.scheduler.PipeSubtaskScheduler; -import org.apache.iotdb.commons.pipe.task.subtask.PipeSubtask; +import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeSubtask; import org.apache.iotdb.commons.utils.TestOnly; import com.google.common.util.concurrent.ListeningExecutorService; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/execution/scheduler/PipeSubtaskScheduler.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/execution/PipeSubtaskScheduler.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/execution/scheduler/PipeSubtaskScheduler.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/execution/PipeSubtaskScheduler.java index b77efc025d79..de47a8176eaa 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/execution/scheduler/PipeSubtaskScheduler.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/execution/PipeSubtaskScheduler.java @@ -17,10 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.execution.scheduler; +package org.apache.iotdb.commons.pipe.agent.task.execution; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; public class PipeSubtaskScheduler { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeMeta.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeMeta.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeMeta.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeMeta.java index 2cdb6659a9a5..e536a3a7af2c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeMeta.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeMeta.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeMetaKeeper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeMetaKeeper.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeMetaKeeper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeMetaKeeper.java index 21dc5d208518..f8a8c9e55ac9 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeMetaKeeper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeMetaKeeper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeRuntimeMeta.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeRuntimeMeta.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeRuntimeMeta.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeRuntimeMeta.java index 729c9b667cb9..5223b6a9e8a1 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeRuntimeMeta.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeRuntimeMeta.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; import org.apache.iotdb.commons.consensus.ConfigRegionId; import org.apache.iotdb.commons.consensus.DataRegionId; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeRuntimeMetaVersion.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeRuntimeMetaVersion.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeRuntimeMetaVersion.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeRuntimeMetaVersion.java index 5dfd32b84fef..8264dbc3941a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeRuntimeMetaVersion.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeRuntimeMetaVersion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeStaticMeta.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeStaticMeta.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeStaticMeta.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeStaticMeta.java index d35086c693f8..4111a7292559 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeStaticMeta.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeStaticMeta.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeStatus.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeStatus.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeStatus.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeStatus.java index 74f6c3403f78..7898266c7120 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeStatus.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; public enum PipeStatus { RUNNING((byte) 0), diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeTaskMeta.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeTaskMeta.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeTaskMeta.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeTaskMeta.java index 3ced79577e97..627ae1fbf9a5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeTaskMeta.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeTaskMeta.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.ProgressIndexType; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeTemporaryMeta.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeTemporaryMeta.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeTemporaryMeta.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeTemporaryMeta.java index f444e6943b62..aeffe7fb3d97 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeTemporaryMeta.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeTemporaryMeta.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; import java.util.Collections; import java.util.Objects; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeType.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeType.java index 95fb893654ae..902322d8112d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/meta/PipeType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/meta/PipeType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.agent.task.meta; public enum PipeType { USER((byte) 0), diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/CommitterKey.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/CommitterKey.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/CommitterKey.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/CommitterKey.java index 4c92822c1e00..d135ba27a3e8 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/CommitterKey.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/CommitterKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.progress; +package org.apache.iotdb.commons.pipe.agent.task.progress; import java.util.Objects; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/PipeEventCommitManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/PipeEventCommitManager.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/PipeEventCommitManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/PipeEventCommitManager.java index 16fa8989878f..4d70679c6fef 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/PipeEventCommitManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/PipeEventCommitManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.progress; +package org.apache.iotdb.commons.pipe.agent.task.progress; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.metric.PipeEventCommitMetrics; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/PipeEventCommitter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/PipeEventCommitter.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/PipeEventCommitter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/PipeEventCommitter.java index 52e96894c81a..ba61f03f841e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/progress/PipeEventCommitter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/PipeEventCommitter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.progress; +package org.apache.iotdb.commons.pipe.agent.task.progress; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/stage/PipeTaskStage.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/stage/PipeTaskStage.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/stage/PipeTaskStage.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/stage/PipeTaskStage.java index d7d8bfe727e3..d31578761127 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/stage/PipeTaskStage.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/stage/PipeTaskStage.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.stage; +package org.apache.iotdb.commons.pipe.agent.task.stage; -import org.apache.iotdb.commons.pipe.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; import org.apache.iotdb.pipe.api.exception.PipeException; public abstract class PipeTaskStage { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeAbstractConnectorSubtask.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeAbstractConnectorSubtask.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeAbstractConnectorSubtask.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeAbstractConnectorSubtask.java index 6e520de1b76d..f228690a182a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeAbstractConnectorSubtask.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeAbstractConnectorSubtask.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.subtask; +package org.apache.iotdb.commons.pipe.agent.task.subtask; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorCriticalException; +import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskScheduler; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.execution.scheduler.PipeSubtaskScheduler; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.exception.PipeConnectionException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeReportableSubtask.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeReportableSubtask.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeReportableSubtask.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeReportableSubtask.java index cff90b88481f..aa50bdd75767 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeReportableSubtask.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeReportableSubtask.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.subtask; +package org.apache.iotdb.commons.pipe.agent.task.subtask; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorRetryTimesConfigurableException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeSubtask.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeSubtask.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeSubtask.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeSubtask.java index 493e272e7991..2da797c2b3b5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeSubtask.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/subtask/PipeSubtask.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.subtask; +package org.apache.iotdb.commons.pipe.agent.task.subtask; +import org.apache.iotdb.commons.pipe.agent.task.execution.PipeSubtaskScheduler; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.execution.scheduler.PipeSubtaskScheduler; import org.apache.iotdb.pipe.api.event.Event; import com.google.common.util.concurrent.FutureCallback; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskExtractorRuntimeEnvironment.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskExtractorRuntimeEnvironment.java index c6f64bf47b52..c546ab472785 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskExtractorRuntimeEnvironment.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskExtractorRuntimeEnvironment.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.pipe.config.plugin.env; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; public class PipeTaskExtractorRuntimeEnvironment extends PipeTaskRuntimeEnvironment { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskProcessorRuntimeEnvironment.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskProcessorRuntimeEnvironment.java index ba2a89db401c..6e5cf8879385 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskProcessorRuntimeEnvironment.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/plugin/env/PipeTaskProcessorRuntimeEnvironment.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.pipe.config.plugin.env; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; public class PipeTaskProcessorRuntimeEnvironment extends PipeTaskRuntimeEnvironment { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBConnector.java index e1f8f9ed1d5b..db58cec22ca9 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBConnector.java @@ -20,13 +20,13 @@ package org.apache.iotdb.commons.pipe.connector.protocol; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.pipe.connector.PipeReceiverStatusHandler; import org.apache.iotdb.commons.pipe.connector.compressor.PipeCompressor; import org.apache.iotdb.commons.pipe.connector.compressor.PipeCompressorConfig; import org.apache.iotdb.commons.pipe.connector.compressor.PipeCompressorFactory; import org.apache.iotdb.commons.pipe.connector.limiter.GlobalRateLimiter; import org.apache.iotdb.commons.pipe.connector.limiter.PipeEndPointRateLimiter; import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferCompressedReq; +import org.apache.iotdb.commons.pipe.receiver.PipeReceiverStatusHandler; import org.apache.iotdb.commons.utils.NodeUrlUtils; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.configuration.PipeConnectorRuntimeConfiguration; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java index b1a0174e75c6..a14cfe3e214f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java @@ -46,6 +46,9 @@ import java.util.List; import java.util.Map; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_SSL_CONNECTOR; +import static org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK; import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_KEY; 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; @@ -54,9 +57,6 @@ 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_KEY; import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_LEADER_CACHE_ENABLE_KEY; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_SSL_CONNECTOR; -import static org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin.IOTDB_THRIFT_SSL_SINK; public abstract class IoTDBSslSyncConnector extends IoTDBConnector { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/IoTDBPipePattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/IoTDBPipePattern.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/IoTDBPipePattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/IoTDBPipePattern.java index 4ca04ef35e15..5db5d113c01b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/IoTDBPipePattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/IoTDBPipePattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.pattern; +package org.apache.iotdb.commons.pipe.datastructure.pattern; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IllegalPathException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/PipePattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/PipePattern.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/PipePattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/PipePattern.java index 803c24621cf4..b6d37fa723ed 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/PipePattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/PipePattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.pattern; +package org.apache.iotdb.commons.pipe.datastructure.pattern; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/PrefixPipePattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/PrefixPipePattern.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/PrefixPipePattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/PrefixPipePattern.java index 52f70057052f..33bdf471a0ef 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/pattern/PrefixPipePattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/PrefixPipePattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.pattern; +package org.apache.iotdb.commons.pipe.datastructure.pattern; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.pipe.config.constant.PipeExtractorConstant; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/queue/listening/AbstractPipeListeningQueue.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/queue/listening/AbstractPipeListeningQueue.java index 403930be960f..c5d83845f5cc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/queue/listening/AbstractPipeListeningQueue.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/queue/listening/AbstractPipeListeningQueue.java @@ -19,11 +19,11 @@ package org.apache.iotdb.commons.pipe.datastructure.queue.listening; +import org.apache.iotdb.commons.pipe.agent.task.PipeTask; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.datastructure.queue.serializer.QueueSerializerType; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent; -import org.apache.iotdb.commons.pipe.task.PipeTask; import org.apache.iotdb.pipe.api.event.Event; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/EnrichedEvent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/EnrichedEvent.java index 7c7d6fe9ea26..39c1174f8ef0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/EnrichedEvent.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/EnrichedEvent.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.progress.CommitterKey; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.progress.CommitterKey; +import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.pipe.api.event.Event; import org.slf4j.Logger; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeSnapshotEvent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeSnapshotEvent.java index 1c6dd689e648..1a80d404bb15 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeSnapshotEvent.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeSnapshotEvent.java @@ -20,9 +20,9 @@ package org.apache.iotdb.commons.pipe.event; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.resource.PipeSnapshotResourceManager; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; +import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; import java.util.Set; import java.util.stream.Collectors; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeWritePlanEvent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeWritePlanEvent.java index 4a7a25dbd23a..01f3a881ac2e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeWritePlanEvent.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/PipeWritePlanEvent.java @@ -20,8 +20,8 @@ package org.apache.iotdb.commons.pipe.event; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; public abstract class PipeWritePlanEvent extends EnrichedEvent implements SerializableEvent { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/ProgressReportEvent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/ProgressReportEvent.java index 700f8f163874..d87a5196b72c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/ProgressReportEvent.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/ProgressReportEvent.java @@ -20,8 +20,8 @@ package org.apache.iotdb.commons.pipe.event; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; /** * {@link ProgressReportEvent} is an {@link EnrichedEvent} that is used only for progress report. It diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBExtractor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBExtractor.java index 77eeb3aa91e9..2d3a1615f00e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBExtractor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBExtractor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.commons.pipe.extractor; +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.plugin.env.PipeTaskExtractorRuntimeEnvironment; -import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.pipe.api.PipeExtractor; import org.apache.iotdb.pipe.api.customizer.configuration.PipeExtractorRuntimeConfiguration; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBNonDataRegionExtractor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBNonDataRegionExtractor.java index a67e818be983..2815ae5e0613 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBNonDataRegionExtractor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/extractor/IoTDBNonDataRegionExtractor.java @@ -22,14 +22,14 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MetaProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBPipePattern; +import org.apache.iotdb.commons.pipe.datastructure.pattern.PipePattern; import org.apache.iotdb.commons.pipe.datastructure.queue.ConcurrentIterableLinkedQueue; import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeListeningQueue; 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.event.ProgressReportEvent; -import org.apache.iotdb.commons.pipe.pattern.IoTDBPipePattern; -import org.apache.iotdb.commons.pipe.pattern.PipePattern; import org.apache.iotdb.pipe.api.customizer.configuration.PipeExtractorRuntimeConfiguration; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/metric/PipeEventCommitMetrics.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/metric/PipeEventCommitMetrics.java index 1cf32c4a71ac..f61adc2e19fd 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/metric/PipeEventCommitMetrics.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/metric/PipeEventCommitMetrics.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.pipe.metric; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitter; +import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitter; import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; import org.apache.iotdb.metrics.AbstractMetricService; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/PipeReceiverStatusHandler.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/PipeReceiverStatusHandler.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java index 92a4f07019a6..0f87d361bb0b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/PipeReceiverStatusHandler.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/receiver/PipeReceiverStatusHandler.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.connector; +package org.apache.iotdb.commons.pipe.receiver; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorRetryTimesConfigurableException; -import org.apache.iotdb.commons.pipe.task.subtask.PipeSubtask; +import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeSubtask; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.exception.PipeException; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/resource/PipeSnapshotResourceManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/resource/snapshot/PipeSnapshotResourceManager.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/resource/PipeSnapshotResourceManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/resource/snapshot/PipeSnapshotResourceManager.java index ae6d38033571..6b134d172056 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/resource/PipeSnapshotResourceManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/resource/snapshot/PipeSnapshotResourceManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.resource; +package org.apache.iotdb.commons.pipe.resource.snapshot; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.TestOnly; diff --git a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionTest.java b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionTest.java index c40903cd1cce..b6768ea8c0da 100644 --- a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionTest.java +++ b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/exception/pipe/PipeRuntimeExceptionTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.commons.exception.pipe; -import org.apache.iotdb.commons.pipe.task.meta.PipeRuntimeMetaVersion; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMetaVersion; import org.junit.Assert; import org.junit.Test; diff --git a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java index ae8150afbe1e..607e772e5f23 100644 --- a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java +++ b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.commons.pipe.plugin.builtin; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.donothing.DoNothingConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift.IoTDBLegacyPipeConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.connector.iotdb.thrift.IoTDBThriftConnector; -import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.iotdb.IoTDBExtractor; -import org.apache.iotdb.commons.pipe.plugin.builtin.processor.donothing.DoNothingProcessor; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.donothing.DoNothingConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBLegacyPipeConnector; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.connector.iotdb.thrift.IoTDBThriftConnector; +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.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.PipeExtractor; import org.apache.iotdb.pipe.api.PipeProcessor; diff --git a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMetaTest.java b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMetaTest.java index 9ce3305751d1..b5b854adc4de 100644 --- a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMetaTest.java +++ b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/meta/PipePluginMetaTest.java @@ -19,7 +19,9 @@ package org.apache.iotdb.commons.pipe.plugin.meta; -import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.ConfigNodePipePluginMetaKeeper; +import org.apache.iotdb.commons.pipe.agent.plugin.meta.DataNodePipePluginMetaKeeper; import org.junit.Assert; import org.junit.Test; diff --git a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/task/meta/PipeMetaDeSerTest.java b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/task/PipeMetaDeSerTest.java similarity index 94% rename from iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/task/meta/PipeMetaDeSerTest.java rename to iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/task/PipeMetaDeSerTest.java index 3a0fd3646fec..ad77c8c3901d 100644 --- a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/task/meta/PipeMetaDeSerTest.java +++ b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/task/PipeMetaDeSerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.task.meta; +package org.apache.iotdb.commons.pipe.task; import org.apache.iotdb.commons.consensus.index.impl.HybridProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; @@ -28,6 +28,11 @@ import org.apache.iotdb.commons.consensus.index.impl.TimeWindowStateProgressIndex; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; +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; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStatus; +import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.tsfile.utils.Pair; import org.apache.tsfile.utils.PublicBAOS;