This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch refactor-pipe-package in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fd0ab7e2c8df560913491421ebb42bb74128d234 Author: Steve Yurong Su <[email protected]> AuthorDate: Mon Sep 23 10:49:50 2024 +0800 Pipe: Refactor pipe related packages --- .../manager/pipe/extractor/IoTDBConfigRegionExtractor.java | 2 +- .../manager/pipe/metric/PipeConfigNodeRemainingTimeMetrics.java | 2 +- .../manager/pipe/metric/PipeConfigNodeRemainingTimeOperator.java | 2 +- .../manager/pipe/metric/PipeConfigRegionConnectorMetrics.java | 2 +- .../manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java | 2 +- .../pipe/resource/PipeConfigNodeCopiedFileDirStartupCleaner.java | 2 +- .../manager/pipe/resource/PipeConfigNodeResourceManager.java | 3 +-- .../{snapshot => }/PipeConfigNodeSnapshotResourceManager.java | 4 ++-- .../manager/pipe/{execution => task}/PipeConfigNodeSubtask.java | 4 ++-- .../pipe/{execution => task}/PipeConfigNodeSubtaskExecutor.java | 4 ++-- .../iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskStage.java | 2 -- .../java/org/apache/iotdb/confignode/persistence/pipe/PipeInfo.java | 2 +- .../manager/pipe/execution/PipeConfigNodeSubtaskExecutorTest.java | 4 +++- .../iotdb/db/pipe/agent/runtime/PipeDataNodeRuntimeAgent.java | 1 - .../{progress => agent/runtime}/SimpleProgressIndexAssigner.java | 2 +- .../protocol/pipeconsensus/PipeConsensusAsyncConnector.java | 2 +- .../iotdb/db/pipe/consensus/PipeConsensusSubtaskExecutor.java | 2 +- .../dataregion/realtime/assigner/PipeDataRegionAssigner.java | 4 ++-- .../dataregion/realtime}/pattern/CachedSchemaPatternMatcher.java | 2 +- .../dataregion/realtime}/pattern/PipeDataRegionMatcher.java | 2 +- .../db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java | 2 +- .../db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java | 2 +- .../resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java | 2 +- .../apache/iotdb/db/pipe/resource/PipeDataNodeResourceManager.java | 2 +- .../pipe/resource/snapshot/PipeDataNodeSnapshotResourceManager.java | 2 +- .../apache/iotdb/db/pipe/task/builder/PipeDataNodeTaskBuilder.java | 6 +++--- .../apache/iotdb/db/pipe/task/connection/PipeEventCollector.java | 2 +- .../db/pipe/{ => task}/execution/PipeConnectorSubtaskExecutor.java | 4 ++-- .../db/pipe/{ => task}/execution/PipeProcessorSubtaskExecutor.java | 4 ++-- .../db/pipe/{ => task}/execution/PipeSubtaskExecutorManager.java | 2 +- .../org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java | 2 +- .../org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java | 2 +- .../pipe/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java | 2 +- .../db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java | 4 ++-- .../iotdb/db/pipe/task/subtask/processor/PipeProcessorSubtask.java | 4 ++-- .../execution/executor/SubscriptionSubtaskExecutor.java | 2 +- .../db/subscription/task/stage/SubscriptionTaskConnectorStage.java | 2 +- .../task/subtask/SubscriptionConnectorSubtaskLifeCycle.java | 2 +- .../task/subtask/SubscriptionConnectorSubtaskManager.java | 4 ++-- .../iotdb/db/pipe/execution/PipeConnectorSubtaskExecutorTest.java | 1 + .../iotdb/db/pipe/execution/PipeProcessorSubtaskExecutorTest.java | 1 + .../org/apache/iotdb/db/pipe/execution/PipeSubtaskExecutorTest.java | 2 +- .../iotdb/db/pipe/pattern/CachedSchemaPatternMatcherTest.java | 1 + .../iotdb/commons/pipe/connector/protocol/IoTDBConnector.java | 2 +- .../java/org/apache/iotdb/commons/pipe/event/EnrichedEvent.java | 4 ++-- .../java/org/apache/iotdb/commons/pipe/event/PipeSnapshotEvent.java | 2 +- .../apache/iotdb/commons/pipe/metric/PipeEventCommitMetrics.java | 2 +- .../pipe/{connector => receiver}/PipeReceiverStatusHandler.java | 2 +- .../pipe/resource/{ => snapshot}/PipeSnapshotResourceManager.java | 2 +- .../pipe/{ => task}/execution/executor/PipeSubtaskExecutor.java | 4 ++-- .../pipe/{ => task}/execution/scheduler/PipeSubtaskScheduler.java | 4 ++-- .../apache/iotdb/commons/pipe/{ => task}/progress/CommitterKey.java | 2 +- .../commons/pipe/{ => task}/progress/PipeEventCommitManager.java | 2 +- .../iotdb/commons/pipe/{ => task}/progress/PipeEventCommitter.java | 2 +- .../commons/pipe/task/subtask/PipeAbstractConnectorSubtask.java | 2 +- .../org/apache/iotdb/commons/pipe/task/subtask/PipeSubtask.java | 2 +- 56 files changed, 70 insertions(+), 69 deletions(-) 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 ea897465b8b..0ece290e60c 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 @@ -26,7 +26,7 @@ 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.commons.pipe.task.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/metric/PipeConfigNodeRemainingTimeMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeRemainingTimeMetrics.java index e3dbbed5d6c..555f313dece 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.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 7a5044b0c61..d8b8c9940da 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,8 +22,8 @@ package org.apache.iotdb.confignode.manager.pipe.metric; 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.extractor.IoTDBConfigRegionExtractor; +import org.apache.iotdb.confignode.manager.pipe.task.PipeConfigNodeSubtask; import com.codahale.metrics.Clock; import com.codahale.metrics.ExponentialMovingAverages; 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 8fcb6fd9029..82e73c27e7f 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 @@ package org.apache.iotdb.confignode.manager.pipe.metric; 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.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/receiver/protocol/IoTDBConfigNodeReceiver.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java index 711d7bdf26c..e1b8a4e334b 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,7 +21,6 @@ package org.apache.iotdb.confignode.manager.pipe.receiver.protocol; 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; @@ -29,6 +28,7 @@ import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransf 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.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 1c4e2288c4e..a60d3a7fa65 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 3500d26e3c2..c13548c1d09 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 17769654560..43f9f851ffa 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/manager/pipe/execution/PipeConfigNodeSubtask.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeSubtask.java similarity index 98% 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/task/PipeConfigNodeSubtask.java index ec3453c0917..e7ebd30f8b0 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/task/PipeConfigNodeSubtask.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.confignode.manager.pipe.execution; +package org.apache.iotdb.confignode.manager.pipe.task; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; import org.apache.iotdb.commons.pipe.config.constant.PipeProcessorConstant; @@ -27,8 +27,8 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskRuntimeEnvironmen 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.progress.PipeEventCommitManager; 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; 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/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/task/PipeConfigNodeSubtaskExecutor.java index 6041c5bf82d..2e948853edc 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/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.task; import org.apache.iotdb.commons.concurrent.ThreadName; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.task.execution.executor.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/PipeConfigNodeTaskStage.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/task/PipeConfigNodeTaskStage.java index 7e676903857..523cd2e6da6 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/task/PipeConfigNodeTaskStage.java @@ -21,8 +21,6 @@ package org.apache.iotdb.confignode.manager.pipe.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.pipe.api.exception.PipeException; import java.util.Map; 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 7c1823a7d0c..c0514363f16 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 @@ -32,8 +32,8 @@ import org.apache.iotdb.confignode.consensus.request.write.pipe.task.SetPipeStat 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.PipeConfigNodeTaskAgent; -import org.apache.iotdb.confignode.manager.pipe.execution.PipeConfigNodeSubtask; import org.apache.iotdb.confignode.manager.pipe.metric.PipeTemporaryMetaMetrics; +import org.apache.iotdb.confignode.manager.pipe.task.PipeConfigNodeSubtask; import org.apache.iotdb.mpp.rpc.thrift.TPushPipeMetaRespExceptionMessage; import org.apache.iotdb.pipe.api.exception.PipeException; 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/execution/PipeConfigNodeSubtaskExecutorTest.java index 16d949d1dcb..9f602a6d53c 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/execution/PipeConfigNodeSubtaskExecutorTest.java @@ -21,10 +21,12 @@ package org.apache.iotdb.confignode.manager.pipe.execution; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; 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.execution.executor.PipeSubtaskExecutor; 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.task.PipeConfigNodeSubtask; +import org.apache.iotdb.confignode.manager.pipe.task.PipeConfigNodeSubtaskExecutor; import org.junit.After; import org.junit.Assert; 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 dcf9f8b0435..effa9d9d31e 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 @@ -34,7 +34,6 @@ 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/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 766945a934b..2288e546785 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/connector/protocol/pipeconsensus/PipeConsensusAsyncConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/PipeConsensusAsyncConnector.java index 3f6ed02aeb1..9d8e28f7637 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 @@ -30,7 +30,7 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorRetryTimesConfigurableException; import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBConnector; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; +import org.apache.iotdb.commons.pipe.task.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/consensus/PipeConsensusSubtaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/consensus/PipeConsensusSubtaskExecutor.java index 175a95992cf..4eec017bab7 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 @@ package org.apache.iotdb.db.pipe.consensus; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.task.execution.PipeConnectorSubtaskExecutor; public class PipeConsensusSubtaskExecutor extends PipeConnectorSubtaskExecutor { 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 1f2500c1839..3887c32ab34 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.common.tsfile.PipeTsFileInsertionEvent; 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.pattern.CachedSchemaPatternMatcher; +import org.apache.iotdb.db.pipe.extractor.dataregion.realtime.pattern.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/pattern/CachedSchemaPatternMatcher.java similarity index 99% 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/pattern/CachedSchemaPatternMatcher.java index 546d8185c3a..abf2d7fb59e 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/pattern/CachedSchemaPatternMatcher.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.pattern; +package org.apache.iotdb.db.pipe.extractor.dataregion.realtime.pattern; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.pattern.PipePattern; 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/pattern/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/pattern/PipeDataRegionMatcher.java index 5132d6fb494..f1967a5e10a 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/pattern/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.pattern; 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/metric/PipeDataNodeRemainingEventAndTimeMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/metric/PipeDataNodeRemainingEventAndTimeMetrics.java index 83426a500c3..149f0bcb246 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,7 +19,7 @@ package org.apache.iotdb.db.pipe.metric; -import org.apache.iotdb.commons.pipe.progress.PipeEventCommitManager; +import org.apache.iotdb.commons.pipe.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.extractor.dataregion.IoTDBDataRegionExtractor; 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 8eec846bad1..025b0c6f6f0 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 @@ package org.apache.iotdb.db.pipe.receiver.protocol.thrift; 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; @@ -32,6 +31,7 @@ import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransf 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.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/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/PipeDataNodeHardlinkOrCopiedFileDirStartupCleaner.java index a97ae5b1d47..b58d934988f 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 83901ddcfca..74afd58681f 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 8e286a9a569..8e197d31a9b 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/pipe/task/builder/PipeDataNodeTaskBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/builder/PipeDataNodeTaskBuilder.java index 85ea6980212..c2e2f311ef2 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/task/builder/PipeDataNodeTaskBuilder.java @@ -26,11 +26,11 @@ 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.extractor.dataregion.DataRegionListeningFilter; import org.apache.iotdb.db.pipe.task.PipeDataNodeTask; +import org.apache.iotdb.db.pipe.task.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.task.execution.PipeProcessorSubtaskExecutor; +import org.apache.iotdb.db.pipe.task.execution.PipeSubtaskExecutorManager; 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; 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/task/connection/PipeEventCollector.java index de0ede99623..b5a09280797 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/task/connection/PipeEventCollector.java @@ -22,8 +22,8 @@ package org.apache.iotdb.db.pipe.task.connection; 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.commons.pipe.task.progress.PipeEventCommitManager; 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/task/execution/PipeConnectorSubtaskExecutor.java similarity index 91% 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/task/execution/PipeConnectorSubtaskExecutor.java index ea03c8ce4a0..7ceb23c81bc 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/task/execution/PipeConnectorSubtaskExecutor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.task.execution; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.task.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/task/execution/PipeProcessorSubtaskExecutor.java similarity index 90% 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/task/execution/PipeProcessorSubtaskExecutor.java index 6d5a8ca89fc..6ad71de4522 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/task/execution/PipeProcessorSubtaskExecutor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.task.execution; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.task.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/task/execution/PipeSubtaskExecutorManager.java similarity index 98% 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/task/execution/PipeSubtaskExecutorManager.java index 78db8931522..687dd19ea40 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/task/execution/PipeSubtaskExecutorManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.execution; +package org.apache.iotdb.db.pipe.task.execution; import org.apache.iotdb.db.pipe.consensus.PipeConsensusSubtaskExecutor; import org.apache.iotdb.db.subscription.execution.executor.SubscriptionSubtaskExecutor; 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/task/stage/PipeTaskConnectorStage.java index a5ec4fed78b..29a65db3ed9 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/task/stage/PipeTaskConnectorStage.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.pipe.task.stage; 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.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtaskManager; 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/pipe/task/stage/PipeTaskProcessorStage.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java index e7ab0cb1997..987397d7def 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/task/stage/PipeTaskProcessorStage.java @@ -29,8 +29,8 @@ import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQue 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.execution.PipeProcessorSubtaskExecutor; import org.apache.iotdb.db.pipe.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; 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/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java index 26c18b3dad6..d3373436387 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/task/subtask/connector/PipeConnectorSubtaskLifeCycle.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.task.subtask.connector; import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; +import org.apache.iotdb.db.pipe.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/task/subtask/connector/PipeConnectorSubtaskManager.java index 5bb14073648..8534e3f4519 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/task/subtask/connector/PipeConnectorSubtaskManager.java @@ -25,12 +25,12 @@ 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.commons.pipe.task.progress.PipeEventCommitManager; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.db.pipe.metric.PipeDataNodeRemainingEventAndTimeMetrics; import org.apache.iotdb.db.pipe.metric.PipeDataRegionEventCounter; +import org.apache.iotdb.db.pipe.task.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator; 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/task/subtask/processor/PipeProcessorSubtask.java index ff17a11d8b1..6f6daf69bb7 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/task/subtask/processor/PipeProcessorSubtask.java @@ -23,9 +23,9 @@ 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.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.execution.scheduler.PipeSubtaskScheduler; +import org.apache.iotdb.commons.pipe.task.progress.PipeEventCommitManager; import org.apache.iotdb.commons.pipe.task.subtask.PipeReportableSubtask; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.UserDefinedEnrichedEvent; 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/execution/executor/SubscriptionSubtaskExecutor.java index 84a8e08d232..42ed23200f5 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/execution/executor/SubscriptionSubtaskExecutor.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.subscription.execution.executor; 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.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 040eccced45..95dfa27d7e6 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 @@ -21,7 +21,7 @@ package org.apache.iotdb.db.subscription.task.stage; 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.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.db.pipe.task.stage.PipeTaskConnectorStage; import org.apache.iotdb.db.subscription.task.subtask.SubscriptionConnectorSubtaskManager; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; 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 7e7f5fa1d21..1251a259a93 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 @@ -20,7 +20,7 @@ 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.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.db.subscription.agent.SubscriptionAgent; 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 377790836fb..d84575fc7f0 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 @@ -24,11 +24,11 @@ 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.commons.pipe.task.progress.PipeEventCommitManager; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; -import org.apache.iotdb.db.pipe.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.db.pipe.metric.PipeDataRegionEventCounter; +import org.apache.iotdb.db.pipe.task.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.db.pipe.task.subtask.connector.PipeRealtimePriorityBlockingQueue; 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/execution/PipeConnectorSubtaskExecutorTest.java index e83c8500a48..8d769f7c95d 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/execution/PipeConnectorSubtaskExecutorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.pipe.execution; import org.apache.iotdb.commons.pipe.task.connection.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.execution.PipeConnectorSubtaskExecutor; import org.apache.iotdb.db.pipe.task.subtask.connector.PipeConnectorSubtask; import org.apache.iotdb.pipe.api.PipeConnector; 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/execution/PipeProcessorSubtaskExecutorTest.java index 53e62831dfe..9fb19b40f64 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/execution/PipeProcessorSubtaskExecutorTest.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.pipe.execution; import org.apache.iotdb.commons.pipe.task.EventSupplier; import org.apache.iotdb.db.pipe.task.connection.PipeEventCollector; +import org.apache.iotdb.db.pipe.task.execution.PipeProcessorSubtaskExecutor; import org.apache.iotdb.db.pipe.task.subtask.processor.PipeProcessorSubtask; import org.apache.iotdb.pipe.api.PipeProcessor; 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/execution/PipeSubtaskExecutorTest.java index a48924a1a46..fd8dad6d405 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/execution/PipeSubtaskExecutorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.execution; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.task.execution.executor.PipeSubtaskExecutor; import org.apache.iotdb.commons.pipe.task.subtask.PipeSubtask; import org.junit.After; 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 e959782d2aa..b4ed66a0559 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 @@ -28,6 +28,7 @@ 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.pattern.CachedSchemaPatternMatcher; 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/connector/protocol/IoTDBConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBConnector.java index e1f8f9ed1d5..db58cec22ca 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/event/EnrichedEvent.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/event/EnrichedEvent.java index 7c7d6fe9ea2..37c5e7a580c 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 @@ -22,9 +22,9 @@ package org.apache.iotdb.commons.pipe.event; 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.task.progress.CommitterKey; +import org.apache.iotdb.commons.pipe.task.progress.PipeEventCommitManager; 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 1c6dd689e64..65ecb190cee 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 @@ -21,7 +21,7 @@ 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.resource.snapshot.PipeSnapshotResourceManager; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import java.util.Set; 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 1cf32c4a71a..8dbe673544e 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.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 99% 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 92a4f07019a..7f84cc602ad 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,7 +17,7 @@ * 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; 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 ae6d3803357..6b134d17205 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/main/java/org/apache/iotdb/commons/pipe/execution/executor/PipeSubtaskExecutor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/execution/executor/PipeSubtaskExecutor.java similarity index 97% 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/task/execution/executor/PipeSubtaskExecutor.java index 88653805067..b6ca6d8fa91 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/task/execution/executor/PipeSubtaskExecutor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.execution.executor; +package org.apache.iotdb.commons.pipe.task.execution.executor; 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.execution.scheduler.PipeSubtaskScheduler; import org.apache.iotdb.commons.pipe.task.subtask.PipeSubtask; import org.apache.iotdb.commons.utils.TestOnly; 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/task/execution/scheduler/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/task/execution/scheduler/PipeSubtaskScheduler.java index b77efc025d7..64de8873b5f 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/task/execution/scheduler/PipeSubtaskScheduler.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.execution.scheduler; +package org.apache.iotdb.commons.pipe.task.execution.scheduler; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.commons.pipe.execution.executor.PipeSubtaskExecutor; +import org.apache.iotdb.commons.pipe.task.execution.executor.PipeSubtaskExecutor; public class PipeSubtaskScheduler { 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/task/progress/CommitterKey.java similarity index 98% 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/task/progress/CommitterKey.java index 4c92822c1e0..609c41a173d 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/task/progress/CommitterKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.progress; +package org.apache.iotdb.commons.pipe.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/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/task/progress/PipeEventCommitManager.java index 16fa8989878..21ecbab9d8c 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/task/progress/PipeEventCommitManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.progress; +package org.apache.iotdb.commons.pipe.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/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/task/progress/PipeEventCommitter.java index 52e96894c81..32ef91d0e6c 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/task/progress/PipeEventCommitter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.pipe.progress; +package org.apache.iotdb.commons.pipe.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/subtask/PipeAbstractConnectorSubtask.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeAbstractConnectorSubtask.java index 6e520de1b76..78f42ca1d2c 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/task/subtask/PipeAbstractConnectorSubtask.java @@ -22,7 +22,7 @@ package org.apache.iotdb.commons.pipe.task.subtask; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorCriticalException; 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.commons.pipe.task.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/PipeSubtask.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/task/subtask/PipeSubtask.java index 493e272e799..d5309479cc4 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/task/subtask/PipeSubtask.java @@ -20,7 +20,7 @@ package org.apache.iotdb.commons.pipe.task.subtask; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.commons.pipe.execution.scheduler.PipeSubtaskScheduler; +import org.apache.iotdb.commons.pipe.task.execution.scheduler.PipeSubtaskScheduler; import org.apache.iotdb.pipe.api.event.Event; import com.google.common.util.concurrent.FutureCallback;
