You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/09/11 05:17:28 UTC
(shardingsphere) branch master updated: Code format for MigrationDataConsistencyChecker (#39796)
This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 bdae547fd24 Code format for MigrationDataConsistencyChecker (#39796)
bdae547fd24 is described below
commit bdae547fd2438a410e0c7ef29b85fedc20f9e395
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Sep 11 13:17:20 2026 +0800
Code format for MigrationDataConsistencyChecker (#39796)
---
.../consistency/MigrationDataConsistencyChecker.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java
index 2f225748c21..9d059413078 100644
--- a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java
+++ b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java
@@ -181,15 +181,12 @@ public final class MigrationDataConsistencyChecker implements PipelineDataConsis
IdentifierCasePolicy targetSchemaIdentifierPolicy = IdentifierNormalizeEngine.resolvePolicy(jobConfig.getTargetDatabaseType(), targetDataSource, IdentifierScope.SCHEMA);
IdentifierCasePolicy targetTableIdentifierPolicy = IdentifierNormalizeEngine.resolvePolicy(jobConfig.getTargetDatabaseType(), targetDataSource, IdentifierScope.TABLE);
IdentifierCasePolicy targetColumnIdentifierPolicy = IdentifierNormalizeEngine.resolvePolicy(jobConfig.getTargetDatabaseType(), targetDataSource, IdentifierScope.COLUMN);
- String targetSchemaName = null != dataNode.getSchemaName()
- && new DatabaseTypeRegistry(jobConfig.getTargetDatabaseType()).getDialectDatabaseMetaData().getSchemaOption().isSchemaAvailable()
- ? IdentifierNormalizeEngine.normalize(targetSchemaIdentifierPolicy, dataNode.getSchemaName())
- : null;
+ String targetSchemaName = null != dataNode.getSchemaName() && new DatabaseTypeRegistry(jobConfig.getTargetDatabaseType()).getDialectDatabaseMetaData().getSchemaOption().isSchemaAvailable()
+ ? IdentifierNormalizeEngine.normalize(targetSchemaIdentifierPolicy, dataNode.getSchemaName())
+ : null;
QualifiedTable targetTable = new QualifiedTable(targetSchemaName, IdentifierNormalizeEngine.normalize(targetTableIdentifierPolicy, targetTableName));
List<String> targetColumnNames = columnNames.stream().map(each -> IdentifierNormalizeEngine.normalize(targetColumnIdentifierPolicy, each)).collect(Collectors.toList());
- List<PipelineColumnMetaData> targetUniqueKeys = uniqueKeys.stream().map(each -> new PipelineColumnMetaData(each.getOrdinalPosition(),
- IdentifierNormalizeEngine.normalize(targetColumnIdentifierPolicy, each.getName()), each.getDataType(), each.getDataTypeName(),
- each.isNullable(), each.isPrimaryKey(), each.isUniqueKey())).collect(Collectors.toList());
+ List<PipelineColumnMetaData> targetUniqueKeys = uniqueKeys.stream().map(each -> getTargetColumnMetaData(targetColumnIdentifierPolicy, each)).collect(Collectors.toList());
TableInventoryCheckParameter param = new TableInventoryCheckParameter(
jobConfig.getJobId(), checkRangePosition.getSplittingItem(), sourceDataSource, targetDataSource, sourceTable, targetTable,
columnNames, uniqueKeys, targetColumnNames, targetUniqueKeys, readRateLimitAlgorithm, progressContext, checkRangePosition.getQueryCondition());
@@ -202,6 +199,12 @@ public final class MigrationDataConsistencyChecker implements PipelineDataConsis
return result;
}
+ private PipelineColumnMetaData getTargetColumnMetaData(final IdentifierCasePolicy targetColumnIdentifierPolicy, final PipelineColumnMetaData sourceColumnMetaData) {
+ return new PipelineColumnMetaData(sourceColumnMetaData.getOrdinalPosition(), IdentifierNormalizeEngine.normalize(targetColumnIdentifierPolicy, sourceColumnMetaData.getName()),
+ sourceColumnMetaData.getDataType(), sourceColumnMetaData.getDataTypeName(), sourceColumnMetaData.isNullable(),
+ sourceColumnMetaData.isPrimaryKey(), sourceColumnMetaData.isUniqueKey());
+ }
+
@Override
public void cancel() {
canceling.set(true);