You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/02/04 02:46:31 UTC
[shardingsphere] branch master updated: Replace
DefaultScalingTaskFactory with ScalingTaskFactory (#9308)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 b792745 Replace DefaultScalingTaskFactory with ScalingTaskFactory (#9308)
b792745 is described below
commit b79274540d5abe38d9f52771c05e4569642c014a
Author: 邱鹿 Lucas <lu...@163.com>
AuthorDate: Thu Feb 4 10:46:07 2021 +0800
Replace DefaultScalingTaskFactory with ScalingTaskFactory (#9308)
* rename ScalingEnvironmentalManager to ScalingEnvironmentManager
* replace DefaultScalingTaskFactory with ScalingTaskFactory
* replace DefaultScalingTaskFactory with ScalingTaskFactory
Co-authored-by: qiulu3 <Lucas209910>
---
.../scaling/core/api/ScalingAPIFactory.java | 3 ++
.../scaling/core/api/impl/ScalingAPIImpl.java | 4 +--
.../ScalingEnvironmentManager.java} | 6 ++--
.../core/job/preparer/ScalingJobPreparer.java | 5 +--
.../preparer/splitter/InventoryTaskSplitter.java | 5 +--
.../core/job/task/DefaultScalingTaskFactory.java | 40 ----------------------
.../scaling/core/job/task/ScalingTaskFactory.java | 13 +++++--
.../job/task/incremental/IncrementalTaskTest.java | 4 +--
8 files changed, 22 insertions(+), 58 deletions(-)
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java
index 03349cf..a7863ee 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java
@@ -19,7 +19,9 @@ package org.apache.shardingsphere.scaling.core.api;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import lombok.AccessLevel;
import lombok.Getter;
+import lombok.NoArgsConstructor;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobAPIFactory;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobConfigurationAPI;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobStatisticsAPI;
@@ -43,6 +45,7 @@ import java.util.Properties;
/**
* Scaling API factory.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ScalingAPIFactory {
static {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
index c4fef75..d9777d4 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.scaling.core.job.ScalingJob;
import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyCheckResult;
import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyChecker;
import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyCheckerFactory;
-import org.apache.shardingsphere.scaling.core.job.environmental.ScalingEnvironmentalManager;
+import org.apache.shardingsphere.scaling.core.job.environment.ScalingEnvironmentManager;
import org.apache.shardingsphere.scaling.core.job.position.FinishedPosition;
import org.apache.shardingsphere.scaling.core.job.progress.JobProgress;
import org.apache.shardingsphere.scaling.core.util.JobConfigurationUtil;
@@ -169,7 +169,7 @@ public final class ScalingAPIImpl implements ScalingAPI {
@Override
public void resetTargetTable(final long jobId) throws SQLException {
log.info("Scaling job {} reset target table", jobId);
- new ScalingEnvironmentalManager().resetTargetTable(new JobContext(getJobConfig(jobId)));
+ new ScalingEnvironmentManager().resetTargetTable(new JobContext(getJobConfig(jobId)));
}
@Override
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environmental/ScalingEnvironmentalManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
similarity index 94%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environmental/ScalingEnvironmentalManager.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
index bbf749b..6af5f38 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environmental/ScalingEnvironmentalManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/environment/ScalingEnvironmentManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.scaling.core.job.environmental;
+package org.apache.shardingsphere.scaling.core.job.environment;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceFactory;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceWrapper;
@@ -29,9 +29,9 @@ import java.util.Set;
import java.util.stream.Collectors;
/**
- * Scaling environmental manager.
+ * Scaling environment manager.
*/
-public final class ScalingEnvironmentalManager {
+public final class ScalingEnvironmentManager {
private final DataSourceFactory dataSourceFactory = new DataSourceFactory();
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java
index c26571a..11ca2c8 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java
@@ -28,7 +28,6 @@ import org.apache.shardingsphere.scaling.core.job.position.PositionInitializerFa
import org.apache.shardingsphere.scaling.core.job.preparer.checker.DataSourceChecker;
import org.apache.shardingsphere.scaling.core.job.preparer.checker.DataSourceCheckerFactory;
import org.apache.shardingsphere.scaling.core.job.preparer.splitter.InventoryTaskSplitter;
-import org.apache.shardingsphere.scaling.core.job.task.DefaultScalingTaskFactory;
import org.apache.shardingsphere.scaling.core.job.task.ScalingTaskFactory;
import org.apache.shardingsphere.scaling.core.job.task.inventory.InventoryTask;
@@ -42,8 +41,6 @@ import java.util.List;
@Slf4j
public final class ScalingJobPreparer {
- private final ScalingTaskFactory scalingTaskFactory = new DefaultScalingTaskFactory();
-
private final InventoryTaskSplitter inventoryTaskSplitter = new InventoryTaskSplitter();
/**
@@ -90,7 +87,7 @@ public final class ScalingJobPreparer {
private void initIncrementalTasks(final JobContext jobContext, final DataSourceManager dataSourceManager) throws SQLException {
for (TaskConfiguration each : jobContext.getTaskConfigs()) {
each.getDumperConfig().setPosition(getIncrementalPosition(jobContext, each, dataSourceManager));
- jobContext.getIncrementalTasks().add(scalingTaskFactory.createIncrementalTask(each.getHandleConfig().getConcurrency(), each.getDumperConfig(), each.getImporterConfig()));
+ jobContext.getIncrementalTasks().add(ScalingTaskFactory.createIncrementalTask(each.getHandleConfig().getConcurrency(), each.getDumperConfig(), each.getImporterConfig()));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitter.java
index 419c55e..43e0ef8 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryTaskSplitter.java
@@ -31,7 +31,6 @@ import org.apache.shardingsphere.scaling.core.job.JobContext;
import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
import org.apache.shardingsphere.scaling.core.job.position.Position;
import org.apache.shardingsphere.scaling.core.job.position.PrimaryKeyPosition;
-import org.apache.shardingsphere.scaling.core.job.task.DefaultScalingTaskFactory;
import org.apache.shardingsphere.scaling.core.job.task.ScalingTaskFactory;
import org.apache.shardingsphere.scaling.core.job.task.inventory.InventoryTask;
@@ -52,8 +51,6 @@ import java.util.List;
@Slf4j
public final class InventoryTaskSplitter {
- private final ScalingTaskFactory scalingTaskFactory = new DefaultScalingTaskFactory();
-
/**
* Split inventory data to multi-tasks.
*
@@ -65,7 +62,7 @@ public final class InventoryTaskSplitter {
public List<InventoryTask> splitInventoryData(final JobContext jobContext, final TaskConfiguration taskConfig, final DataSourceManager dataSourceManager) {
List<InventoryTask> result = new LinkedList<>();
for (InventoryDumperConfiguration each : splitDumperConfig(jobContext, taskConfig.getDumperConfig(), dataSourceManager)) {
- result.add(scalingTaskFactory.createInventoryTask(each, taskConfig.getImporterConfig()));
+ result.add(ScalingTaskFactory.createInventoryTask(each, taskConfig.getImporterConfig()));
}
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/DefaultScalingTaskFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/DefaultScalingTaskFactory.java
deleted file mode 100644
index 8d966d1..0000000
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/DefaultScalingTaskFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.scaling.core.job.task;
-
-import org.apache.shardingsphere.scaling.core.config.DumperConfiguration;
-import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
-import org.apache.shardingsphere.scaling.core.config.InventoryDumperConfiguration;
-import org.apache.shardingsphere.scaling.core.job.task.incremental.IncrementalTask;
-import org.apache.shardingsphere.scaling.core.job.task.inventory.InventoryTask;
-
-/**
- * Default Scaling task factory.
- */
-public final class DefaultScalingTaskFactory implements ScalingTaskFactory {
-
- @Override
- public InventoryTask createInventoryTask(final InventoryDumperConfiguration inventoryDumperConfig, final ImporterConfiguration importerConfig) {
- return new InventoryTask(inventoryDumperConfig, importerConfig);
- }
-
- @Override
- public IncrementalTask createIncrementalTask(final int concurrency, final DumperConfiguration dumperConfig, final ImporterConfiguration importerConfig) {
- return new IncrementalTask(concurrency, dumperConfig, importerConfig);
- }
-}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/ScalingTaskFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/ScalingTaskFactory.java
index 2181b7d..28d294b 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/ScalingTaskFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/ScalingTaskFactory.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.scaling.core.job.task;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.apache.shardingsphere.scaling.core.config.DumperConfiguration;
import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.core.config.InventoryDumperConfiguration;
@@ -26,7 +28,8 @@ import org.apache.shardingsphere.scaling.core.job.task.inventory.InventoryTask;
/**
* Scaling task factory.
*/
-public interface ScalingTaskFactory {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ScalingTaskFactory {
/**
* Create inventory task.
@@ -35,7 +38,9 @@ public interface ScalingTaskFactory {
* @param importerConfig importer configuration
* @return inventory task
*/
- InventoryTask createInventoryTask(InventoryDumperConfiguration inventoryDumperConfig, ImporterConfiguration importerConfig);
+ public static InventoryTask createInventoryTask(final InventoryDumperConfiguration inventoryDumperConfig, final ImporterConfiguration importerConfig) {
+ return new InventoryTask(inventoryDumperConfig, importerConfig);
+ }
/**
* Create incremental task.
@@ -45,5 +50,7 @@ public interface ScalingTaskFactory {
* @param importerConfig importer configuration
* @return incremental task
*/
- IncrementalTask createIncrementalTask(int concurrency, DumperConfiguration dumperConfig, ImporterConfiguration importerConfig);
+ public static IncrementalTask createIncrementalTask(final int concurrency, final DumperConfiguration dumperConfig, final ImporterConfiguration importerConfig) {
+ return new IncrementalTask(concurrency, dumperConfig, importerConfig);
+ }
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalTaskTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalTaskTest.java
index b013ec2..d2fae00 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalTaskTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalTaskTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.scaling.core.config.ServerConfiguration;
import org.apache.shardingsphere.scaling.core.config.datasource.ScalingDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.config.datasource.StandardJDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
-import org.apache.shardingsphere.scaling.core.job.task.DefaultScalingTaskFactory;
+import org.apache.shardingsphere.scaling.core.job.task.ScalingTaskFactory;
import org.junit.After;
import org.junit.Before;
@@ -44,7 +44,7 @@ public final class IncrementalTaskTest {
@Before
public void setUp() {
ScalingContext.getInstance().init(new ServerConfiguration());
- incrementalTask = new DefaultScalingTaskFactory().createIncrementalTask(3, mockDumperConfig(), mockImporterConfiguration());
+ incrementalTask = ScalingTaskFactory.createIncrementalTask(3, mockDumperConfig(), mockImporterConfiguration());
}
@After