From f9c5dd6c100c64e92c654e40bc89fbe8cd849669 Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Tue, 7 Nov 2023 10:12:34 +0800 Subject: [PATCH] Refactor pipeline's SPI package (#28964) --- .../data/pipeline/common/config/ImporterConfiguration.java | 2 +- .../context/AbstractInventoryIncrementalProcessContext.java | 2 +- .../common/context/InventoryIncrementalProcessContext.java | 2 +- .../common/metadata/generator/PipelineDDLGenerator.java | 2 +- .../pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java | 2 +- .../pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java | 2 +- .../spi/{ratelimit => algorithm}/JobRateLimitAlgorithm.java | 2 +- .../spi/{check => datasource}/DialectDataSourceChecker.java | 2 +- .../spi/{ddlgenerator => sql}/CreateTableSQLGenerator.java | 2 +- .../spi/{sqlbuilder => sql}/DialectPipelineSQLBuilder.java | 2 +- .../pipeline/common/sqlbuilder/PipelineCommonSQLBuilder.java | 2 +- .../sqlbuilder/PipelineDataConsistencyCalculateSQLBuilder.java | 2 +- .../pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java | 2 +- .../consistencycheck/table/TableInventoryCheckParameter.java | 2 +- .../pipeline/core/importer/sink/PipelineDataSourceSink.java | 2 +- .../data/pipeline/core/ingest/dumper/InventoryDumper.java | 2 +- .../core/ingest/dumper/context/InventoryDumperContext.java | 2 +- .../data/pipeline/core/preparer/InventoryTaskSplitter.java | 2 +- .../core/preparer/datasource/DataSourceCheckEngine.java | 2 +- ...re.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm} | 0 .../pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java | 2 +- .../pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java | 2 +- .../common/sqlbuilder/fixture/FixturePipelineSQLBuilder.java | 2 +- ...here.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} | 0 .../data/pipeline/h2/sqlbuilder/H2PipelineSQLBuilder.java | 2 +- ...here.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} | 0 .../pipeline/mysql/check/datasource/MySQLDataSourceChecker.java | 2 +- .../mysql/ddlgenerator/MySQLCreateTableSQLGenerator.java | 2 +- .../data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java | 2 +- ...ata.pipeline.common.spi.datasource.DialectDataSourceChecker} | 0 ...sphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} | 0 ...here.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} | 0 .../opengauss/check/datasource/OpenGaussDataSourceChecker.java | 2 +- .../ddlgenerator/OpenGaussCreateTableSQLGenerator.java | 2 +- .../opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java | 2 +- ...ata.pipeline.common.spi.datasource.DialectDataSourceChecker} | 0 ...sphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} | 0 ...here.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} | 0 .../check/datasource/PostgreSQLDataSourceChecker.java | 2 +- .../ddlgenerator/PostgreSQLCreateTableSQLGenerator.java | 2 +- .../postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java | 2 +- ...ata.pipeline.common.spi.datasource.DialectDataSourceChecker} | 0 ...sphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} | 0 ...here.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} | 0 .../spi/ratelimit/InputJobRateLimitAlgorithmFixture.java | 2 +- .../spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java | 2 +- ...re.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm} | 0 .../shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java | 2 +- .../data/pipeline/cdc/core/importer/CDCImporter.java | 2 +- .../pipeline/scenario/migration/api/impl/MigrationJobAPI.java | 2 +- .../check/consistency/MigrationDataConsistencyChecker.java | 2 +- .../pipeline/cases/createtable/CreateTableSQLGeneratorIT.java | 2 +- .../it/data/pipeline/core/fixture/FixtureDataSourceChecker.java | 2 +- .../data/pipeline/core/fixture/H2CreateTableSQLGenerator.java | 2 +- ...ata.pipeline.common.spi.datasource.DialectDataSourceChecker} | 0 ...sphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} | 0 56 files changed, 41 insertions(+), 41 deletions(-) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/{ratelimit => algorithm}/JobRateLimitAlgorithm.java (94%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/{check => datasource}/DialectDataSourceChecker.java (95%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/{ddlgenerator => sql}/CreateTableSQLGenerator.java (95%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/{sqlbuilder => sql}/DialectPipelineSQLBuilder.java (97%) rename kernel/data-pipeline/core/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm => org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm} (100%) rename kernel/data-pipeline/core/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder => org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder} (100%) rename kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm => org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm} (100%) rename test/it/pipeline/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker => org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker} (100%) rename test/it/pipeline/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator => org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator} (100%) diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java index 261f9987e8c60..676509fbb5ce8 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.common.metadata.LogicTableName; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java index 1208e78a5ec45..245439f85b772 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.common.ingest.channel.PipelineChannelCreator; import org.apache.shardingsphere.data.pipeline.common.util.PipelineLazyInitializer; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; 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/context/InventoryIncrementalProcessContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java index fbb0ef8ea7ab5..8b57d763e9139 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.common.ingest.channel.PipelineChannelCreator; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; /** * Inventory incremental process context. 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 ab194cbd4906c..7709294e44078 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.common.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java index b26a1219352cd..9da1a8d9707fc 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java @@ -21,7 +21,7 @@ import com.google.common.util.concurrent.RateLimiter; import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import java.util.Properties; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java index cb495e1fae0ea..f971b9dbc5c00 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java @@ -21,7 +21,7 @@ import com.google.common.util.concurrent.RateLimiter; import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import java.util.Properties; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ratelimit/JobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/algorithm/JobRateLimitAlgorithm.java similarity index 94% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ratelimit/JobRateLimitAlgorithm.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/algorithm/JobRateLimitAlgorithm.java index d2eebbf97c9e5..e5d3568cd8242 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ratelimit/JobRateLimitAlgorithm.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/algorithm/JobRateLimitAlgorithm.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.common.spi.ratelimit; +package org.apache.shardingsphere.data.pipeline.common.spi.algorithm; import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.infra.algorithm.ShardingSphereAlgorithm; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/check/DialectDataSourceChecker.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/datasource/DialectDataSourceChecker.java similarity index 95% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/check/DialectDataSourceChecker.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/datasource/DialectDataSourceChecker.java index 547b4f16d9073..bc3e245f402cf 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/check/DialectDataSourceChecker.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/datasource/DialectDataSourceChecker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.common.spi.check; +package org.apache.shardingsphere.data.pipeline.common.spi.datasource; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ddlgenerator/CreateTableSQLGenerator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sql/CreateTableSQLGenerator.java similarity index 95% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ddlgenerator/CreateTableSQLGenerator.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sql/CreateTableSQLGenerator.java index 106cdd38e3cf9..f356526ab0aeb 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ddlgenerator/CreateTableSQLGenerator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sql/CreateTableSQLGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator; +package org.apache.shardingsphere.data.pipeline.common.spi.sql; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sql/DialectPipelineSQLBuilder.java similarity index 97% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sql/DialectPipelineSQLBuilder.java index 669448c501e22..69374c7644954 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sql/DialectPipelineSQLBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder; +package org.apache.shardingsphere.data.pipeline.common.spi.sql; import org.apache.shardingsphere.data.pipeline.core.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 052b78ea95904..bde2351f4e520 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.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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 7ef3edb3d51b3..d792b30df53bc 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.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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 6e3346dfbb5f1..9c3780711634b 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.core.ingest.record.Column; import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; -import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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/consistencycheck/table/TableInventoryCheckParameter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/TableInventoryCheckParameter.java index bd88b3b091ec3..444591e409b6d 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/TableInventoryCheckParameter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/TableInventoryCheckParameter.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.common.metadata.model.PipelineColumnMetaData; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceWrapper; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.ConsistencyCheckJobItemProgressContext; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import java.util.List; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java index c800344a56eef..27aa52f2fec0a 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java @@ -35,7 +35,7 @@ import org.apache.shardingsphere.data.pipeline.common.util.PipelineJdbcUtils; import org.apache.shardingsphere.data.pipeline.core.exception.job.PipelineImporterJobWriteException; import org.apache.shardingsphere.data.pipeline.core.importer.DataRecordMerger; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import javax.sql.DataSource; import java.sql.Connection; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/InventoryDumper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/InventoryDumper.java index e437bdf0f55aa..07e057e889361 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/InventoryDumper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/InventoryDumper.java @@ -43,7 +43,7 @@ import org.apache.shardingsphere.data.pipeline.common.util.PipelineJdbcUtils; import org.apache.shardingsphere.data.pipeline.core.exception.IngestException; import org.apache.shardingsphere.data.pipeline.core.exception.param.PipelineInvalidParameterException; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/InventoryDumperContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/InventoryDumperContext.java index 40d419fb74bbb..efc392e37bf3a 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/InventoryDumperContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/InventoryDumperContext.java @@ -21,7 +21,7 @@ import lombok.Setter; import lombok.ToString; import org.apache.shardingsphere.data.pipeline.common.metadata.model.PipelineColumnMetaData; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import java.util.List; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java index 3333de8de1899..0845a42c5e05b 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java @@ -45,7 +45,7 @@ import org.apache.shardingsphere.data.pipeline.core.importer.SingleChannelConsumerImporter; import org.apache.shardingsphere.data.pipeline.core.task.InventoryTask; import org.apache.shardingsphere.data.pipeline.core.task.PipelineTaskUtils; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import javax.sql.DataSource; import java.sql.Connection; 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 c23f2952722d9..245b1d3e9d603 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.common.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.datasource.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/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm b/kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm similarity index 100% rename from kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm rename to kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java index 99b996e69899e..a21facabd7a30 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java index bfc0f7bbe4839..102a9d078ce18 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.junit.jupiter.api.BeforeEach; 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 666a6c5930df9..bd93bea8489e1 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.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder; import java.util.Optional; diff --git a/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder 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 4680e5d8f763e..405583511dfd2 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.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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.common.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.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 af7ba5053563f..f7c90bea619a7 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.common.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.datasource.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 c62861efa999a..505f3ed0747f6 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.common.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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/sqlbuilder/MySQLPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java index 96f0aab61e69c..18ee7848f90f7 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.core.ingest.record.Column; import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; -import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder; import java.util.Optional; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.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 7d56c34ed1b2c..6413023e65ca0 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.common.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.datasource.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 3dbaf86cc79ac..d9162e2b6b93c 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.common.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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/sqlbuilder/OpenGaussPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java index 2c3aef5027a54..987f08d9039d0 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.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; -import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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.common.spi.check.DialectDataSourceChecker b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.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 7cfbcbd31fcef..1da97c6954942 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.common.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.datasource.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 043d54d33e0e2..4a01e33a9c27d 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.common.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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/sqlbuilder/PostgreSQLPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java index 12b032b3d7d23..0e4ba015cf545 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.core.ingest.record.Column; import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; -import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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.common.spi.check.DialectDataSourceChecker b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.DialectPipelineSQLBuilder diff --git a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java index 18a0818c191bd..0ddde5d6ff999 100644 --- a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java +++ b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.data.pipeline.spi.ratelimit; import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; public final class InputJobRateLimitAlgorithmFixture implements JobRateLimitAlgorithm { diff --git a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java index ec577ee07cc91..a083759ed6338 100644 --- a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java +++ b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.data.pipeline.spi.ratelimit; import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; public final class OutputJobRateLimitAlgorithmFixture implements JobRateLimitAlgorithm { diff --git a/kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm b/kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm similarity index 100% rename from kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm rename to kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java index c5f678a5c4545..d0d2dccd0e9d0 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java @@ -75,7 +75,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineAPIFactory; import org.apache.shardingsphere.data.pipeline.core.job.service.impl.AbstractInventoryIncrementalJobAPIImpl; import org.apache.shardingsphere.data.pipeline.core.preparer.PipelineJobPreparerUtils; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.OneOffJobBootstrap; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java index e4631bb36e737..15c2e3a571516 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java @@ -37,7 +37,7 @@ import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressUpdatedParameter; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; import org.apache.shardingsphere.data.pipeline.core.importer.sink.PipelineSink; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import java.util.ArrayList; import java.util.Collections; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java index 54107d8cb8dbb..b458aac531309 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java @@ -69,7 +69,7 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationTaskConfiguration; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.ingest.MigrationIncrementalDumperContextCreator; import org.apache.shardingsphere.data.pipeline.scenario.migration.context.MigrationProcessContext; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.data.pipeline.yaml.job.YamlMigrationJobConfiguration; import org.apache.shardingsphere.data.pipeline.yaml.job.YamlMigrationJobConfigurationSwapper; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java index ca48d7a21638a..bfb58d92922a8 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java @@ -43,7 +43,7 @@ import org.apache.shardingsphere.data.pipeline.core.exception.data.PipelineTableDataConsistencyCheckLoadingFailedException; import org.apache.shardingsphere.data.pipeline.scenario.migration.api.impl.MigrationJobAPI; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration; -import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; 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 00e4b609ee82a..6a3be4fff3dc9 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.common.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.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/FixtureDataSourceChecker.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureDataSourceChecker.java index 1df0988c4df1e..327a535a784f3 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.common.spi.check.DialectDataSourceChecker; +import org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker; import javax.sql.DataSource; 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 84f8bc7fbf81f..e3890f4fdfe23 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.common.spi.ddlgenerator.CreateTableSQLGenerator; +import org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator; import org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils; import javax.sql.DataSource; diff --git a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker similarity index 100% rename from test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.check.DialectDataSourceChecker rename to test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.datasource.DialectDataSourceChecker diff --git a/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator b/test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator similarity index 100% rename from test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ddlgenerator.CreateTableSQLGenerator rename to test/it/pipeline/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.sql.CreateTableSQLGenerator