This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch pipe-package-refactor in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 325a8bcb2fa7948e8909927654c5baf05bbc2493 Author: Steve Yurong Su <[email protected]> AuthorDate: Wed Jun 7 02:41:57 2023 +0800 Pipe: refactor package structure (db-main) --- .../db/engine/storagegroup/TsFileProcessor.java | 2 +- .../pipe/agent/receiver/IoTDBThriftReceiver.java | 2 +- .../db/pipe/agent/receiver/PipeReceiverAgent.java | 4 +- .../collector/IoTDBDataRegionCollector.java | 18 +++---- .../PipeHistoricalDataRegionCollector.java | 2 +- .../PipeHistoricalDataRegionTsFileCollector.java | 4 +- .../realtime/PipeRealtimeDataRegionCollector.java | 6 +-- .../PipeRealtimeDataRegionFakeCollector.java | 4 +- .../PipeRealtimeDataRegionHybridCollector.java | 8 ++-- .../PipeRealtimeDataRegionLogCollector.java | 8 ++-- .../PipeRealtimeDataRegionTsFileCollector.java | 8 ++-- .../realtime/assigner/DisruptorQueue.java | 2 +- .../realtime/assigner/PipeDataRegionAssigner.java | 10 ++-- .../realtime/epoch}/TsFileEpoch.java | 4 +- .../realtime/epoch}/TsFileEpochManager.java | 7 +-- .../realtime/epoch}/TsFileEpochStateMigrator.java | 2 +- .../listener/PipeInsertionDataNodeListener.java | 8 ++-- .../matcher/CachedSchemaPatternMatcher.java | 6 +-- .../realtime/matcher/PipeDataRegionMatcher.java | 6 +-- .../IoTDBThriftConnectorClient.java | 2 +- .../IoTDBThriftConnectorVersion.java | 2 +- .../v1/IoTDBThriftConnectorV1.java | 22 ++++----- .../v1/IoTDBThriftReceiverV1.java | 16 +++---- .../iotdb => connector}/v1/PipeRequestType.java | 2 +- .../v1/reponse/PipeTransferFilePieceResp.java | 2 +- .../v1/request/PipeTransferFilePieceReq.java | 6 +-- .../v1/request/PipeTransferFileSealReq.java | 6 +-- .../v1/request/PipeTransferHandshakeReq.java | 6 +-- .../v1/request/PipeTransferInsertNodeReq.java | 6 +-- .../v1/request/PipeTransferTabletReq.java | 6 +-- .../PipeHistoricalDataRegionFakeCollector.java | 56 ---------------------- .../db/pipe/{core => }/event/EnrichedEvent.java | 2 +- .../view/access => event/common/row}/PipeRow.java | 2 +- .../common/row}/PipeRowCollector.java | 5 +- .../PipeInsertNodeTabletInsertionEvent.java | 5 +- .../tablet}/PipeRawTabletInsertionEvent.java | 3 +- .../tablet}/TabletInsertionDataContainer.java | 6 +-- .../common/tsfile}/PipeTsFileInsertionEvent.java | 5 +- .../tsfile}/TsFileInsertionDataContainer.java | 4 +- .../tsfile}/TsFileInsertionDataTabletIterator.java | 2 +- .../event/realtime/PipeRealtimeCollectEvent.java | 5 +- .../realtime/PipeRealtimeCollectEventFactory.java | 7 +-- .../processor/PipeDoNothingProcessor.java | 4 +- .../BlockingPendingQueue.java | 2 +- .../BoundedBlockingPendingQueue.java | 2 +- .../task/{queue => connection}/EventSupplier.java | 2 +- .../connection}/PipeEventCollector.java | 5 +- .../UnboundedBlockingPendingQueue.java | 2 +- .../db/pipe/task/stage/PipeTaskCollectorStage.java | 6 +-- .../db/pipe/task/stage/PipeTaskConnectorStage.java | 4 +- .../db/pipe/task/stage/PipeTaskProcessorStage.java | 10 ++-- .../db/pipe/task/subtask/PipeConnectorSubtask.java | 4 +- .../subtask}/PipeConnectorSubtaskLifeCycle.java | 5 +- .../subtask}/PipeConnectorSubtaskManager.java | 7 ++- .../db/pipe/task/subtask/PipeProcessorSubtask.java | 2 +- .../iotdb/db/pipe/task/subtask/PipeSubtask.java | 2 +- .../collector/CachedSchemaPatternMatcherTest.java | 6 +-- .../core/collector/PipeRealtimeCollectTest.java | 8 ++-- .../pipe/core/connector/PipeThriftRequestTest.java | 10 ++-- .../core/event/PipeTabletInsertionEventTest.java | 4 +- .../event/TsFileInsertionDataContainerTest.java | 4 +- .../executor/PipeConnectorSubtaskExecutorTest.java | 2 +- .../executor/PipeProcessorSubtaskExecutorTest.java | 2 +- 63 files changed, 161 insertions(+), 221 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java index cbc609e3605..656e30b40f1 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java @@ -53,7 +53,7 @@ import org.apache.iotdb.db.mpp.metric.QueryResourceMetricSet; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode; -import org.apache.iotdb.db.pipe.core.collector.realtime.listener.PipeInsertionDataNodeListener; +import org.apache.iotdb.db.pipe.collector.realtime.listener.PipeInsertionDataNodeListener; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.rescon.MemTableManager; import org.apache.iotdb.db.rescon.PrimitiveArrayManager; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/IoTDBThriftReceiver.java b/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/IoTDBThriftReceiver.java index 81d6fef23d0..4230ee73a34 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/IoTDBThriftReceiver.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/IoTDBThriftReceiver.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.agent.receiver; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.iotdb.service.rpc.thrift.TPipeTransferResp; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java b/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java index ab48a9f6149..fdeda91ea56 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java @@ -21,8 +21,8 @@ package org.apache.iotdb.db.pipe.agent.receiver; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.IoTDBThriftReceiverV1; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftReceiverV1; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/IoTDBDataRegionCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/IoTDBDataRegionCollector.java similarity index 92% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/IoTDBDataRegionCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/IoTDBDataRegionCollector.java index 757599f2b24..663ee0d8f43 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/IoTDBDataRegionCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/IoTDBDataRegionCollector.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector; +package org.apache.iotdb.db.pipe.collector; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.engine.StorageEngine; +import org.apache.iotdb.db.pipe.collector.historical.PipeHistoricalDataRegionCollector; +import org.apache.iotdb.db.pipe.collector.historical.PipeHistoricalDataRegionTsFileCollector; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionFakeCollector; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionHybridCollector; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionLogCollector; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionTsFileCollector; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.collector.historical.PipeHistoricalDataRegionCollector; -import org.apache.iotdb.db.pipe.core.collector.historical.PipeHistoricalDataRegionTsFileCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionFakeCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionHybridCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionLogCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionTsFileCollector; -import org.apache.iotdb.db.pipe.task.queue.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.PipeCollector; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.PipeParameters; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/historical/PipeHistoricalDataRegionCollector.java similarity index 94% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/historical/PipeHistoricalDataRegionCollector.java index b5eb71c8df0..beb96f8f26b 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/historical/PipeHistoricalDataRegionCollector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.historical; +package org.apache.iotdb.db.pipe.collector.historical; import org.apache.iotdb.pipe.api.PipeCollector; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionTsFileCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/historical/PipeHistoricalDataRegionTsFileCollector.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionTsFileCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/historical/PipeHistoricalDataRegionTsFileCollector.java index 583cbd5d853..8a6f21603e9 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionTsFileCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/historical/PipeHistoricalDataRegionTsFileCollector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.historical; +package org.apache.iotdb.db.pipe.collector.historical; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; @@ -28,7 +28,7 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileManager; import org.apache.iotdb.db.engine.storagegroup.TsFileNameGenerator; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.event.impl.PipeTsFileInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.PipeParameters; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionCollector.java similarity index 92% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionCollector.java index 46d81b05ed0..658da872795 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionCollector.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime; +package org.apache.iotdb.db.pipe.collector.realtime; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.db.pipe.collector.realtime.listener.PipeInsertionDataNodeListener; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.collector.realtime.listener.PipeInsertionDataNodeListener; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; import org.apache.iotdb.pipe.api.PipeCollector; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.PipeParameters; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionFakeCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionFakeCollector.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionFakeCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionFakeCollector.java index a559472f290..bd0913132b5 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionFakeCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionFakeCollector.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime; +package org.apache.iotdb.db.pipe.collector.realtime; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.PipeParameters; import org.apache.iotdb.pipe.api.customizer.collector.PipeCollectorRuntimeConfiguration; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionHybridCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionHybridCollector.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionHybridCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionHybridCollector.java index cf01a1ea15a..50349097d50 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionHybridCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionHybridCollector.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime; +package org.apache.iotdb.db.pipe.collector.realtime; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.agent.PipeAgent; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; -import org.apache.iotdb.db.pipe.core.event.realtime.TsFileEpoch; -import org.apache.iotdb.db.pipe.task.queue.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.collector.realtime.epoch.TsFileEpoch; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionLogCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionLogCollector.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionLogCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionLogCollector.java index 3263e52c1e6..845637b5f85 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionLogCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionLogCollector.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime; +package org.apache.iotdb.db.pipe.collector.realtime; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.agent.PipeAgent; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; -import org.apache.iotdb.db.pipe.core.event.realtime.TsFileEpoch; -import org.apache.iotdb.db.pipe.task.queue.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.collector.realtime.epoch.TsFileEpoch; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionTsFileCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionTsFileCollector.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionTsFileCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionTsFileCollector.java index 7b287b10545..da0c1fb90c3 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/PipeRealtimeDataRegionTsFileCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/PipeRealtimeDataRegionTsFileCollector.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime; +package org.apache.iotdb.db.pipe.collector.realtime; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.agent.PipeAgent; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; -import org.apache.iotdb.db.pipe.core.event.realtime.TsFileEpoch; -import org.apache.iotdb.db.pipe.task.queue.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.collector.realtime.epoch.TsFileEpoch; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/assigner/DisruptorQueue.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/assigner/DisruptorQueue.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/assigner/DisruptorQueue.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/assigner/DisruptorQueue.java index f0dc0a461be..885913a44cf 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/assigner/DisruptorQueue.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/assigner/DisruptorQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime.assigner; +package org.apache.iotdb.db.pipe.collector.realtime.assigner; import org.apache.iotdb.commons.pipe.config.PipeConfig; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/assigner/PipeDataRegionAssigner.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/assigner/PipeDataRegionAssigner.java similarity index 87% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/assigner/PipeDataRegionAssigner.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/assigner/PipeDataRegionAssigner.java index 4b7c0cf8dbf..fe482147e04 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/assigner/PipeDataRegionAssigner.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/assigner/PipeDataRegionAssigner.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime.assigner; +package org.apache.iotdb.db.pipe.collector.realtime.assigner; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.matcher.CachedSchemaPatternMatcher; -import org.apache.iotdb.db.pipe.core.collector.realtime.matcher.PipeDataRegionMatcher; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.collector.realtime.matcher.CachedSchemaPatternMatcher; +import org.apache.iotdb.db.pipe.collector.realtime.matcher.PipeDataRegionMatcher; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; import com.lmax.disruptor.dsl.ProducerType; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpoch.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpoch.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpoch.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpoch.java index b6c71f45d4e..f20bf4cc6dc 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpoch.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpoch.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.realtime; +package org.apache.iotdb.db.pipe.collector.realtime.epoch; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpochManager.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpochManager.java similarity index 89% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpochManager.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpochManager.java index 5a33649aad2..095bac51c2b 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpochManager.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpochManager.java @@ -17,12 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.realtime; +package org.apache.iotdb.db.pipe.collector.realtime.epoch; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; -import org.apache.iotdb.db.pipe.core.event.impl.PipeInsertNodeTabletInsertionEvent; -import org.apache.iotdb.db.pipe.core.event.impl.PipeTsFileInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpochStateMigrator.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpochStateMigrator.java similarity index 94% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpochStateMigrator.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpochStateMigrator.java index f75f7c87e5d..b95d3349b47 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/TsFileEpochStateMigrator.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/epoch/TsFileEpochStateMigrator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.realtime; +package org.apache.iotdb.db.pipe.collector.realtime.epoch; @FunctionalInterface public interface TsFileEpochStateMigrator { diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/listener/PipeInsertionDataNodeListener.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/listener/PipeInsertionDataNodeListener.java similarity index 94% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/listener/PipeInsertionDataNodeListener.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/listener/PipeInsertionDataNodeListener.java index ae9cce9a498..6fd82618ff9 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/listener/PipeInsertionDataNodeListener.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/listener/PipeInsertionDataNodeListener.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime.listener; +package org.apache.iotdb.db.pipe.collector.realtime.listener; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.pipe.agent.PipeAgent; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.assigner.PipeDataRegionAssigner; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEventFactory; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.collector.realtime.assigner.PipeDataRegionAssigner; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEventFactory; import org.apache.iotdb.db.wal.utils.WALEntryHandler; import java.util.concurrent.ConcurrentHashMap; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/matcher/CachedSchemaPatternMatcher.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/matcher/CachedSchemaPatternMatcher.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/matcher/CachedSchemaPatternMatcher.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/matcher/CachedSchemaPatternMatcher.java index b68a7e99c0f..cc3dd94a67c 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/matcher/CachedSchemaPatternMatcher.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/matcher/CachedSchemaPatternMatcher.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime.matcher; +package org.apache.iotdb.db.pipe.collector.realtime.matcher; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; import com.github.benmanes.caffeine.cache.Cache; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/matcher/PipeDataRegionMatcher.java b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/matcher/PipeDataRegionMatcher.java similarity index 88% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/matcher/PipeDataRegionMatcher.java rename to server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/matcher/PipeDataRegionMatcher.java index 6411d7cead1..6e84cdf0ce2 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/realtime/matcher/PipeDataRegionMatcher.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/collector/realtime/matcher/PipeDataRegionMatcher.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.collector.realtime.matcher; +package org.apache.iotdb.db.pipe.collector.realtime.matcher; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; import java.util.Set; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/IoTDBThriftConnectorClient.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorClient.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/IoTDBThriftConnectorClient.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorClient.java index 16ebfb2d74d..db0047372db 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/IoTDBThriftConnectorClient.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorClient.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb; +package org.apache.iotdb.db.pipe.connector; import org.apache.iotdb.commons.client.ThriftClient; import org.apache.iotdb.commons.client.property.ThriftClientProperty; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/IoTDBThriftConnectorVersion.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorVersion.java similarity index 94% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/IoTDBThriftConnectorVersion.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorVersion.java index d05fd374544..7dac858ae3f 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/IoTDBThriftConnectorVersion.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorVersion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb; +package org.apache.iotdb.db.pipe.connector; public enum IoTDBThriftConnectorVersion { VERSION_ONE((byte) 1), diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java similarity index 91% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java index 4c0b1c0e54e..04719ad2f44 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1; +package org.apache.iotdb.db.pipe.connector.v1; import org.apache.iotdb.commons.client.property.ThriftClientProperty; import org.apache.iotdb.commons.conf.CommonConfig; @@ -26,16 +26,16 @@ import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.config.PipeConnectorConstant; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorClient; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.reponse.PipeTransferFilePieceResp; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferFilePieceReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferFileSealReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferHandshakeReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferInsertNodeReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferTabletReq; -import org.apache.iotdb.db.pipe.core.event.impl.PipeInsertNodeTabletInsertionEvent; -import org.apache.iotdb.db.pipe.core.event.impl.PipeRawTabletInsertionEvent; -import org.apache.iotdb.db.pipe.core.event.impl.PipeTsFileInsertionEvent; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorClient; +import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferInsertNodeReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferTabletReq; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; import org.apache.iotdb.db.wal.exception.WALPipeException; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftReceiverV1.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftReceiverV1.java similarity index 94% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftReceiverV1.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftReceiverV1.java index b7fcb594c20..dfd6765b68d 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftReceiverV1.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftReceiverV1.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1; +package org.apache.iotdb.db.pipe.connector.v1; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.db.conf.IoTDBConfig; @@ -30,13 +30,13 @@ import org.apache.iotdb.db.mpp.plan.statement.Statement; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertTabletStatement; import org.apache.iotdb.db.mpp.plan.statement.crud.LoadTsFileStatement; import org.apache.iotdb.db.pipe.agent.receiver.IoTDBThriftReceiver; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.reponse.PipeTransferFilePieceResp; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferFilePieceReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferFileSealReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferHandshakeReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferInsertNodeReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferTabletReq; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferInsertNodeReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferTabletReq; import org.apache.iotdb.db.query.control.SessionManager; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/PipeRequestType.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/PipeRequestType.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/PipeRequestType.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/PipeRequestType.java index c62034353d0..cdbb5a59eef 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/PipeRequestType.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/PipeRequestType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1; +package org.apache.iotdb.db.pipe.connector.v1; import java.util.Arrays; import java.util.HashMap; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/reponse/PipeTransferFilePieceResp.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/reponse/PipeTransferFilePieceResp.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/reponse/PipeTransferFilePieceResp.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/reponse/PipeTransferFilePieceResp.java index 56c3b8a4cd5..8b96e0242a2 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/reponse/PipeTransferFilePieceResp.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/reponse/PipeTransferFilePieceResp.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.reponse; +package org.apache.iotdb.db.pipe.connector.v1.reponse; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.service.rpc.thrift.TPipeTransferResp; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferFilePieceReq.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFilePieceReq.java similarity index 92% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferFilePieceReq.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFilePieceReq.java index 6f6266fa1e9..897ee2a29e7 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferFilePieceReq.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFilePieceReq.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request; +package org.apache.iotdb.db.pipe.connector.v1.request; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.PipeRequestType; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.PublicBAOS; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferFileSealReq.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFileSealReq.java similarity index 91% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferFileSealReq.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFileSealReq.java index 935131db950..0e73b95af07 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferFileSealReq.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFileSealReq.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request; +package org.apache.iotdb.db.pipe.connector.v1.request; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.PipeRequestType; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.iotdb.tsfile.utils.PublicBAOS; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferHandshakeReq.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferHandshakeReq.java similarity index 91% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferHandshakeReq.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferHandshakeReq.java index f258c5036f9..da03903fd79 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferHandshakeReq.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferHandshakeReq.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request; +package org.apache.iotdb.db.pipe.connector.v1.request; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.PipeRequestType; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.iotdb.tsfile.utils.PublicBAOS; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferInsertNodeReq.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferInsertNodeReq.java similarity index 94% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferInsertNodeReq.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferInsertNodeReq.java index 5b4fc83ced8..10098a9721e 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferInsertNodeReq.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferInsertNodeReq.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request; +package org.apache.iotdb.db.pipe.connector.v1.request; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; @@ -26,8 +26,8 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.mpp.plan.statement.Statement; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.PipeRequestType; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; public class PipeTransferInsertNodeReq extends TPipeTransferReq { diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferTabletReq.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferTabletReq.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferTabletReq.java rename to server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferTabletReq.java index ad54dd267e5..758013d6c72 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/request/PipeTransferTabletReq.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferTabletReq.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request; +package org.apache.iotdb.db.pipe.connector.v1.request; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.IoTDBThriftConnectorVersion; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.PipeRequestType; +import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorVersion; +import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.iotdb.service.rpc.thrift.TSInsertTabletReq; import org.apache.iotdb.session.util.SessionUtils; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionFakeCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionFakeCollector.java deleted file mode 100644 index fb61a9b4cc1..00000000000 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/collector/historical/PipeHistoricalDataRegionFakeCollector.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.iotdb.db.pipe.core.collector.historical; - -import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; -import org.apache.iotdb.pipe.api.customizer.PipeParameters; -import org.apache.iotdb.pipe.api.customizer.collector.PipeCollectorRuntimeConfiguration; -import org.apache.iotdb.pipe.api.event.Event; - -public class PipeHistoricalDataRegionFakeCollector extends PipeHistoricalDataRegionCollector { - - @Override - public void validate(PipeParameterValidator validator) {} - - @Override - public void customize( - PipeParameters parameters, PipeCollectorRuntimeConfiguration configuration) {} - - @Override - public void start() {} - - @Override - public Event supply() { - return null; - } - - @Override - public boolean hasConsumedAll() { - return true; - } - - @Override - public void close() {} - - @Override - public String toString() { - return "PipeHistoricalDataRegionFakeCollector{}"; - } -} diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/EnrichedEvent.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/EnrichedEvent.java similarity index 99% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/EnrichedEvent.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/EnrichedEvent.java index e972104ce5d..4b181f83549 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/EnrichedEvent.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/EnrichedEvent.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event; +package org.apache.iotdb.db.pipe.event; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/access/PipeRow.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRow.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/access/PipeRow.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRow.java index 85f4a210ccb..ac540ce70f4 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/access/PipeRow.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRow.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.view.access; +package org.apache.iotdb.db.pipe.event.common.row; import org.apache.iotdb.commons.pipe.utils.PipeDataTypeTransformer; import org.apache.iotdb.pipe.api.access.Row; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/collector/PipeRowCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/collector/PipeRowCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java index 8010b67e57e..983a7877713 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/collector/PipeRowCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/row/PipeRowCollector.java @@ -17,10 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.view.collector; +package org.apache.iotdb.db.pipe.event.common.row; -import org.apache.iotdb.db.pipe.core.event.impl.PipeRawTabletInsertionEvent; -import org.apache.iotdb.db.pipe.core.event.view.access.PipeRow; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.pipe.api.access.Row; import org.apache.iotdb.pipe.api.collector.RowCollector; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java index dd65ad4c319..a86842875d4 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeInsertNodeTabletInsertionEvent.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.impl; +package org.apache.iotdb.db.pipe.event.common.tablet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; -import org.apache.iotdb.db.pipe.core.event.EnrichedEvent; -import org.apache.iotdb.db.pipe.core.event.view.datastructure.TabletInsertionDataContainer; +import org.apache.iotdb.db.pipe.event.EnrichedEvent; import org.apache.iotdb.db.pipe.resource.PipeResourceManager; import org.apache.iotdb.db.wal.exception.WALPipeException; import org.apache.iotdb.db.wal.utils.WALEntryHandler; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeRawTabletInsertionEvent.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java similarity index 95% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeRawTabletInsertionEvent.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java index abb33534eb8..8629eb52ba4 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeRawTabletInsertionEvent.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java @@ -17,10 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.impl; +package org.apache.iotdb.db.pipe.event.common.tablet; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.event.view.datastructure.TabletInsertionDataContainer; import org.apache.iotdb.pipe.api.access.Row; import org.apache.iotdb.pipe.api.collector.RowCollector; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TabletInsertionDataContainer.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/TabletInsertionDataContainer.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TabletInsertionDataContainer.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/TabletInsertionDataContainer.java index 542847074c0..49275556cd2 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TabletInsertionDataContainer.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/TabletInsertionDataContainer.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.view.datastructure; +package org.apache.iotdb.db.pipe.event.common.tablet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode; -import org.apache.iotdb.db.pipe.core.event.view.access.PipeRow; -import org.apache.iotdb.db.pipe.core.event.view.collector.PipeRowCollector; +import org.apache.iotdb.db.pipe.event.common.row.PipeRow; +import org.apache.iotdb.db.pipe.event.common.row.PipeRowCollector; import org.apache.iotdb.pipe.api.access.Row; import org.apache.iotdb.pipe.api.collector.RowCollector; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeTsFileInsertionEvent.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeTsFileInsertionEvent.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java index 2de0cd31d19..c4c21ac9114 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeTsFileInsertionEvent.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java @@ -17,15 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.impl; +package org.apache.iotdb.db.pipe.event.common.tsfile; 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.PipeTaskMeta; import org.apache.iotdb.db.engine.storagegroup.TsFileProcessor; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; -import org.apache.iotdb.db.pipe.core.event.EnrichedEvent; -import org.apache.iotdb.db.pipe.core.event.view.datastructure.TsFileInsertionDataContainer; +import org.apache.iotdb.db.pipe.event.EnrichedEvent; import org.apache.iotdb.db.pipe.resource.PipeResourceManager; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataContainer.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionDataContainer.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataContainer.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionDataContainer.java index 79274e48fc7..6426e8dccad 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataContainer.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionDataContainer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.view.datastructure; +package org.apache.iotdb.db.pipe.event.common.tsfile; -import org.apache.iotdb.db.pipe.core.event.impl.PipeRawTabletInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; import org.apache.iotdb.pipe.api.exception.PipeException; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataTabletIterator.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionDataTabletIterator.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataTabletIterator.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionDataTabletIterator.java index 15959adb7ee..8b3b1e14fe5 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataTabletIterator.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/TsFileInsertionDataTabletIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.view.datastructure; +package org.apache.iotdb.db.pipe.event.common.tsfile; import org.apache.iotdb.pipe.api.exception.PipeException; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/PipeRealtimeCollectEvent.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeCollectEvent.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/PipeRealtimeCollectEvent.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeCollectEvent.java index d91eb07a4b0..06410b26a02 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/PipeRealtimeCollectEvent.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeCollectEvent.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.realtime; +package org.apache.iotdb.db.pipe.event.realtime; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; -import org.apache.iotdb.db.pipe.core.event.EnrichedEvent; +import org.apache.iotdb.db.pipe.collector.realtime.epoch.TsFileEpoch; +import org.apache.iotdb.db.pipe.event.EnrichedEvent; import org.apache.iotdb.pipe.api.event.Event; import java.util.Map; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/PipeRealtimeCollectEventFactory.java b/server/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeCollectEventFactory.java similarity index 86% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/PipeRealtimeCollectEventFactory.java rename to server/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeCollectEventFactory.java index b2a622f7c05..274553301f3 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/realtime/PipeRealtimeCollectEventFactory.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/event/realtime/PipeRealtimeCollectEventFactory.java @@ -17,12 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.realtime; +package org.apache.iotdb.db.pipe.event.realtime; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; -import org.apache.iotdb.db.pipe.core.event.impl.PipeInsertNodeTabletInsertionEvent; -import org.apache.iotdb.db.pipe.core.event.impl.PipeTsFileInsertionEvent; +import org.apache.iotdb.db.pipe.collector.realtime.epoch.TsFileEpochManager; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent; import org.apache.iotdb.db.wal.utils.WALEntryHandler; public class PipeRealtimeCollectEventFactory { diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/processor/PipeDoNothingProcessor.java b/server/src/main/java/org/apache/iotdb/db/pipe/processor/PipeDoNothingProcessor.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/processor/PipeDoNothingProcessor.java rename to server/src/main/java/org/apache/iotdb/db/pipe/processor/PipeDoNothingProcessor.java index c9774b4618a..a976358611e 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/processor/PipeDoNothingProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/processor/PipeDoNothingProcessor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.processor; +package org.apache.iotdb.db.pipe.processor; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.event.EnrichedEvent; +import org.apache.iotdb.db.pipe.event.EnrichedEvent; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.collector.EventCollector; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/BlockingPendingQueue.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/BlockingPendingQueue.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/pipe/task/queue/BlockingPendingQueue.java rename to server/src/main/java/org/apache/iotdb/db/pipe/task/connection/BlockingPendingQueue.java index 07465e5fa36..9896bfee3e9 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/BlockingPendingQueue.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/BlockingPendingQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.queue; +package org.apache.iotdb.db.pipe.task.connection; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/BoundedBlockingPendingQueue.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/BoundedBlockingPendingQueue.java similarity index 95% rename from server/src/main/java/org/apache/iotdb/db/pipe/task/queue/BoundedBlockingPendingQueue.java rename to server/src/main/java/org/apache/iotdb/db/pipe/task/connection/BoundedBlockingPendingQueue.java index 0940fee2753..3dcd76a441d 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/BoundedBlockingPendingQueue.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/BoundedBlockingPendingQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.queue; +package org.apache.iotdb.db.pipe.task.connection; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/EventSupplier.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/EventSupplier.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/pipe/task/queue/EventSupplier.java rename to server/src/main/java/org/apache/iotdb/db/pipe/task/connection/EventSupplier.java index ea056dc22aa..0efb7a2ae67 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/EventSupplier.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/EventSupplier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.queue; +package org.apache.iotdb.db.pipe.task.connection; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/collector/PipeEventCollector.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/PipeEventCollector.java similarity index 92% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/collector/PipeEventCollector.java rename to server/src/main/java/org/apache/iotdb/db/pipe/task/connection/PipeEventCollector.java index 6a8697eec8b..4da053d9526 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/collector/PipeEventCollector.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/PipeEventCollector.java @@ -17,10 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.event.view.collector; +package org.apache.iotdb.db.pipe.task.connection; -import org.apache.iotdb.db.pipe.core.event.EnrichedEvent; -import org.apache.iotdb.db.pipe.task.queue.BoundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.event.EnrichedEvent; import org.apache.iotdb.pipe.api.collector.EventCollector; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/UnboundedBlockingPendingQueue.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/UnboundedBlockingPendingQueue.java similarity index 95% rename from server/src/main/java/org/apache/iotdb/db/pipe/task/queue/UnboundedBlockingPendingQueue.java rename to server/src/main/java/org/apache/iotdb/db/pipe/task/connection/UnboundedBlockingPendingQueue.java index 3a94393dd08..dafb567e902 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/queue/UnboundedBlockingPendingQueue.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/connection/UnboundedBlockingPendingQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.pipe.task.queue; +package org.apache.iotdb.db.pipe.task.connection; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskCollectorStage.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskCollectorStage.java index a73a9da8b9e..9e03458bfa0 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskCollectorStage.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskCollectorStage.java @@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.db.pipe.agent.PipeAgent; +import org.apache.iotdb.db.pipe.collector.IoTDBDataRegionCollector; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.collector.IoTDBDataRegionCollector; -import org.apache.iotdb.db.pipe.task.queue.EventSupplier; -import org.apache.iotdb.db.pipe.task.queue.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.connection.EventSupplier; +import org.apache.iotdb.db.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.PipeCollector; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.PipeParameters; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java index 5615c36f560..6b96097fd6f 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskConnectorStage.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.task.stage; -import org.apache.iotdb.db.pipe.core.connector.manager.PipeConnectorSubtaskManager; import org.apache.iotdb.db.pipe.execution.executor.PipeSubtaskExecutorManager; -import org.apache.iotdb.db.pipe.task.queue.BoundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.connection.BoundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.subtask.PipeConnectorSubtaskManager; import org.apache.iotdb.pipe.api.customizer.PipeParameters; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.exception.PipeException; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java index b21a3a85c34..571b04773a4 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/stage/PipeTaskProcessorStage.java @@ -23,13 +23,13 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.db.pipe.agent.PipeAgent; import org.apache.iotdb.db.pipe.config.PipeProcessorConstant; -import org.apache.iotdb.db.pipe.core.event.view.collector.PipeEventCollector; -import org.apache.iotdb.db.pipe.core.processor.PipeDoNothingProcessor; import org.apache.iotdb.db.pipe.execution.executor.PipeProcessorSubtaskExecutor; import org.apache.iotdb.db.pipe.execution.executor.PipeSubtaskExecutorManager; -import org.apache.iotdb.db.pipe.task.queue.BlockingPendingQueue; -import org.apache.iotdb.db.pipe.task.queue.BoundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.task.queue.EventSupplier; +import org.apache.iotdb.db.pipe.processor.PipeDoNothingProcessor; +import org.apache.iotdb.db.pipe.task.connection.BlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.connection.BoundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.connection.EventSupplier; +import org.apache.iotdb.db.pipe.task.connection.PipeEventCollector; import org.apache.iotdb.db.pipe.task.subtask.PipeProcessorSubtask; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtask.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtask.java index f34b2b3f961..ce2b6403a2f 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtask.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtask.java @@ -21,8 +21,8 @@ package org.apache.iotdb.db.pipe.task.subtask; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeConnectorCriticalException; import org.apache.iotdb.commons.pipe.config.PipeConfig; -import org.apache.iotdb.db.pipe.core.event.EnrichedEvent; -import org.apache.iotdb.db.pipe.task.queue.BoundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.event.EnrichedEvent; +import org.apache.iotdb.db.pipe.task.connection.BoundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/manager/PipeConnectorSubtaskLifeCycle.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtaskLifeCycle.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/manager/PipeConnectorSubtaskLifeCycle.java rename to server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtaskLifeCycle.java index 6936e4610cb..a0814043431 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/manager/PipeConnectorSubtaskLifeCycle.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtaskLifeCycle.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.manager; +package org.apache.iotdb.db.pipe.task.subtask; import org.apache.iotdb.db.pipe.execution.executor.PipeConnectorSubtaskExecutor; -import org.apache.iotdb.db.pipe.task.queue.BoundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.task.subtask.PipeConnectorSubtask; +import org.apache.iotdb.db.pipe.task.connection.BoundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.event.Event; public class PipeConnectorSubtaskLifeCycle implements AutoCloseable { diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/manager/PipeConnectorSubtaskManager.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtaskManager.java similarity index 95% rename from server/src/main/java/org/apache/iotdb/db/pipe/core/connector/manager/PipeConnectorSubtaskManager.java rename to server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtaskManager.java index 548a48fdc0b..26c21d9545f 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/manager/PipeConnectorSubtaskManager.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeConnectorSubtaskManager.java @@ -17,16 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.pipe.core.connector.manager; +package org.apache.iotdb.db.pipe.task.subtask; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.db.pipe.agent.PipeAgent; import org.apache.iotdb.db.pipe.config.PipeConnectorConstant; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.IoTDBThriftConnectorV1; +import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftConnectorV1; import org.apache.iotdb.db.pipe.execution.executor.PipeConnectorSubtaskExecutor; -import org.apache.iotdb.db.pipe.task.queue.BoundedBlockingPendingQueue; -import org.apache.iotdb.db.pipe.task.subtask.PipeConnectorSubtask; +import org.apache.iotdb.db.pipe.task.connection.BoundedBlockingPendingQueue; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.customizer.PipeParameterValidator; import org.apache.iotdb.pipe.api.customizer.PipeParameters; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeProcessorSubtask.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeProcessorSubtask.java index 6a76beb02b3..2472a29eefe 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeProcessorSubtask.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeProcessorSubtask.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.task.subtask; -import org.apache.iotdb.db.pipe.task.queue.EventSupplier; +import org.apache.iotdb.db.pipe.task.connection.EventSupplier; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.collector.EventCollector; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeSubtask.java b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeSubtask.java index 524e9abbcfa..9f5c6e4a37a 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeSubtask.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/task/subtask/PipeSubtask.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.task.subtask; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; -import org.apache.iotdb.db.pipe.core.event.EnrichedEvent; +import org.apache.iotdb.db.pipe.event.EnrichedEvent; import org.apache.iotdb.db.pipe.execution.scheduler.PipeSubtaskScheduler; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/CachedSchemaPatternMatcherTest.java b/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/CachedSchemaPatternMatcherTest.java index 4bc74e6d929..7db76191a87 100644 --- a/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/CachedSchemaPatternMatcherTest.java +++ b/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/CachedSchemaPatternMatcherTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.pipe.core.collector; import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.collector.realtime.matcher.CachedSchemaPatternMatcher; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.matcher.CachedSchemaPatternMatcher; -import org.apache.iotdb.db.pipe.core.event.realtime.PipeRealtimeCollectEvent; +import org.apache.iotdb.db.pipe.event.realtime.PipeRealtimeCollectEvent; import org.apache.iotdb.pipe.api.customizer.PipeParameters; import org.apache.iotdb.pipe.api.event.Event; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; diff --git a/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/PipeRealtimeCollectTest.java b/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/PipeRealtimeCollectTest.java index d071c1ae5ef..2c074fd790d 100644 --- a/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/PipeRealtimeCollectTest.java +++ b/server/src/test/java/org/apache/iotdb/db/pipe/core/collector/PipeRealtimeCollectTest.java @@ -25,11 +25,11 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionCollector; +import org.apache.iotdb.db.pipe.collector.realtime.PipeRealtimeDataRegionHybridCollector; +import org.apache.iotdb.db.pipe.collector.realtime.listener.PipeInsertionDataNodeListener; import org.apache.iotdb.db.pipe.config.PipeCollectorConstant; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.PipeRealtimeDataRegionHybridCollector; -import org.apache.iotdb.db.pipe.core.collector.realtime.listener.PipeInsertionDataNodeListener; -import org.apache.iotdb.db.pipe.task.queue.UnboundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.db.wal.utils.WALEntryHandler; import org.apache.iotdb.pipe.api.customizer.PipeParameters; import org.apache.iotdb.pipe.api.event.Event; diff --git a/server/src/test/java/org/apache/iotdb/db/pipe/core/connector/PipeThriftRequestTest.java b/server/src/test/java/org/apache/iotdb/db/pipe/core/connector/PipeThriftRequestTest.java index a3b65a66bfd..2c7eae3a424 100644 --- a/server/src/test/java/org/apache/iotdb/db/pipe/core/connector/PipeThriftRequestTest.java +++ b/server/src/test/java/org/apache/iotdb/db/pipe/core/connector/PipeThriftRequestTest.java @@ -22,11 +22,11 @@ package org.apache.iotdb.db.pipe.core.connector; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.reponse.PipeTransferFilePieceResp; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferFilePieceReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferFileSealReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferHandshakeReq; -import org.apache.iotdb.db.pipe.core.connector.impl.iotdb.v1.request.PipeTransferInsertNodeReq; +import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq; +import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferInsertNodeReq; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/test/java/org/apache/iotdb/db/pipe/core/event/PipeTabletInsertionEventTest.java b/server/src/test/java/org/apache/iotdb/db/pipe/core/event/PipeTabletInsertionEventTest.java index 6a68b5ad7cd..80f46ff1530 100644 --- a/server/src/test/java/org/apache/iotdb/db/pipe/core/event/PipeTabletInsertionEventTest.java +++ b/server/src/test/java/org/apache/iotdb/db/pipe/core/event/PipeTabletInsertionEventTest.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode; -import org.apache.iotdb.db.pipe.core.event.impl.PipeRawTabletInsertionEvent; -import org.apache.iotdb.db.pipe.core.event.view.datastructure.TabletInsertionDataContainer; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tablet.TabletInsertionDataContainer; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.BitMap; diff --git a/server/src/test/java/org/apache/iotdb/db/pipe/core/event/TsFileInsertionDataContainerTest.java b/server/src/test/java/org/apache/iotdb/db/pipe/core/event/TsFileInsertionDataContainerTest.java index d74f790fd15..7556182505e 100644 --- a/server/src/test/java/org/apache/iotdb/db/pipe/core/event/TsFileInsertionDataContainerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/pipe/core/event/TsFileInsertionDataContainerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.core.event; -import org.apache.iotdb.db.pipe.core.event.impl.PipeRawTabletInsertionEvent; -import org.apache.iotdb.db.pipe.core.event.view.datastructure.TsFileInsertionDataContainer; +import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; +import org.apache.iotdb.db.pipe.event.common.tsfile.TsFileInsertionDataContainer; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.utils.TsFileGeneratorUtils; diff --git a/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeConnectorSubtaskExecutorTest.java b/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeConnectorSubtaskExecutorTest.java index 802afcf16d9..bf48f14758e 100644 --- a/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeConnectorSubtaskExecutorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeConnectorSubtaskExecutorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.execution.executor; -import org.apache.iotdb.db.pipe.task.queue.BoundedBlockingPendingQueue; +import org.apache.iotdb.db.pipe.task.connection.BoundedBlockingPendingQueue; import org.apache.iotdb.db.pipe.task.subtask.PipeConnectorSubtask; import org.apache.iotdb.pipe.api.PipeConnector; diff --git a/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeProcessorSubtaskExecutorTest.java b/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeProcessorSubtaskExecutorTest.java index d0a5208d537..7e57ecf40f6 100644 --- a/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeProcessorSubtaskExecutorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/pipe/execution/executor/PipeProcessorSubtaskExecutorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.execution.executor; -import org.apache.iotdb.db.pipe.task.queue.EventSupplier; +import org.apache.iotdb.db.pipe.task.connection.EventSupplier; import org.apache.iotdb.db.pipe.task.subtask.PipeProcessorSubtask; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.collector.EventCollector;
