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 2de8a10e05f33..20f9928dd7f40 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 @@ -73,7 +73,7 @@ public void prepareTargetSchemas(final PrepareTargetSchemasParameter param) thro PipelinePrepareSQLBuilder pipelineSQLBuilder = new PipelinePrepareSQLBuilder(targetDatabaseType); Collection createdSchemaNames = new HashSet<>(param.getCreateTableConfigurations().size(), 1F); for (CreateTableConfiguration each : param.getCreateTableConfigurations()) { - String targetSchemaName = each.getTargetName().getSchemaName().getValue(); + String targetSchemaName = each.getTargetName().getSchemaName(); if (null == targetSchemaName || targetSchemaName.equalsIgnoreCase(defaultSchema) || createdSchemaNames.contains(targetSchemaName)) { continue; } @@ -124,9 +124,9 @@ private List getCreateTargetTableSQL(final CreateTableConfiguration crea final PipelineDataSourceManager dataSourceManager, final SQLParserEngine sqlParserEngine) throws SQLException { DatabaseType databaseType = createTableConfig.getSourceDataSourceConfig().getDatabaseType(); DataSource sourceDataSource = dataSourceManager.getDataSource(createTableConfig.getSourceDataSourceConfig()); - String schemaName = createTableConfig.getSourceName().getSchemaName().getValue(); - String sourceTableName = createTableConfig.getSourceName().getTableName().getValue(); - String targetTableName = createTableConfig.getTargetName().getTableName().getValue(); + String schemaName = createTableConfig.getSourceName().getSchemaName(); + String sourceTableName = createTableConfig.getSourceName().getTableName(); + String targetTableName = createTableConfig.getTargetName().getTableName(); return new PipelineDDLGenerator().generateLogicDDL(databaseType, sourceDataSource, schemaName, sourceTableName, targetTableName, sqlParserEngine); } diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/param/CreateTableConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/param/CreateTableConfiguration.java index 7e899113abfc3..d20ed6d3262ff 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/param/CreateTableConfiguration.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/param/CreateTableConfiguration.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration; -import org.apache.shardingsphere.infra.metadata.caseinsensitive.CaseInsensitiveQualifiedTable; +import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable; /** * Create table configuration. @@ -31,9 +31,9 @@ public final class CreateTableConfiguration { private final PipelineDataSourceConfiguration sourceDataSourceConfig; - private final CaseInsensitiveQualifiedTable sourceName; + private final QualifiedTable sourceName; private final PipelineDataSourceConfiguration targetDataSourceConfig; - private final CaseInsensitiveQualifiedTable targetName; + private final QualifiedTable targetName; } diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobExecutorCallback.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobExecutorCallback.java index cb1f86c252e7f..38c173d254044 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobExecutorCallback.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobExecutorCallback.java @@ -40,7 +40,7 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.preparer.MigrationJobPreparer; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; import org.apache.shardingsphere.infra.datanode.DataNode; -import org.apache.shardingsphere.infra.metadata.caseinsensitive.CaseInsensitiveQualifiedTable; +import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable; import org.apache.shardingsphere.infra.metadata.identifier.ShardingSphereIdentifier; import java.sql.SQLException; @@ -81,8 +81,8 @@ private CreateTableConfiguration getCreateTableConfiguration(final MigrationJobC PipelineDataSourceConfiguration sourceDataSourceConfig = jobConfig.getSources().get(dataNode.getDataSourceName()); String sourceSchemaName = mapper.getSchemaName(jobDataNodeEntry.getLogicTableName()); String targetSchemaName = new DatabaseTypeRegistry(jobConfig.getTargetDatabaseType()).getDialectDatabaseMetaData().isSchemaAvailable() ? sourceSchemaName : null; - return new CreateTableConfiguration(sourceDataSourceConfig, new CaseInsensitiveQualifiedTable(sourceSchemaName, dataNode.getTableName()), - jobConfig.getTarget(), new CaseInsensitiveQualifiedTable(targetSchemaName, jobDataNodeEntry.getLogicTableName())); + return new CreateTableConfiguration(sourceDataSourceConfig, new QualifiedTable(sourceSchemaName, dataNode.getTableName()), + jobConfig.getTarget(), new QualifiedTable(targetSchemaName, jobDataNodeEntry.getLogicTableName())); } private ImporterConfiguration buildImporterConfiguration(final MigrationJobConfiguration jobConfig, final PipelineProcessConfiguration pipelineProcessConfig, diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java index 94ace243fbe84..70980d04af2b1 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java @@ -52,7 +52,7 @@ import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext; import org.apache.shardingsphere.infra.instance.metadata.InstanceType; -import org.apache.shardingsphere.infra.metadata.caseinsensitive.CaseInsensitiveQualifiedTable; +import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable; import org.apache.shardingsphere.infra.metadata.identifier.ShardingSphereIdentifier; @@ -225,8 +225,8 @@ private static Collection buildCreateTableConfiguratio String targetSchemaName = dialectDatabaseMetaData.isSchemaAvailable() ? sourceSchemaName : null; DataNode dataNode = each.getDataNodes().get(0); PipelineDataSourceConfiguration sourceDataSourceConfig = jobConfig.getSources().get(dataNode.getDataSourceName()); - CreateTableConfiguration createTableConfig = new CreateTableConfiguration(sourceDataSourceConfig, new CaseInsensitiveQualifiedTable(sourceSchemaName, dataNode.getTableName()), - jobConfig.getTarget(), new CaseInsensitiveQualifiedTable(targetSchemaName, each.getLogicTableName())); + CreateTableConfiguration createTableConfig = new CreateTableConfiguration(sourceDataSourceConfig, new QualifiedTable(sourceSchemaName, dataNode.getTableName()), + jobConfig.getTarget(), new QualifiedTable(targetSchemaName, each.getLogicTableName())); result.add(createTableConfig); } return result;