From e4823a02ea5d065d927a7b16cb1207cab906e699 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Mon, 6 Nov 2023 16:01:29 +0800 Subject: [PATCH] Move pipeline API into pipeline-core module --- .../yaml/YamlJobItemIncrementalTasksProgressSwapper.java | 2 +- .../common/metadata/generator/PipelineDDLGenerator.java | 2 +- .../pipeline/common}/spi/check/DialectDataSourceChecker.java | 2 +- .../common}/spi/ddlgenerator/CreateTableSQLGenerator.java | 2 +- .../common}/spi/ingest/dumper/DialectColumnValueReader.java | 2 +- .../common}/spi/ingest/dumper/IncrementalDumperCreator.java | 2 +- .../common}/spi/ingest/position/PositionInitializer.java | 2 +- .../common}/spi/sqlbuilder/DialectPipelineSQLBuilder.java | 2 +- .../pipeline/common/sqlbuilder/PipelineCommonSQLBuilder.java | 2 +- .../PipelineDataConsistencyCalculateSQLBuilder.java | 2 +- .../pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java | 2 +- .../data/pipeline/core/dumper/ColumnValueReaderEngine.java | 2 +- .../data/pipeline/core/preparer/PipelineJobPreparerUtils.java | 4 ++-- .../core/preparer/datasource/DataSourceCheckEngine.java | 2 +- .../common/ingest/position/FixturePositionInitializer.java | 2 +- .../common/sqlbuilder/fixture/FixturePipelineSQLBuilder.java | 2 +- ...a.pipeline.common.spi.ingest.position.PositionInitializer} | 0 ....pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} | 0 .../pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java | 2 +- .../data/pipeline/h2/sqlbuilder/H2PipelineSQLBuilder.java | 2 +- ...ipeline.common.spi.ingest.dumper.IncrementalDumperCreator} | 0 ....pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} | 0 .../mysql/check/datasource/MySQLDataSourceChecker.java | 2 +- .../mysql/ddlgenerator/MySQLCreateTableSQLGenerator.java | 2 +- .../data/pipeline/mysql/ingest/MySQLColumnValueReader.java | 2 +- .../data/pipeline/mysql/ingest/MySQLPositionInitializer.java | 2 +- .../mysql/ingest/dumper/MySQLIncrementalDumperCreator.java | 2 +- .../pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java | 2 +- ...e.data.pipeline.common.spi.check.DialectDataSourceChecker} | 0 ....pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} | 0 ...ipeline.common.spi.ingest.dumper.DialectColumnValueReader} | 0 ...ipeline.common.spi.ingest.dumper.IncrementalDumperCreator} | 0 ...a.pipeline.common.spi.ingest.position.PositionInitializer} | 0 ....pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} | 0 .../check/datasource/OpenGaussDataSourceChecker.java | 2 +- .../ddlgenerator/OpenGaussCreateTableSQLGenerator.java | 2 +- .../opengauss/ingest/OpenGaussPositionInitializer.java | 2 +- .../ingest/dumper/OpenGaussIncrementalDumperCreator.java | 2 +- .../opengauss/ingest/wal/OpenGaussColumnValueReader.java | 2 +- .../opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java | 2 +- ...e.data.pipeline.common.spi.check.DialectDataSourceChecker} | 0 ....pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} | 0 ...ipeline.common.spi.ingest.dumper.DialectColumnValueReader} | 0 ...ipeline.common.spi.ingest.dumper.IncrementalDumperCreator} | 0 ...a.pipeline.common.spi.ingest.position.PositionInitializer} | 0 ....pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} | 0 .../check/datasource/PostgreSQLDataSourceChecker.java | 2 +- .../ddlgenerator/PostgreSQLCreateTableSQLGenerator.java | 2 +- .../postgresql/ingest/PostgreSQLColumnValueReader.java | 2 +- .../postgresql/ingest/PostgreSQLPositionInitializer.java | 2 +- .../ingest/dumper/PostgreSQLIncrementalDumperCreator.java | 2 +- .../postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java | 2 +- ...e.data.pipeline.common.spi.check.DialectDataSourceChecker} | 0 ....pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} | 0 ...ipeline.common.spi.ingest.dumper.DialectColumnValueReader} | 0 ...ipeline.common.spi.ingest.dumper.IncrementalDumperCreator} | 0 ...a.pipeline.common.spi.ingest.position.PositionInitializer} | 0 ....pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} | 0 .../data/pipeline/cdc/core/prepare/CDCJobPreparer.java | 2 +- .../scenario/migration/prepare/MigrationJobPreparer.java | 2 +- .../pipeline/cases/createtable/CreateTableSQLGeneratorIT.java | 2 +- .../data/pipeline/core/fixture/FixtureColumnValueReader.java | 2 +- .../data/pipeline/core/fixture/FixtureDataSourceChecker.java | 2 +- .../core/fixture/FixtureIncrementalDumperCreator.java | 2 +- .../data/pipeline/core/fixture/H2CreateTableSQLGenerator.java | 2 +- .../it/data/pipeline/core/fixture/H2PositionInitializer.java | 2 +- ...e.data.pipeline.common.spi.check.DialectDataSourceChecker} | 0 ....pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} | 0 ...ipeline.common.spi.ingest.dumper.DialectColumnValueReader} | 0 ...ipeline.common.spi.ingest.dumper.IncrementalDumperCreator} | 0 ...a.pipeline.common.spi.ingest.position.PositionInitializer} | 0 71 files changed, 45 insertions(+), 45 deletions(-) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/spi/check/DialectDataSourceChecker.java (95%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/spi/ddlgenerator/CreateTableSQLGenerator.java (95%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/spi/ingest/dumper/DialectColumnValueReader.java (95%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/spi/ingest/dumper/IncrementalDumperCreator.java (96%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/spi/ingest/position/PositionInitializer.java (96%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/spi/sqlbuilder/DialectPipelineSQLBuilder.java (97%) rename kernel/data-pipeline/core/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer => org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer} (100%) rename kernel/data-pipeline/core/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator} (100%) rename kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer => org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer => org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer => org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder} (100%) rename test/it/pipeline/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker} (100%) rename test/it/pipeline/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator} (100%) rename test/it/pipeline/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader} (100%) rename test/it/pipeline/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator => org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator} (100%) rename test/it/pipeline/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer => org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer} (100%) diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/yaml/YamlJobItemIncrementalTasksProgressSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/yaml/YamlJobItemIncrementalTasksProgressSwapper.java index 6ed07666781dd..0ae5c5f70808e 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/yaml/YamlJobItemIncrementalTasksProgressSwapper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/yaml/YamlJobItemIncrementalTasksProgressSwapper.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.data.pipeline.common.job.progress.JobItemIncrementalTasksProgress; import org.apache.shardingsphere.data.pipeline.common.task.progress.IncrementalTaskProgress; -import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/metadata/generator/PipelineDDLGenerator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/metadata/generator/PipelineDDLGenerator.java index 07e770e28ff08..ab194cbd4906c 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/metadata/generator/PipelineDDLGenerator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/metadata/generator/PipelineDDLGenerator.java @@ -19,7 +19,7 @@ import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator; import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; import org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterTableStatementContext; import org.apache.shardingsphere.infra.binder.context.statement.ddl.CommentStatementContext; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/DialectDataSourceChecker.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/check/DialectDataSourceChecker.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/DialectDataSourceChecker.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/check/DialectDataSourceChecker.java index 548eabbafb09d..547b4f16d9073 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/DialectDataSourceChecker.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/check/DialectDataSourceChecker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.spi.check; +package org.apache.shardingsphere.data.pipeline.common.spi.check; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ddlgenerator/CreateTableSQLGenerator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ddlgenerator/CreateTableSQLGenerator.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ddlgenerator/CreateTableSQLGenerator.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ddlgenerator/CreateTableSQLGenerator.java index d774aeaaf6b15..106cdd38e3cf9 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ddlgenerator/CreateTableSQLGenerator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ddlgenerator/CreateTableSQLGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.spi.ddlgenerator; +package org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/dumper/DialectColumnValueReader.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/DialectColumnValueReader.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/dumper/DialectColumnValueReader.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/DialectColumnValueReader.java index 5a27b1e361cf4..2d4d03d6a0a74 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/dumper/DialectColumnValueReader.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/DialectColumnValueReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.spi.ingest.dumper; +package org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/dumper/IncrementalDumperCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/IncrementalDumperCreator.java similarity index 96% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/dumper/IncrementalDumperCreator.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/IncrementalDumperCreator.java index 3f9142457ea96..d38dcaf9759ff 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/dumper/IncrementalDumperCreator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/IncrementalDumperCreator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.spi.ingest.dumper; +package org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper; import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/position/PositionInitializer.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/position/PositionInitializer.java similarity index 96% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/position/PositionInitializer.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/position/PositionInitializer.java index f4e2b7a474257..cc969da829746 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ingest/position/PositionInitializer.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/position/PositionInitializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.spi.ingest.position; +package org.apache.shardingsphere.data.pipeline.common.spi.ingest.position; import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/sqlbuilder/DialectPipelineSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java similarity index 97% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/sqlbuilder/DialectPipelineSQLBuilder.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java index 039fe5338525d..a39f2ea63a3e0 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/sqlbuilder/DialectPipelineSQLBuilder.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.spi.sqlbuilder; +package org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder; import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineCommonSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineCommonSQLBuilder.java index 39091ae3f1cdc..052b78ea95904 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineCommonSQLBuilder.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineCommonSQLBuilder.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineDataConsistencyCalculateSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineDataConsistencyCalculateSQLBuilder.java index 60e2f19ee55ee..7ef3edb3d51b3 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineDataConsistencyCalculateSQLBuilder.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineDataConsistencyCalculateSQLBuilder.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java index 377d76c9ba3b4..329bc1758ddcf 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java @@ -21,7 +21,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/ColumnValueReaderEngine.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/ColumnValueReaderEngine.java index 0756e622e251a..cc800da199755 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/ColumnValueReaderEngine.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/ColumnValueReaderEngine.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.core.dumper; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; 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/PipelineJobPreparerUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java index e40fa297fe0a1..da63af649ee88 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 @@ -33,8 +33,8 @@ import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.DataSourcePreparer; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetSchemasParameter; import org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareTargetTablesParameter; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; -import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java index d801148321c24..5c5f75f2d7feb 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineCommonSQLBuilder; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithInvalidConnectionException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithTargetTableNotEmptyException; -import org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FixturePositionInitializer.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FixturePositionInitializer.java index 3d3da5ea23684..78ba038930945 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FixturePositionInitializer.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FixturePositionInitializer.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.ingest.position; -import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/fixture/FixturePipelineSQLBuilder.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/fixture/FixturePipelineSQLBuilder.java index 8bb5d56b74e1a..666a6c5930df9 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/fixture/FixturePipelineSQLBuilder.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/fixture/FixturePipelineSQLBuilder.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.sqlbuilder.fixture; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import java.util.Optional; diff --git a/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer b/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer similarity index 100% rename from kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer rename to kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer diff --git a/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder diff --git a/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java b/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java index e295ffff0f477..268d82961b9aa 100644 --- a/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; /** * H2 incremental dumper creator. diff --git a/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/sqlbuilder/H2PipelineSQLBuilder.java b/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/sqlbuilder/H2PipelineSQLBuilder.java index 6025f61e06bc2..4680e5d8f763e 100644 --- a/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/sqlbuilder/H2PipelineSQLBuilder.java +++ b/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/sqlbuilder/H2PipelineSQLBuilder.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.h2.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; public final class H2PipelineSQLBuilder implements DialectPipelineSQLBuilder { diff --git a/kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator b/kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator similarity index 100% rename from kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator rename to kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator diff --git a/kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java index 1ed3b40b4ad6e..af7ba5053563f 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/check/datasource/MySQLDataSourceChecker.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithCheckPrivilegeFailedException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithInvalidSourceDataSourceException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutEnoughPrivilegeException; -import org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ddlgenerator/MySQLCreateTableSQLGenerator.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ddlgenerator/MySQLCreateTableSQLGenerator.java index 3bbeeb484af9b..c62861efa999a 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ddlgenerator/MySQLCreateTableSQLGenerator.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ddlgenerator/MySQLCreateTableSQLGenerator.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.data.pipeline.mysql.ddlgenerator; import org.apache.shardingsphere.data.pipeline.core.exception.syntax.CreateTableSQLGenerateException; -import org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator; import javax.sql.DataSource; import java.sql.Connection; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLColumnValueReader.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLColumnValueReader.java index 39ba4fef81d50..a3b334f5d025e 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLColumnValueReader.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLColumnValueReader.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.mysql.ingest; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLPositionInitializer.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLPositionInitializer.java index 50aec801c9a51..68b61351356a9 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLPositionInitializer.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLPositionInitializer.java @@ -19,7 +19,7 @@ import com.google.common.base.Preconditions; import org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.BinlogPosition; -import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer; import javax.sql.DataSource; import java.sql.Connection; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java index f518f0c1b3ee7..5de0f82e9a7f3 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.mysql.ingest.MySQLIncrementalDumper; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; /** * MySQL incremental dumper creator. diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java index d6ac2df045bb0..6c79f1f4a995e 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import java.util.Optional; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java index e3464f94e8809..7d56c34ed1b2c 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/check/datasource/OpenGaussDataSourceChecker.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithCheckPrivilegeFailedException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutEnoughPrivilegeException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutUserException; -import org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ddlgenerator/OpenGaussCreateTableSQLGenerator.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ddlgenerator/OpenGaussCreateTableSQLGenerator.java index 6de596ef92eaa..3dbaf86cc79ac 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ddlgenerator/OpenGaussCreateTableSQLGenerator.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ddlgenerator/OpenGaussCreateTableSQLGenerator.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.data.pipeline.opengauss.ddlgenerator; import org.apache.shardingsphere.data.pipeline.core.exception.syntax.CreateTableSQLGenerateException; -import org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator; import javax.sql.DataSource; import java.sql.Connection; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussPositionInitializer.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussPositionInitializer.java index fa4a1379969db..e06aa53783a6e 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussPositionInitializer.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussPositionInitializer.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.opengauss.ingest.wal.decode.OpenGaussLogSequenceNumber; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.pojo.ReplicationSlotInfo; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.WALPosition; -import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer; import org.opengauss.replication.LogSequenceNumber; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java index bbd7be711c6e5..78a75779d35e0 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.opengauss.ingest.OpenGaussWALDumper; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; /** * OpenGauss incremental dumper creator. diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussColumnValueReader.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussColumnValueReader.java index ab245d586206f..451adcc228e20 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussColumnValueReader.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussColumnValueReader.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.opengauss.ingest.wal; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java index 7fcb88eda052a..264b6c8c9638a 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import java.util.Optional; import java.util.stream.Collectors; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java index 29d522af203d5..7cfbcbd31fcef 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/check/datasource/PostgreSQLDataSourceChecker.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithCheckPrivilegeFailedException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutEnoughPrivilegeException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithoutUserException; -import org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java index a1e38cd5f5ad9..043d54d33e0e2 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator; import org.apache.shardingsphere.data.pipeline.postgresql.util.PostgreSQLPipelineFreemarkerManager; -import org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator; import javax.sql.DataSource; import java.sql.Connection; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java index 9388c6d7f0a5c..0e8650194e421 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.postgresql.ingest; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader; import org.postgresql.util.PGobject; import java.sql.ResultSet; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLPositionInitializer.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLPositionInitializer.java index c13647687ff78..9ca82e8c831a4 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLPositionInitializer.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLPositionInitializer.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.core.exception.PipelineInternalException; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.WALPosition; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.PostgreSQLLogSequenceNumber; -import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer; import org.postgresql.replication.LogSequenceNumber; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java index 311117e518c36..958f0ea613a2e 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.PostgreSQLWALDumper; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; /** * PostgreSQL incremental dumper creator. diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java index e9d31886c4ab7..da4ce677efa18 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; -import org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import java.util.Optional; import java.util.stream.Collectors; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder 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 3d0f982de5981..8a5523b88ae1b 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 @@ -45,7 +45,7 @@ import org.apache.shardingsphere.data.pipeline.core.preparer.PipelineJobPreparerUtils; import org.apache.shardingsphere.data.pipeline.core.task.PipelineTask; import org.apache.shardingsphere.data.pipeline.core.task.PipelineTaskUtils; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.opengauss.type.OpenGaussDatabaseType; 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 a017a3559d26b..31b2a3ce35b69 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 @@ -55,7 +55,7 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationTaskConfiguration; import org.apache.shardingsphere.data.pipeline.scenario.migration.context.MigrationJobItemContext; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; import org.apache.shardingsphere.infra.lock.GlobalLockNames; import org.apache.shardingsphere.infra.lock.LockContext; import org.apache.shardingsphere.infra.lock.LockDefinition; diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java index 03e72c6f07879..00e4b609ee82a 100644 --- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java +++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.cases.createtable; -import org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureColumnValueReader.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureColumnValueReader.java index a801734921f0e..fe2000f06252a 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureColumnValueReader.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureColumnValueReader.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.fixture; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java index e18e2acc314e8..1df0988c4df1e 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.fixture; -import org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker; import javax.sql.DataSource; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java index d2277037ea8ab..6b55b8454ee18 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; -import org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; /** * Fixture incremental dumper creator. diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2CreateTableSQLGenerator.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2CreateTableSQLGenerator.java index 06c04a91813d7..84f8bc7fbf81f 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2CreateTableSQLGenerator.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2CreateTableSQLGenerator.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.fixture; import org.apache.shardingsphere.data.pipeline.core.exception.syntax.CreateTableSQLGenerateException; -import org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator; import org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils; import javax.sql.DataSource; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2PositionInitializer.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2PositionInitializer.java index 8c0fa4ba5f978..e11f693ed0891 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2PositionInitializer.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/H2PositionInitializer.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.fixture; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; -import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer; +import org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer; import javax.sql.DataSource; diff --git a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker similarity index 100% rename from test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.check.DialectDataSourceChecker rename to test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker diff --git a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator similarity index 100% rename from test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ddlgenerator.CreateTableSQLGenerator rename to test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator diff --git a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader similarity index 100% rename from test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.DialectColumnValueReader rename to test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader diff --git a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator similarity index 100% rename from test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator rename to test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator diff --git a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer similarity index 100% rename from test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer rename to test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ingest.position.PositionInitializer