This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 737c458 Refactor RuleAlteredJobContext, use Collection instead of
List (#14320)
737c458 is described below
commit 737c458990859d6db3c25e643c01b3b5ec4eb92d
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Dec 25 17:22:26 2021 +0800
Refactor RuleAlteredJobContext, use Collection instead of List (#14320)
---
.../schedule/ShardingRuleAlteredJobConfigurationPreparer.java | 4 ++--
.../data/pipeline/api/config/rulealtered/JobConfiguration.java | 8 ++++----
.../data/pipeline/scenario/rulealtered/RuleAlteredJobContext.java | 8 ++++----
.../pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java | 3 ++-
.../scenario/rulealtered/RuleAlteredJobProgressDetector.java | 3 +--
.../spi/rulealtered/RuleAlteredJobConfigurationPreparer.java | 8 ++++----
.../scaling/core/job/environment/ScalingEnvironmentManager.java | 4 ++--
.../core/check/consistency/DataConsistencyCheckerImplTest.java | 4 ++--
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
index 7bc9273..98a0e08 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
@@ -71,7 +71,7 @@ import java.util.stream.Collectors;
public final class ShardingRuleAlteredJobConfigurationPreparer implements
RuleAlteredJobConfigurationPreparer {
@Override
- public HandleConfiguration createHandleConfig(final RuleConfiguration
ruleConfig) {
+ public HandleConfiguration createHandleConfiguration(final
RuleConfiguration ruleConfig) {
HandleConfiguration result = new HandleConfiguration();
Map<String, List<DataNode>> shouldScalingActualDataNodes =
getShouldScalingActualDataNodes(ruleConfig);
Collection<DataNode> dataNodes = new ArrayList<>();
@@ -127,7 +127,7 @@ public final class
ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
}
@Override
- public List<TaskConfiguration> createTaskConfigs(final RuleConfiguration
ruleConfig, final HandleConfiguration handleConfig) {
+ public List<TaskConfiguration> createTaskConfigurations(final
RuleConfiguration ruleConfig, final HandleConfiguration handleConfig) {
List<TaskConfiguration> result = new LinkedList<>();
ShardingSphereJDBCDataSourceConfiguration sourceConfig =
getSourceConfiguration(ruleConfig);
ShardingRuleConfiguration sourceRuleConfig =
ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(sourceConfig.getRootConfig().getRules());
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
index 8afcbd2..90d7c8b 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/rulealtered/JobConfiguration.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSou
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.required.RequiredSPIRegistry;
-import java.util.List;
+import java.util.Collection;
import java.util.concurrent.ThreadLocalRandom;
/**
@@ -67,7 +67,7 @@ public final class JobConfiguration {
if (null == handleConfig || null ==
handleConfig.getJobShardingDataNodes()) {
// TODO singleton
RuleAlteredJobConfigurationPreparer preparer =
RequiredSPIRegistry.getRegisteredService(RuleAlteredJobConfigurationPreparer.class);
- handleConfig = preparer.createHandleConfig(ruleConfig);
+ handleConfig = preparer.createHandleConfiguration(ruleConfig);
this.handleConfig = handleConfig;
}
if (null == handleConfig.getJobId()) {
@@ -91,8 +91,8 @@ public final class JobConfiguration {
*
* @return task configurations
*/
- public List<TaskConfiguration> buildTaskConfigs() {
+ public Collection<TaskConfiguration> buildTaskConfigs() {
RuleAlteredJobConfigurationPreparer preparer =
RequiredSPIRegistry.getRegisteredService(RuleAlteredJobConfigurationPreparer.class);
- return preparer.createTaskConfigs(ruleConfig, handleConfig);
+ return preparer.createTaskConfigurations(ruleConfig, handleConfig);
}
}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobContext.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobContext.java
index 902935f..fcf444b 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobContext.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobContext.java
@@ -26,8 +26,8 @@ import
org.apache.shardingsphere.data.pipeline.api.job.progress.JobProgress;
import org.apache.shardingsphere.data.pipeline.core.task.IncrementalTask;
import org.apache.shardingsphere.data.pipeline.core.task.InventoryTask;
+import java.util.Collection;
import java.util.LinkedList;
-import java.util.List;
/**
* Rule altered job context.
@@ -45,11 +45,11 @@ public final class RuleAlteredJobContext {
private JobProgress initProgress;
- private final List<TaskConfiguration> taskConfigs;
+ private final Collection<TaskConfiguration> taskConfigs;
- private final List<InventoryTask> inventoryTasks = new LinkedList<>();
+ private final Collection<InventoryTask> inventoryTasks = new
LinkedList<>();
- private final List<IncrementalTask> incrementalTasks = new LinkedList<>();
+ private final Collection<IncrementalTask> incrementalTasks = new
LinkedList<>();
private final JobConfiguration jobConfig;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
index 86740d2..b72bead 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
@@ -39,6 +39,7 @@ import
org.apache.shardingsphere.scaling.core.job.check.EnvironmentCheckerFactor
import
org.apache.shardingsphere.scaling.core.job.position.PositionInitializerFactory;
import java.sql.SQLException;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
@@ -82,7 +83,7 @@ public final class RuleAlteredJobPreparer {
dataSourcePreparer.prepareTargetTables(prepareTargetTablesParameter);
}
- private void initDataSourceManager(final DataSourceManager
dataSourceManager, final List<TaskConfiguration> taskConfigs) {
+ private void initDataSourceManager(final DataSourceManager
dataSourceManager, final Collection<TaskConfiguration> taskConfigs) {
for (TaskConfiguration taskConfig : taskConfigs) {
JDBCDataSourceConfiguration dataSourceConfig =
taskConfig.getDumperConfig().getDataSourceConfig();
dataSourceManager.createSourceDataSource(dataSourceConfig);
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobProgressDetector.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobProgressDetector.java
index 435596f..d7a4aed 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobProgressDetector.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobProgressDetector.java
@@ -28,7 +28,6 @@ import
org.apache.shardingsphere.data.pipeline.core.task.InventoryTask;
import
org.apache.shardingsphere.data.pipeline.spi.rulealtered.RuleAlteredJobCompletionDetectAlgorithm;
import java.util.Collection;
-import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
@@ -78,7 +77,7 @@ public final class RuleAlteredJobProgressDetector {
* @param inventoryTasks to check inventory tasks
* @return is finished
*/
- public static boolean allInventoryTasksFinished(final List<InventoryTask>
inventoryTasks) {
+ public static boolean allInventoryTasksFinished(final
Collection<InventoryTask> inventoryTasks) {
if (inventoryTasks.isEmpty()) {
log.warn("inventoryTasks is empty");
}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
index 5de20f1..fbd57eb 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
@@ -25,18 +25,18 @@ import org.apache.shardingsphere.spi.required.RequiredSPI;
import java.util.List;
/**
- * Rule altered job configuration preparer, SPI interface.
+ * Rule altered job configuration preparer.
*/
public interface RuleAlteredJobConfigurationPreparer extends RequiredSPI {
- // TODO put referenced Config to spi
+ // TODO put referenced configuration to SPI
/**
* Create handle configuration, used to build job configuration.
*
* @param ruleConfig rule configuration
* @return handle configuration
*/
- HandleConfiguration createHandleConfig(RuleConfiguration ruleConfig);
+ HandleConfiguration createHandleConfiguration(RuleConfiguration
ruleConfig);
/**
* Create task configurations, used by underlying scheduler.
@@ -45,5 +45,5 @@ public interface RuleAlteredJobConfigurationPreparer extends
RequiredSPI {
* @param handleConfig handle configuration
* @return task configurations
*/
- List<TaskConfiguration> createTaskConfigs(RuleConfiguration ruleConfig,
HandleConfiguration handleConfig);
+ List<TaskConfiguration> createTaskConfigurations(RuleConfiguration
ruleConfig, HandleConfiguration handleConfig);
}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
index 05a4211..d0d9d8e 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.scaling.core.job.sqlbuilder.ScalingSQLBuilderFa
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import java.util.Set;
+import java.util.Collection;
import java.util.stream.Collectors;
/**
@@ -44,7 +44,7 @@ public final class ScalingEnvironmentManager {
*/
// TODO seems it should be removed, dangerous to use
public void resetTargetTable(final RuleAlteredJobContext jobContext)
throws SQLException {
- Set<String> tables = jobContext.getTaskConfigs().stream().flatMap(each
->
each.getDumperConfig().getTableNameMap().values().stream()).collect(Collectors.toSet());
+ Collection<String> tables =
jobContext.getTaskConfigs().stream().flatMap(each ->
each.getDumperConfig().getTableNameMap().values().stream()).collect(Collectors.toSet());
try (DataSourceWrapper dataSource = dataSourceFactory.newInstance(
JDBCDataSourceConfigurationFactory.newInstance(jobContext.getJobConfig().getRuleConfig().getTarget().getType(),
jobContext.getJobConfig().getRuleConfig().getTarget().getParameter()));
Connection connection = dataSource.getConnection()) {
diff --git
a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java
b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java
index 39463ce..e66a625 100644
---
a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java
+++
b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckerImplTest.java
@@ -47,8 +47,8 @@ public final class DataConsistencyCheckerImplTest {
public void assertCountAndDataCheck() {
RuleAlteredJobContext jobContext = new
RuleAlteredJobContext(ResourceUtil.mockJobConfig());
DataConsistencyChecker dataConsistencyChecker =
EnvironmentCheckerFactory.newInstance(jobContext);
-
initTableData(jobContext.getTaskConfigs().get(0).getDumperConfig().getDataSourceConfig());
-
initTableData(jobContext.getTaskConfigs().get(0).getImporterConfig().getDataSourceConfig());
+
initTableData(jobContext.getTaskConfigs().iterator().next().getDumperConfig().getDataSourceConfig());
+
initTableData(jobContext.getTaskConfigs().iterator().next().getImporterConfig().getDataSourceConfig());
Map<String, DataConsistencyCheckResult> resultMap =
dataConsistencyChecker.checkRecordsCount();
assertTrue(resultMap.get("t_order").isRecordsCountMatched());
assertThat(resultMap.get("t_order").getSourceRecordsCount(),
is(resultMap.get("t_order").getTargetRecordsCount()));
