This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6b456524e1b Remove PipelineJobPreparer.prepareTargetTables() (#29457)
6b456524e1b is described below
commit 6b456524e1bda68ebcf537fdcdc9b2ce080bc90a
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 19 22:32:36 2023 +0800
Remove PipelineJobPreparer.prepareTargetTables() (#29457)
---
.../core/preparer/PipelineJobPreparer.java | 25 +++++-----------------
.../datasource/PipelineJobDataSourcePreparer.java | 2 ++
.../migration/preparer/MigrationJobPreparer.java | 6 +++---
3 files changed, 10 insertions(+), 23 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparer.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparer.java
index 750b81210a1..7b6494a7686 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparer.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparer.java
@@ -29,9 +29,6 @@ import
org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfigurati
import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition;
import
org.apache.shardingsphere.data.pipeline.core.job.progress.JobItemIncrementalTasksProgress;
-import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PipelineJobDataSourcePreparer;
-import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.option.DialectPipelineJobDataSourcePrepareOption;
-import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.param.PrepareTargetTablesParameter;
import
org.apache.shardingsphere.data.pipeline.core.spi.ingest.position.PositionInitializer;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -53,18 +50,6 @@ public final class PipelineJobPreparer {
private final DatabaseType databaseType;
- /**
- * Prepare target tables.
- *
- * @param prepareTargetTablesParam prepare target tables parameter
- * @throws SQLException SQL exception
- */
- public void prepareTargetTables(final PrepareTargetTablesParameter
prepareTargetTablesParam) throws SQLException {
- long startTimeMillis = System.currentTimeMillis();
- new
PipelineJobDataSourcePreparer(DatabaseTypedSPILoader.getService(DialectPipelineJobDataSourcePrepareOption.class,
databaseType)).prepareTargetTables(prepareTargetTablesParam);
- log.info("prepareTargetTables cost {} ms", System.currentTimeMillis()
- startTimeMillis);
- }
-
/**
* Get incremental position.
*
@@ -72,7 +57,7 @@ public final class PipelineJobPreparer {
* @param dumperContext dumper config
* @param dataSourceManager data source manager
* @return ingest position
- * @throws SQLException sql exception
+ * @throws SQLException SQL exception
*/
public IngestPosition getIncrementalPosition(final
JobItemIncrementalTasksProgress initIncremental, final IncrementalDumperContext
dumperContext,
final
PipelineDataSourceManager dataSourceManager) throws SQLException {
@@ -95,10 +80,10 @@ public final class PipelineJobPreparer {
if (dataSources.isEmpty()) {
return;
}
- DataSourceCheckEngine dataSourceCheckEngine = new
DataSourceCheckEngine(databaseType);
- dataSourceCheckEngine.checkConnection(dataSources);
- dataSourceCheckEngine.checkPrivilege(dataSources);
- dataSourceCheckEngine.checkVariable(dataSources);
+ DataSourceCheckEngine checkEngine = new
DataSourceCheckEngine(databaseType);
+ checkEngine.checkConnection(dataSources);
+ checkEngine.checkPrivilege(dataSources);
+ checkEngine.checkVariable(dataSources);
}
/**
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PipelineJobDataSourcePreparer.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PipelineJobDataSourcePreparer.java
index 3f9ae7a8bc0..3f59a1f3f7d 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PipelineJobDataSourcePreparer.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/PipelineJobDataSourcePreparer.java
@@ -104,6 +104,7 @@ public final class PipelineJobDataSourcePreparer {
* @throws SQLException SQL exception
*/
public void prepareTargetTables(final PrepareTargetTablesParameter param)
throws SQLException {
+ final long startTimeMillis = System.currentTimeMillis();
PipelineDataSourceManager dataSourceManager =
param.getDataSourceManager();
for (CreateTableConfiguration each :
param.getCreateTableConfigurations()) {
String createTargetTableSQL = getCreateTargetTableSQL(each,
dataSourceManager, param.getSqlParserEngine());
@@ -113,6 +114,7 @@ public final class PipelineJobDataSourcePreparer {
}
}
}
+ log.info("prepareTargetTables cost {} ms", System.currentTimeMillis()
- startTimeMillis);
}
private void executeTargetTableSQL(final Connection targetConnection,
final String sql) throws SQLException {
diff --git
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
index ea79a2a2c9a..ddbb5a3a416 100644
---
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
+++
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
@@ -172,12 +172,12 @@ public final class MigrationJobPreparer {
Collection<CreateTableConfiguration> createTableConfigs =
jobItemContext.getTaskConfig().getCreateTableConfigurations();
DatabaseType targetDatabaseType =
jobItemContext.getJobConfig().getTargetDatabaseType();
PipelineDataSourceManager dataSourceManager =
jobItemContext.getDataSourceManager();
- PrepareTargetSchemasParameter prepareTargetSchemasParam = new
PrepareTargetSchemasParameter(targetDatabaseType, createTableConfigs,
dataSourceManager);
- new
PipelineJobDataSourcePreparer(DatabaseTypedSPILoader.getService(DialectPipelineJobDataSourcePrepareOption.class,
targetDatabaseType)).prepareTargetSchemas(prepareTargetSchemasParam);
+ PipelineJobDataSourcePreparer preparer = new
PipelineJobDataSourcePreparer(DatabaseTypedSPILoader.getService(DialectPipelineJobDataSourcePrepareOption.class,
targetDatabaseType));
+ preparer.prepareTargetSchemas(new
PrepareTargetSchemasParameter(targetDatabaseType, createTableConfigs,
dataSourceManager));
ShardingSphereMetaData metaData =
PipelineContextManager.getContext(PipelineJobIdUtils.parseContextKey(jobConfig.getJobId())).getContextManager().getMetaDataContexts().getMetaData();
SQLParserEngine sqlParserEngine =
metaData.getGlobalRuleMetaData().getSingleRule(SQLParserRule.class)
.getSQLParserEngine(metaData.getDatabase(jobConfig.getTargetDatabaseName()).getProtocolType());
- new PipelineJobPreparer(targetDatabaseType).prepareTargetTables(new
PrepareTargetTablesParameter(createTableConfigs, dataSourceManager,
sqlParserEngine));
+ preparer.prepareTargetTables(new
PrepareTargetTablesParameter(createTableConfigs, dataSourceManager,
sqlParserEngine));
}
private void prepareIncremental(final MigrationJobItemContext
jobItemContext) {
