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/03/02 09:38:41 UTC
[shardingsphere] branch master updated: Optimize scaling Importer
(#9566)
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 27feed4 Optimize scaling Importer (#9566)
27feed4 is described below
commit 27feed412b5f0859d8459b233d87f4699a2e60df
Author: 邱鹿 Lucas <lu...@163.com>
AuthorDate: Tue Mar 2 17:38:12 2021 +0800
Optimize scaling Importer (#9566)
Co-authored-by: qiulu3 <Lucas209910>
---
.../scaling/core/executor/AbstractScalingExecutor.java | 2 +-
.../importer/{AbstractJDBCImporter.java => AbstractImporter.java} | 6 +++---
.../{AbstractJDBCImporterTest.java => AbstractImporterTest.java} | 6 +++---
.../shardingsphere/scaling/mysql/component/MySQLImporter.java | 6 +++---
.../scaling/postgresql/component/PostgreSQLImporter.java | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/AbstractScalingExecutor.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/AbstractScalingExecutor.java
index 9cba997..e055eab 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/AbstractScalingExecutor.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/AbstractScalingExecutor.java
@@ -30,7 +30,7 @@ public abstract class AbstractScalingExecutor implements ScalingExecutor {
@Setter(AccessLevel.PROTECTED)
@Getter(AccessLevel.PROTECTED)
- private boolean running;
+ private volatile boolean running;
@Override
public void start() {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractJDBCImporter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporter.java
similarity index 97%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractJDBCImporter.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporter.java
index c457f30..b5f22c2 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractJDBCImporter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporter.java
@@ -45,10 +45,10 @@ import java.util.Set;
import java.util.stream.Collectors;
/**
- * Abstract JDBC importer implementation.
+ * Abstract importer.
*/
@Slf4j
-public abstract class AbstractJDBCImporter extends AbstractScalingExecutor implements Importer {
+public abstract class AbstractImporter extends AbstractScalingExecutor implements Importer {
private static final DataRecordMerger MERGER = new DataRecordMerger();
@@ -61,7 +61,7 @@ public abstract class AbstractJDBCImporter extends AbstractScalingExecutor imple
@Setter
private Channel channel;
- protected AbstractJDBCImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
+ protected AbstractImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
this.importerConfig = importerConfig;
this.dataSourceManager = dataSourceManager;
scalingSqlBuilder = createSQLBuilder(importerConfig.getShardingColumnsMap());
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractJDBCImporterTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
similarity index 97%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractJDBCImporterTest.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
index 998ff02..8edfed7 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractJDBCImporterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
@@ -53,7 +53,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class AbstractJDBCImporterTest {
+public final class AbstractImporterTest {
private static final String TABLE_NAME = "test_table";
@@ -84,11 +84,11 @@ public final class AbstractJDBCImporterTest {
@Mock
private PreparedStatement preparedStatement;
- private AbstractJDBCImporter jdbcImporter;
+ private AbstractImporter jdbcImporter;
@Before
public void setUp() throws SQLException {
- jdbcImporter = new AbstractJDBCImporter(mockImporterConfiguration(), dataSourceManager) {
+ jdbcImporter = new AbstractImporter(mockImporterConfiguration(), dataSourceManager) {
@Override
protected ScalingSQLBuilder createSQLBuilder(final Map<String, Set<String>> shardingColumnsMap) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporter.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporter.java
index 845290b..f34272d 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporter.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.scaling.mysql.component;
import com.google.common.collect.ImmutableMap;
-import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceManager;
-import org.apache.shardingsphere.scaling.core.executor.importer.AbstractJDBCImporter;
import org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilder;
+import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
+import org.apache.shardingsphere.scaling.core.executor.importer.AbstractImporter;
import org.apache.shardingsphere.scaling.core.util.JDBCUtil;
import java.util.Map;
@@ -30,7 +30,7 @@ import java.util.Set;
/**
* MySQL importer.
*/
-public final class MySQLImporter extends AbstractJDBCImporter {
+public final class MySQLImporter extends AbstractImporter {
public MySQLImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
super(importerConfig, dataSourceManager);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporter.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporter.java
index 1f8dc47..6cf42ce 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/component/PostgreSQLImporter.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.scaling.postgresql.component;
-import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.core.common.datasource.DataSourceManager;
-import org.apache.shardingsphere.scaling.core.executor.importer.AbstractJDBCImporter;
import org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilder;
+import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
+import org.apache.shardingsphere.scaling.core.executor.importer.AbstractImporter;
import java.util.Map;
import java.util.Set;
@@ -28,7 +28,7 @@ import java.util.Set;
/**
* PostgreSQL importer.
*/
-public final class PostgreSQLImporter extends AbstractJDBCImporter {
+public final class PostgreSQLImporter extends AbstractImporter {
public PostgreSQLImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
super(importerConfig, dataSourceManager);