From f91c5d320349505aa669ee7acae6cad972e58ccc Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Thu, 7 Dec 2023 23:57:57 +0800 Subject: [PATCH] Move pipeline.config package (#29313) * Refactor MigrationIncrementalDumperContextCreator * Move pipeline.config package * Move ConsistencyCheckJobItemInfo --- .../pojo/ConsistencyCheckJobItemInfo.java | 2 +- .../core/context/PipelineProcessContext.java | 2 +- .../core/context/TransmissionProcessContext.java | 8 ++++---- .../ImporterConfiguration.java | 2 +- .../importer/sink/PipelineDataSourceSink.java | 2 +- .../config}/PipelineProcessConfiguration.java | 2 +- .../PipelineProcessConfigurationUtils.java | 10 +++++----- .../config}/PipelineReadConfiguration.java | 2 +- .../config}/PipelineWriteConfiguration.java | 2 +- .../yaml/YamlPipelineProcessConfiguration.java | 2 +- .../yaml/YamlPipelineReadConfiguration.java | 2 +- .../yaml/YamlPipelineWriteConfiguration.java | 2 +- .../YamlPipelineProcessConfigurationSwapper.java | 6 +++--- .../YamlPipelineReadConfigurationSwapper.java | 6 +++--- .../YamlPipelineWriteConfigurationSwapper.java | 6 +++--- ...ipelineProcessConfigurationPersistService.java | 6 +++--- .../CreateTableConfiguration.java | 2 +- .../core/preparer/InventoryTaskSplitter.java | 4 ++-- .../core/preparer/PipelineJobPreparerUtils.java | 2 +- .../datasource/AbstractDataSourcePreparer.java | 2 +- .../datasource/PrepareTargetSchemasParameter.java | 2 +- .../datasource/PrepareTargetTablesParameter.java | 2 +- ...mlPipelineProcessConfigurationSwapperTest.java | 15 +++++++-------- .../datasource/MySQLDataSourcePreparer.java | 2 +- .../datasource/OpenGaussDataSourcePreparer.java | 2 +- .../datasource/PostgreSQLDataSourcePreparer.java | 2 +- .../distsql/ShowTransmissionRuleQueryResult.java | 4 ++-- .../query/ShowMigrationCheckStatusExecutor.java | 2 +- .../shardingsphere/data/pipeline/cdc/CDCJob.java | 6 +++--- .../cdc/config/task/CDCTaskConfiguration.java | 2 +- .../pipeline/cdc/core/prepare/CDCJobPreparer.java | 2 +- .../api/ConsistencyCheckJobAPI.java | 2 +- .../context/ConsistencyCheckProcessContext.java | 4 ++-- .../task/ConsistencyCheckTasksRunner.java | 4 ++-- .../pipeline/scenario/migration/MigrationJob.java | 8 ++++---- .../config/MigrationTaskConfiguration.java | 4 ++-- .../MigrationIncrementalDumperContextCreator.java | 12 ++++++------ .../migration/prepare/MigrationJobPreparer.java | 4 ++-- .../updatable/AlterTransmissionRuleUpdater.java | 2 +- ...ssionProcessConfigurationSegmentConverter.java | 6 +++--- .../core/fixture/H2DataSourcePreparer.java | 2 +- .../core/importer/PipelineDataSourceSinkTest.java | 2 +- ...ineProcessConfigurationPersistServiceTest.java | 10 +++++----- .../pipeline/core/util/PipelineContextUtils.java | 14 +++++++------- .../migration/api/impl/MigrationJobAPITest.java | 4 ++-- 45 files changed, 95 insertions(+), 96 deletions(-) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{ => consistencycheck}/pojo/ConsistencyCheckJobItemInfo.java (95%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config => importer}/ImporterConfiguration.java (98%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/PipelineProcessConfiguration.java (94%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/PipelineProcessConfigurationUtils.java (84%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/PipelineReadConfiguration.java (94%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/PipelineWriteConfiguration.java (94%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/yaml/YamlPipelineProcessConfiguration.java (95%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/yaml/YamlPipelineReadConfiguration.java (96%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/yaml/YamlPipelineWriteConfiguration.java (96%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/yaml/swapper/YamlPipelineProcessConfigurationSwapper.java (89%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/yaml/swapper/YamlPipelineReadConfigurationSwapper.java (88%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config/process => job/progress/config}/yaml/swapper/YamlPipelineWriteConfigurationSwapper.java (88%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{config => preparer}/CreateTableConfiguration.java (96%) rename kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/{config => job/progress/config/yaml/swapper}/YamlPipelineProcessConfigurationSwapperTest.java (89%) diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/ConsistencyCheckJobItemInfo.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/pojo/ConsistencyCheckJobItemInfo.java similarity index 95% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/ConsistencyCheckJobItemInfo.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/pojo/ConsistencyCheckJobItemInfo.java index 4f990b9252d1a..6cea80035ae7b 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/ConsistencyCheckJobItemInfo.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/pojo/ConsistencyCheckJobItemInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.pojo; +package org.apache.shardingsphere.data.pipeline.core.consistencycheck.pojo; import lombok.Getter; import lombok.Setter; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineProcessContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineProcessContext.java index b6e0c8a490280..1284c64309a50 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineProcessContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/PipelineProcessContext.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.core.context; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; /** * Pipeline process context. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/TransmissionProcessContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/TransmissionProcessContext.java index 2c85c1510b06d..0c5df325e03a8 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/TransmissionProcessContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/TransmissionProcessContext.java @@ -20,10 +20,10 @@ import lombok.Getter; import lombok.SneakyThrows; import org.apache.commons.lang3.concurrent.ConcurrentException; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineWriteConfiguration; import org.apache.shardingsphere.data.pipeline.core.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannelCreator; import org.apache.shardingsphere.data.pipeline.core.spi.algorithm.JobRateLimitAlgorithm; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/ImporterConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/ImporterConfiguration.java similarity index 98% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/ImporterConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/ImporterConfiguration.java index 349da6ade3322..0ce5730f58263 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/ImporterConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/ImporterConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config; +package org.apache.shardingsphere.data.pipeline.core.importer; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java index 1e80c23003681..011187eab9d9b 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.data.pipeline.core.ingest.record.GroupedDataRecord; import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import org.apache.shardingsphere.data.pipeline.core.job.JobOperationType; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.core.ingest.record.RecordUtils; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineProcessConfiguration.java similarity index 94% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineProcessConfiguration.java index f129d119b614a..029d151cbe0bc 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineProcessConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineProcessConfigurationUtils.java similarity index 84% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtils.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineProcessConfigurationUtils.java index e036cfeede329..67ad619dc0518 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtils.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineProcessConfigurationUtils.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineWriteConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper.YamlPipelineProcessConfigurationSwapper; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; import java.util.Properties; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineReadConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineReadConfiguration.java similarity index 94% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineReadConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineReadConfiguration.java index 328b4a64a1258..f591cca612c06 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineReadConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineReadConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineWriteConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineWriteConfiguration.java similarity index 94% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineWriteConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineWriteConfiguration.java index 782e5c5c05b84..7ae41fb6f450d 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineWriteConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/PipelineWriteConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineProcessConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineProcessConfiguration.java similarity index 95% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineProcessConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineProcessConfiguration.java index 9b042f690aa7f..1d41444c139cf 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineProcessConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineProcessConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process.yaml; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml; import lombok.Getter; import lombok.Setter; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineReadConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineReadConfiguration.java similarity index 96% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineReadConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineReadConfiguration.java index c6956d85f9c2b..ac4ddc44fe648 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineReadConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineReadConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process.yaml; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml; import lombok.Getter; import lombok.Setter; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineWriteConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineWriteConfiguration.java similarity index 96% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineWriteConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineWriteConfiguration.java index c1b08e9fc3ddf..cec390becb7c0 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/YamlPipelineWriteConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/YamlPipelineWriteConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process.yaml; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml; import lombok.Getter; import lombok.Setter; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineProcessConfigurationSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineProcessConfigurationSwapper.java similarity index 89% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineProcessConfigurationSwapper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineProcessConfigurationSwapper.java index 76bb4b76d8403..5f705c27c9bfa 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineProcessConfigurationSwapper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineProcessConfigurationSwapper.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper; import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineReadConfigurationSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineReadConfigurationSwapper.java similarity index 88% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineReadConfigurationSwapper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineReadConfigurationSwapper.java index 8383b1faf6906..4e2d28fea04a3 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineReadConfigurationSwapper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineReadConfigurationSwapper.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineReadConfiguration; import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper; import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineWriteConfigurationSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineWriteConfigurationSwapper.java similarity index 88% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineWriteConfigurationSwapper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineWriteConfigurationSwapper.java index a32c338907eb6..566c2295326e1 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/yaml/swapper/YamlPipelineWriteConfigurationSwapper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineWriteConfigurationSwapper.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineWriteConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineWriteConfiguration; import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper; import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistService.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistService.java index 0745a4be47748..5a31e0291cb2b 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistService.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/PipelineProcessConfigurationPersistService.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.data.pipeline.core.metadata; import com.google.common.base.Strings; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper.YamlPipelineProcessConfigurationSwapper; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey; import org.apache.shardingsphere.data.pipeline.core.job.api.PipelineAPIFactory; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/CreateTableConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/CreateTableConfiguration.java similarity index 96% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/CreateTableConfiguration.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/CreateTableConfiguration.java index 5a7cbc2cb34d9..2f7d284e10308 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/CreateTableConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/CreateTableConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config; +package org.apache.shardingsphere.data.pipeline.core.preparer; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java index 5e25fe6a530d8..74d1bf53d049d 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java @@ -25,8 +25,8 @@ import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.core.metadata.model.PipelineColumnMetaData; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineReadConfiguration; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionJobItemContext; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceWrapper; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java index 0293b6add45d4..3d9df076335f4 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.data.pipeline.api.type.ShardingSpherePipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceWrapper; import org.apache.shardingsphere.data.pipeline.core.job.progress.JobItemIncrementalTasksProgress; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/AbstractDataSourcePreparer.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/AbstractDataSourcePreparer.java index a301c6bdf29bb..eb8c4bab0281b 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/AbstractDataSourcePreparer.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/AbstractDataSourcePreparer.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceWrapper; import org.apache.shardingsphere.data.pipeline.core.metadata.generator.PipelineDDLGenerator; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetSchemasParameter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetSchemasParameter.java index 587f06516d13e..a367d5a2bb044 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetSchemasParameter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetSchemasParameter.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetTablesParameter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetTablesParameter.java index fc4af4a27d333..cdaac34a2f298 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetTablesParameter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PrepareTargetTablesParameter.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.infra.parser.SQLParserEngine; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/config/YamlPipelineProcessConfigurationSwapperTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineProcessConfigurationSwapperTest.java similarity index 89% rename from kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/config/YamlPipelineProcessConfigurationSwapperTest.java rename to kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineProcessConfigurationSwapperTest.java index 72b35c4f580a2..12253161adab8 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/config/YamlPipelineProcessConfigurationSwapperTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/progress/config/yaml/swapper/YamlPipelineProcessConfigurationSwapperTest.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.config; +package org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineWriteConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineWriteConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineWriteConfiguration; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; import org.apache.shardingsphere.test.util.PropertiesBuilder; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java index e69fd251020e5..239ff6704a299 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.mysql.prepare.datasource; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.AbstractDataSourcePreparer; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetTablesParameter; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java index fb35473209bd2..005e13d4b31ea 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java @@ -19,7 +19,7 @@ import com.google.common.base.Splitter; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.AbstractDataSourcePreparer; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetSchemasParameter; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java index 353e38f93717e..2f788f7dab0d8 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.data.pipeline.postgresql.prepare.datasource; import com.google.common.base.Splitter; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.AbstractDataSourcePreparer; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetTablesParameter; diff --git a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/ShowTransmissionRuleQueryResult.java b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/ShowTransmissionRuleQueryResult.java index 5ec44bb78e5ca..ad10d8cfa57a7 100644 --- a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/ShowTransmissionRuleQueryResult.java +++ b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/ShowTransmissionRuleQueryResult.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.data.pipeline.distsql; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey; import org.apache.shardingsphere.data.pipeline.core.metadata.PipelineProcessConfigurationPersistService; import org.apache.shardingsphere.infra.instance.metadata.InstanceType; diff --git a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java index 107baae3ac49d..9363c5b15b813 100644 --- a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java +++ b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.migration.distsql.handler.query; -import org.apache.shardingsphere.data.pipeline.core.pojo.ConsistencyCheckJobItemInfo; +import org.apache.shardingsphere.data.pipeline.core.consistencycheck.pojo.ConsistencyCheckJobItemInfo; import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.ConsistencyCheckJobType; import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.api.ConsistencyCheckJobAPI; import org.apache.shardingsphere.distsql.handler.ral.query.QueryableRALExecutor; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java index 6c2ad44028208..1ce0842a1132b 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java @@ -31,9 +31,9 @@ import org.apache.shardingsphere.data.pipeline.cdc.core.prepare.CDCJobPreparer; import org.apache.shardingsphere.data.pipeline.cdc.core.task.CDCTasksRunner; import org.apache.shardingsphere.data.pipeline.cdc.generator.CDCResponseUtils; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; import org.apache.shardingsphere.data.pipeline.core.context.PipelineJobItemContext; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext; import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLine; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java index 84e8c344f31dc..4c58a726ff63d 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.core.task.config.PipelineTaskConfiguration; /** diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java index 6ee2a6458d059..98d430ec3fdcd 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.data.pipeline.cdc.core.importer.CDCImporter; import org.apache.shardingsphere.data.pipeline.cdc.core.task.CDCIncrementalTask; import org.apache.shardingsphere.data.pipeline.cdc.core.task.CDCInventoryTask; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext; import org.apache.shardingsphere.data.pipeline.core.ingest.position.FinishedPosition; import org.apache.shardingsphere.data.pipeline.core.job.progress.JobItemIncrementalTasksProgress; diff --git a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPI.java b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPI.java index d483d46968954..cd6694d7bd179 100644 --- a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPI.java +++ b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/api/ConsistencyCheckJobAPI.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.JobStatus; import org.apache.shardingsphere.data.pipeline.core.job.progress.ConsistencyCheckJobItemProgress; import org.apache.shardingsphere.data.pipeline.core.job.progress.yaml.YamlConsistencyCheckJobItemProgressSwapper; -import org.apache.shardingsphere.data.pipeline.core.pojo.ConsistencyCheckJobItemInfo; +import org.apache.shardingsphere.data.pipeline.core.consistencycheck.pojo.ConsistencyCheckJobItemInfo; import org.apache.shardingsphere.data.pipeline.core.registrycenter.repository.PipelineGovernanceFacade; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.TableDataConsistencyCheckResult; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.table.TableDataConsistencyChecker; diff --git a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/context/ConsistencyCheckProcessContext.java b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/context/ConsistencyCheckProcessContext.java index 003b60854f03a..3201b01d1657d 100644 --- a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/context/ConsistencyCheckProcessContext.java +++ b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/context/ConsistencyCheckProcessContext.java @@ -20,8 +20,8 @@ import lombok.Getter; import lombok.SneakyThrows; import org.apache.commons.lang3.concurrent.ConcurrentException; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; import org.apache.shardingsphere.data.pipeline.core.context.PipelineProcessContext; import org.apache.shardingsphere.data.pipeline.core.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.core.util.PipelineLazyInitializer; diff --git a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java index 6f5ee3fd05fa6..2799ada3325b5 100644 --- a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java +++ b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java @@ -20,8 +20,8 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.core.job.config.PipelineJobConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext; import org.apache.shardingsphere.data.pipeline.core.execute.AbstractPipelineLifecycleRunnable; import org.apache.shardingsphere.data.pipeline.core.execute.ExecuteCallback; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java index 6f9273c4f60b3..2f0066a5c2d71 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java @@ -20,10 +20,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.type.ShardingSpherePipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; import org.apache.shardingsphere.data.pipeline.core.context.PipelineJobItemContext; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionJobItemContext; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java index 9de5a9875ba16..07aba7d6dd91e 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java @@ -20,8 +20,8 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.core.task.config.PipelineTaskConfiguration; import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/ingest/dumper/MigrationIncrementalDumperContextCreator.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/ingest/dumper/MigrationIncrementalDumperContextCreator.java index 3e6e6396cbbe1..d9ca22ea77014 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/ingest/dumper/MigrationIncrementalDumperContextCreator.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/ingest/dumper/MigrationIncrementalDumperContextCreator.java @@ -18,13 +18,13 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.ingest.dumper; import lombok.RequiredArgsConstructor; +import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLine; +import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLineConvertUtils; import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.DumperCommonContext; import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContextCreator; import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; -import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContextCreator; -import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLine; -import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLineConvertUtils; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration; /** @@ -37,10 +37,10 @@ public final class MigrationIncrementalDumperContextCreator implements Increment @Override public IncrementalDumperContext createDumperContext(final JobDataNodeLine jobDataNodeLine) { - String dataSourceName = jobDataNodeLine.getEntries().get(0).getDataNodes().get(0).getDataSourceName(); + String dataSourceName = jobDataNodeLine.getEntries().iterator().next().getDataNodes().iterator().next().getDataSourceName(); ActualAndLogicTableNameMapper tableNameMapper = JobDataNodeLineConvertUtils.buildTableNameMapper(jobDataNodeLine); TableAndSchemaNameMapper tableAndSchemaNameMapper = new TableAndSchemaNameMapper(jobConfig.getTargetTableSchemaMap()); - return new IncrementalDumperContext( - new DumperCommonContext(dataSourceName, jobConfig.getSources().get(dataSourceName), tableNameMapper, tableAndSchemaNameMapper), jobConfig.getJobId(), false); + DumperCommonContext commonContext = new DumperCommonContext(dataSourceName, jobConfig.getSources().get(dataSourceName), tableNameMapper, tableAndSchemaNameMapper); + return new IncrementalDumperContext(commonContext, jobConfig.getJobId(), false); } } diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java index 6849f0ecf5979..d8ba979eae40f 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java @@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextManager; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceWrapper; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterTransmissionRuleUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterTransmissionRuleUpdater.java index 98acef72cecb9..e626f58b8c6cd 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterTransmissionRuleUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterTransmissionRuleUpdater.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey; import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType; import org.apache.shardingsphere.data.pipeline.core.metadata.PipelineProcessConfigurationPersistService; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/TransmissionProcessConfigurationSegmentConverter.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/TransmissionProcessConfigurationSegmentConverter.java index 083bc2d858697..e6e22f3261208 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/TransmissionProcessConfigurationSegmentConverter.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/TransmissionProcessConfigurationSegmentConverter.java @@ -19,9 +19,9 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineWriteConfiguration; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.distsql.segment.TransmissionRuleSegment; import org.apache.shardingsphere.distsql.segment.ReadOrWriteSegment; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2DataSourcePreparer.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2DataSourcePreparer.java index 4f1a56fd3a44c..c3c8b5888a269 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2DataSourcePreparer.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2DataSourcePreparer.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.fixture; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.AbstractDataSourcePreparer; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetTablesParameter; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java index 03d022d017b8a..53a9cecc8db32 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceWrapper; import org.apache.shardingsphere.data.pipeline.core.ingest.IngestDataChangeType; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java index e91d4641dfe1f..a7c1dfcee52f7 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/metadata/PipelineProcessConfigurationPersistServiceTest.java @@ -17,11 +17,11 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.metadata; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineWriteConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper.YamlPipelineProcessConfigurationSwapper; import org.apache.shardingsphere.data.pipeline.core.metadata.PipelineProcessConfigurationPersistService; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java index 21720f259bb71..2f9c8a29894e9 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java @@ -20,13 +20,13 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.type.ShardingSpherePipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.CreateTableConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.ImporterConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.yaml.swapper.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.core.preparer.CreateTableConfiguration; +import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.yaml.swapper.YamlPipelineProcessConfigurationSwapper; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContext; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextManager; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java index a89986c9ff252..aae9f2b71746c 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java @@ -20,8 +20,8 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.core.job.config.PipelineJobConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfiguration; -import org.apache.shardingsphere.data.pipeline.core.config.process.PipelineProcessConfigurationUtils; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfigurationUtils; import org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext; import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeEntry; import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLine;