This is an automated email from the ASF dual-hosted git repository. zhangliang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push: new 66923e47da6 Move PipelineProcessConfiguration and related classes to pipeline-api module (#21023) 66923e47da6 is described below commit 66923e47da60acb8a95fbb956593f66f823c6cbb Author: Hongsheng Zhong <zhonghongsh...@apache.org> AuthorDate: Sun Sep 18 11:09:33 2022 +0800 Move PipelineProcessConfiguration and related classes to pipeline-api module (#21023) * Revise code * Move PipelineProcessConfiguration and related classes to pipeline-api module --- .../shardingsphere/data/pipeline/api/PipelineJobPublicAPI.java | 2 +- .../api/config/process}/PipelineProcessConfiguration.java | 2 +- .../api/config/process}/PipelineReadConfiguration.java | 2 +- .../api/config/process}/PipelineWriteConfiguration.java | 2 +- .../config/process/yaml}/YamlPipelineProcessConfiguration.java | 2 +- .../process/yaml}/YamlPipelineProcessConfigurationSwapper.java | 5 ++--- .../config/process/yaml}/YamlPipelineReadConfiguration.java | 2 +- .../process/yaml}/YamlPipelineReadConfigurationSwapper.java | 5 ++--- .../config/process/yaml}/YamlPipelineWriteConfiguration.java | 2 +- .../process/yaml}/YamlPipelineWriteConfigurationSwapper.java | 5 ++--- .../data/pipeline/api/context/PipelineProcessContext.java | 2 +- .../apache/shardingsphere/data/pipeline/api/job/JobType.java | 2 +- .../yaml}/YamlPipelineProcessConfigurationSwapperTest.java | 7 ++----- .../shardingsphere/data/pipeline/core/api/PipelineJobAPI.java | 2 +- .../pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java | 8 ++++---- .../api/impl/PipelineProcessConfigurationPersistService.java | 6 +++--- .../context/AbstractInventoryIncrementalProcessContext.java | 6 +++--- .../progress/persist/PipelineJobProgressPersistService.java | 3 +-- .../data/pipeline/core/metadata/node/PipelineMetaDataNode.java | 2 +- .../data/pipeline/core/prepare/InventoryTaskSplitter.java | 2 +- .../pipeline/core/util/PipelineProcessConfigurationUtils.java | 10 +++++----- .../data/pipeline/scenario/migration/MigrationJobAPI.java | 2 +- .../data/pipeline/scenario/migration/MigrationJobAPIImpl.java | 2 +- .../pipeline/scenario/migration/MigrationProcessContext.java | 2 +- .../ShowMigrationProcessConfigurationQueryResultSet.java | 2 +- .../AlterInventoryIncrementalProcessConfigurationUpdater.java | 2 +- .../CreateInventoryIncrementalProcessConfigurationUpdater.java | 2 +- ...ventoryIncrementalProcessConfigurationSegmentConverter.java | 6 +++--- .../src/main/resources/logback.xml | 2 -- .../impl/PipelineProcessConfigurationPersistServiceTest.java | 10 +++++----- .../data/pipeline/core/util/PipelineContextUtil.java | 8 ++++---- 31 files changed, 54 insertions(+), 63 deletions(-) diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPI.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPI.java index 86b625abc0c..2898ade8cc1 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPI.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPI.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.api; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.data.pipeline.api.pojo.PipelineJobInfo; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI; import java.sql.SQLException; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineProcessConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineProcessConfiguration.java similarity index 94% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineProcessConfiguration.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineProcessConfiguration.java index a9932adafda..1dc3a149fe3 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineProcessConfiguration.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineProcessConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.config.rule.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineReadConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineReadConfiguration.java similarity index 95% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineReadConfiguration.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineReadConfiguration.java index 207af4c44e6..d483b0693e2 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineReadConfiguration.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineReadConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.config.rule.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineWriteConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineWriteConfiguration.java similarity index 94% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineWriteConfiguration.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineWriteConfiguration.java index e9ff81a53d0..211a1acbb6e 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/rule/data/pipeline/PipelineWriteConfiguration.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/PipelineWriteConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.config.rule.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineProcessConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfiguration.java similarity index 97% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineProcessConfiguration.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfiguration.java index 1cb6cfe7680..da9d3c431d2 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineProcessConfiguration.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process.yaml; import lombok.Getter; import lombok.Setter; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineProcessConfigurationSwapper.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfigurationSwapper.java similarity index 90% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineProcessConfigurationSwapper.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfigurationSwapper.java index 7c1f7cf4950..2988e136d8c 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineProcessConfigurationSwapper.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfigurationSwapper.java @@ -15,10 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process.yaml; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper; import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineReadConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineReadConfiguration.java similarity index 98% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineReadConfiguration.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineReadConfiguration.java index 155928c1094..57788c9d8b4 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineReadConfiguration.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineReadConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process.yaml; import lombok.Data; import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineReadConfigurationSwapper.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineReadConfigurationSwapper.java similarity index 89% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineReadConfigurationSwapper.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineReadConfigurationSwapper.java index 28e60dc3eee..ea1e8324e8e 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineReadConfigurationSwapper.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineReadConfigurationSwapper.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process.yaml; import lombok.Data; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineReadConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineReadConfiguration; import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper; import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineWriteConfiguration.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineWriteConfiguration.java similarity index 97% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineWriteConfiguration.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineWriteConfiguration.java index 29f31d227f5..4913b6d9da9 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/data/pipeline/YamlPipelineWriteConfiguration.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineWriteConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process.yaml; import lombok.Data; import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration; diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineWriteConfigurationSwapper.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineWriteConfigurationSwapper.java similarity index 89% rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineWriteConfigurationSwapper.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineWriteConfigurationSwapper.java index a86c8b4e4f0..1bbb2f88135 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineWriteConfigurationSwapper.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineWriteConfigurationSwapper.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process.yaml; import lombok.Data; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineWriteConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineWriteConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineWriteConfiguration; import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper; import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/context/PipelineProcessContext.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/context/PipelineProcessContext.java index 0ee57cb7276..9b41f930bd6 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/context/PipelineProcessContext.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/context/PipelineProcessContext.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.api.context; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; /** * Pipeline process context. diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/JobType.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/JobType.java index 24c4b1f8da3..c1c62294fb0 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/JobType.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/JobType.java @@ -49,7 +49,7 @@ public enum JobType { Preconditions.checkArgument(StringUtils.isAlpha(typeName), "type name must be character of [a-z]"); this.typeName = typeName; lowercaseTypeName = typeName.toLowerCase(); - Preconditions.checkArgument(typeCode.length() == 2, "code length is not 2"); + Preconditions.checkArgument(2 == typeCode.length(), "code length is not 2"); this.typeCode = typeCode; } diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineProcessConfigurationSwapperTest.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfigurationSwapperTest.java similarity index 85% rename from shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineProcessConfigurationSwapperTest.java rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfigurationSwapperTest.java index e6745a26e46..d29cb8505c1 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/data/pipeline/YamlPipelineProcessConfigurationSwapperTest.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/test/java/org/apache/shardingsphere/data/pipeline/api/config/process/yaml/YamlPipelineProcessConfigurationSwapperTest.java @@ -15,14 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline; +package org.apache.shardingsphere.data.pipeline.api.config.process.yaml; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineWriteConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineProcessConfiguration; import org.junit.Test; import java.util.Properties; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineJobAPI.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineJobAPI.java index 06b4c336435..9ac14928a7b 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineJobAPI.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineJobAPI.java @@ -21,9 +21,9 @@ import org.apache.shardingsphere.data.pipeline.api.PipelineJobPublicAPI; import org.apache.shardingsphere.data.pipeline.api.config.PipelineTaskConfiguration; import org.apache.shardingsphere.data.pipeline.api.config.job.PipelineJobConfiguration; import org.apache.shardingsphere.data.pipeline.api.config.job.yaml.YamlPipelineJobConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.data.pipeline.api.context.PipelineProcessContext; import org.apache.shardingsphere.data.pipeline.api.job.PipelineJobId; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java index 5d815b48012..ef3c90dd26c 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/AbstractPipelineJobAPIImpl.java @@ -21,6 +21,9 @@ import com.google.common.base.Preconditions; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.api.config.job.PipelineJobConfiguration; import org.apache.shardingsphere.data.pipeline.api.config.job.yaml.YamlPipelineJobConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfigurationSwapper; import org.apache.shardingsphere.data.pipeline.api.job.JobType; import org.apache.shardingsphere.data.pipeline.api.job.PipelineJobId; import org.apache.shardingsphere.data.pipeline.api.pojo.PipelineJobInfo; @@ -28,8 +31,8 @@ import org.apache.shardingsphere.data.pipeline.core.api.GovernanceRepositoryAPI; import org.apache.shardingsphere.data.pipeline.core.api.PipelineAPIFactory; import org.apache.shardingsphere.data.pipeline.core.api.PipelineJobAPI; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContext; -import org.apache.shardingsphere.data.pipeline.core.exception.job.PipelineJobHasAlreadyStartedException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PipelineJobCreationWithInvalidShardingCountException; +import org.apache.shardingsphere.data.pipeline.core.exception.job.PipelineJobHasAlreadyStartedException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PipelineJobNotFoundException; import org.apache.shardingsphere.data.pipeline.core.exception.metadata.AlterNotExistProcessConfigurationException; import org.apache.shardingsphere.data.pipeline.core.exception.metadata.CreateExistsProcessConfigurationException; @@ -41,11 +44,8 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJob; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.JobBriefInfo; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline.YamlPipelineProcessConfigurationSwapper; import java.sql.SQLException; import java.time.LocalDateTime; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistService.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistService.java index c6c5079b5c1..40a38f52266 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistService.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistService.java @@ -18,13 +18,13 @@ package org.apache.shardingsphere.data.pipeline.core.api.impl; import org.apache.commons.lang3.StringUtils; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfigurationSwapper; import org.apache.shardingsphere.data.pipeline.api.job.JobType; import org.apache.shardingsphere.data.pipeline.core.api.PipelineAPIFactory; import org.apache.shardingsphere.data.pipeline.core.api.PipelineMetaDataPersistService; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline.YamlPipelineProcessConfigurationSwapper; /** * Pipeline process configuration persist service. diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/AbstractInventoryIncrementalProcessContext.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/AbstractInventoryIncrementalProcessContext.java index 3497e683a6d..d04fb51346d 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/AbstractInventoryIncrementalProcessContext.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/context/AbstractInventoryIncrementalProcessContext.java @@ -22,6 +22,9 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.ConcurrentException; import org.apache.commons.lang3.concurrent.LazyInitializer; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineWriteConfiguration; import org.apache.shardingsphere.data.pipeline.core.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.core.util.PipelineProcessConfigurationUtils; import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChannelCreator; @@ -29,9 +32,6 @@ import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChanne import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithmFactory; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineReadConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineWriteConfiguration; /** * Abstract inventory incremental process context. diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/persist/PipelineJobProgressPersistService.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/persist/PipelineJobProgressPersistService.java index 73e185ab0c4..2fc2045a136 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/persist/PipelineJobProgressPersistService.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/persist/PipelineJobProgressPersistService.java @@ -95,7 +95,6 @@ public final class PipelineJobProgressPersistService { } Optional<PipelineJobItemContext> jobItemContext = PipelineJobCenter.getJobItemContext(jobId, shardingItem); if (!jobItemContext.isPresent()) { - log.warn("persist, job item context does not exist, jobId={}, shardingItem={}", jobId, shardingItem); return; } if (null == beforePersistingProgressMillis) { @@ -106,7 +105,7 @@ public final class PipelineJobProgressPersistService { PipelineAPIFactory.getPipelineJobAPI(PipelineJobIdUtils.parseJobType(jobId)).persistJobItemProgress(jobItemContext.get()); persistContext.getBeforePersistingProgressMillis().set(null); if (6 == ThreadLocalRandom.current().nextInt(100)) { - log.info("persist, jobId={}, shardingItem={}, cost time: {} ms", jobId, shardingItem, System.currentTimeMillis() - startTimeMillis); + log.info("persist, jobId={}, shardingItem={}, cost {} ms", jobId, shardingItem, System.currentTimeMillis() - startTimeMillis); } } diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java index e4e36bd727d..6a8eed153e0 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java @@ -30,7 +30,7 @@ import java.util.regex.Pattern; @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class PipelineMetaDataNode { - private static final String JOB_PATTERN_PREFIX = DataPipelineConstants.DATA_PIPELINE_ROOT + "/jobs/(j\\d{2}[0-9a-f]+)"; + private static final String JOB_PATTERN_PREFIX = DataPipelineConstants.DATA_PIPELINE_ROOT + "/jobs/(j\\d{2}\\d{2}[0-9a-f]+)"; public static final Pattern CONFIG_PATTERN = Pattern.compile(JOB_PATTERN_PREFIX + "/config"); diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java index 0d3a57f8ada..2e72e3e2451 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java @@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.api.config.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.api.config.ingest.InventoryDumperConfiguration; import org.apache.shardingsphere.data.pipeline.api.config.job.PipelineJobConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineReadConfiguration; import org.apache.shardingsphere.data.pipeline.api.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.api.datasource.PipelineDataSourceWrapper; import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; @@ -42,7 +43,6 @@ import org.apache.shardingsphere.data.pipeline.core.task.InventoryTask; import org.apache.shardingsphere.data.pipeline.core.util.PipelineJdbcUtils; import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChannelCreator; import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineReadConfiguration; import javax.sql.DataSource; import java.sql.Connection; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineProcessConfigurationUtils.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineProcessConfigurationUtils.java index 8273884ed91..b9369180c14 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineProcessConfigurationUtils.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineProcessConfigurationUtils.java @@ -18,13 +18,13 @@ package org.apache.shardingsphere.data.pipeline.core.util; import com.google.common.base.Splitter; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineWriteConfiguration; import org.apache.shardingsphere.data.pipeline.core.ingest.channel.memory.MemoryPipelineChannelCreator; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineWriteConfiguration; -import org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline.YamlPipelineProcessConfigurationSwapper; import java.util.List; import java.util.Properties; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPI.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPI.java index 383cf7e9581..982a99f2e9e 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPI.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPI.java @@ -21,9 +21,9 @@ import org.apache.shardingsphere.data.pipeline.api.MigrationJobPublicAPI; import org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyCheckResult; import org.apache.shardingsphere.data.pipeline.api.config.job.MigrationJobConfiguration; import org.apache.shardingsphere.data.pipeline.api.config.job.PipelineJobConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.data.pipeline.api.job.progress.InventoryIncrementalJobItemProgress; import org.apache.shardingsphere.data.pipeline.core.api.PipelineJobAPI; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.util.spi.type.required.RequiredSPI; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java index bc2dc0c57ae..087e6eea741 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java @@ -33,6 +33,7 @@ import org.apache.shardingsphere.data.pipeline.api.config.job.PipelineJobConfigu import org.apache.shardingsphere.data.pipeline.api.config.job.yaml.YamlMigrationJobConfiguration; import org.apache.shardingsphere.data.pipeline.api.config.job.yaml.YamlMigrationJobConfigurationSwapper; import org.apache.shardingsphere.data.pipeline.api.config.job.yaml.YamlPipelineJobConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.data.pipeline.api.context.PipelineJobItemContext; import org.apache.shardingsphere.data.pipeline.api.datanode.JobDataNodeEntry; import org.apache.shardingsphere.data.pipeline.api.datanode.JobDataNodeLine; @@ -75,7 +76,6 @@ import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorit import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.PipelineSQLBuilder; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine; diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationProcessContext.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationProcessContext.java index aa2db5d4be6..b2e11b30c15 100644 --- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationProcessContext.java +++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationProcessContext.java @@ -19,8 +19,8 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.data.pipeline.core.context.AbstractInventoryIncrementalProcessContext; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; /** * Migration process context. diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationProcessConfigurationQueryResultSet.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationProcessConfigurationQueryResultSet.java index c6457d9863e..b123b2fdf68 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationProcessConfigurationQueryResultSet.java +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationProcessConfigurationQueryResultSet.java @@ -20,8 +20,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import com.google.gson.Gson; import org.apache.shardingsphere.data.pipeline.api.MigrationJobPublicAPI; import org.apache.shardingsphere.data.pipeline.api.PipelineJobPublicAPIFactory; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowMigrationProcessConfigurationStatement; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.distsql.query.DatabaseDistSQLResultSet; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalProcessConfigurationUpdater.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalProcessConfigurationUpdater.java index b85b0ef3462..8c8e405a871 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalProcessConfigurationUpdater.java +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalProcessConfigurationUpdater.java @@ -19,8 +19,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.data.pipeline.api.PipelineJobPublicAPI; import org.apache.shardingsphere.data.pipeline.api.PipelineJobPublicAPIFactory; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterInventoryIncrementalProcessConfigurationStatement; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.distsql.update.RALUpdater; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.converter.InventoryIncrementalProcessConfigurationSegmentConverter; diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/CreateInventoryIncrementalProcessConfigurationUpdater.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/CreateInventoryIncrementalProcessConfigurationUpdater.java index e91ef111dc7..97454efb0ba 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/CreateInventoryIncrementalProcessConfigurationUpdater.java +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/CreateInventoryIncrementalProcessConfigurationUpdater.java @@ -19,8 +19,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.data.pipeline.api.PipelineJobPublicAPI; import org.apache.shardingsphere.data.pipeline.api.PipelineJobPublicAPIFactory; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.CreateInventoryIncrementalProcessConfigurationStatement; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.distsql.update.RALUpdater; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.converter.InventoryIncrementalProcessConfigurationSegmentConverter; diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java index 1eb533c1c0d..9ca313c150a 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java +++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java @@ -19,13 +19,13 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.co import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineWriteConfiguration; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; import org.apache.shardingsphere.distsql.parser.segment.InventoryIncrementalProcessConfigurationSegment; import org.apache.shardingsphere.distsql.parser.segment.ReadOrWriteSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineReadConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineWriteConfiguration; /** * Inventory incremental process configuration segment converter. diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/logback.xml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/logback.xml index bb213a9e6d7..efeb323b7d0 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/logback.xml +++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/logback.xml @@ -32,8 +32,6 @@ <logger name="io.netty" level="error" /> - <logger name="org.apache.shardingsphere.elasticjob" level="debug" /> - <root> <level value="info" /> <appender-ref ref="console" /> diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java index 6f651fca85a..25a4a0f2487 100644 --- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java +++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java @@ -17,16 +17,16 @@ package org.apache.shardingsphere.data.pipeline.core.api.impl; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineReadConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineWriteConfiguration; import org.apache.shardingsphere.data.pipeline.api.job.JobType; import org.apache.shardingsphere.data.pipeline.core.ingest.channel.memory.MemoryPipelineChannelCreator; import org.apache.shardingsphere.data.pipeline.core.util.PipelineContextUtil; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineWriteConfiguration; -import org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline.YamlPipelineProcessConfigurationSwapper; import org.junit.BeforeClass; import org.junit.Test; diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java index d98bc93950c..2feab94d054 100644 --- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java +++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java @@ -21,6 +21,10 @@ import lombok.SneakyThrows; import org.apache.commons.lang3.concurrent.ConcurrentException; import org.apache.commons.lang3.concurrent.LazyInitializer; import org.apache.shardingsphere.data.pipeline.api.config.job.MigrationJobConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfiguration; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineProcessConfigurationSwapper; +import org.apache.shardingsphere.data.pipeline.api.config.process.yaml.YamlPipelineReadConfiguration; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.core.context.PipelineContext; import org.apache.shardingsphere.data.pipeline.core.datasource.DefaultPipelineDataSourceManager; @@ -35,13 +39,9 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationTaskC import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChannelCreator; import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; -import org.apache.shardingsphere.infra.config.rule.data.pipeline.PipelineProcessConfiguration; import org.apache.shardingsphere.infra.database.DefaultDatabase; import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereColumn; import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineProcessConfiguration; -import org.apache.shardingsphere.infra.yaml.config.pojo.data.pipeline.YamlPipelineReadConfiguration; -import org.apache.shardingsphere.infra.yaml.config.swapper.rule.data.pipeline.YamlPipelineProcessConfigurationSwapper; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.metadata.MetaDataContexts; import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;