You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/02/02 11:33:11 UTC
[shardingsphere] branch master updated: Optimize
ScalingEntryLoader. (#9278)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 b69d41b Optimize ScalingEntryLoader. (#9278)
b69d41b is described below
commit b69d41b83455f507459b1b13b44c446054a9d0f3
Author: 邱鹿 Lucas <lu...@163.com>
AuthorDate: Tue Feb 2 19:32:47 2021 +0800
Optimize ScalingEntryLoader. (#9278)
Co-authored-by: qiulu3 <Lucas209910>
---
.../internal/common/sqlbuilder/ScalingSQLBuilderFactory.java | 2 +-
.../scaling/core/internal/executor/dumper/DumperFactory.java | 4 ++--
.../core/internal/executor/importer/ImporterFactory.java | 2 +-
.../scaling/core/job/check/DataConsistencyCheckerFactory.java | 2 +-
.../scaling/core/job/position/PositionInitializerFactory.java | 4 ++--
.../core/job/preparer/checker/DataSourceCheckerFactory.java | 2 +-
.../apache/shardingsphere/scaling/core/spi/ScalingEntry.java | 2 +-
.../shardingsphere/scaling/core/spi/ScalingEntryLoader.java | 10 +++++-----
.../scaling/core/fixture/FixtureH2ScalingEntry.java | 2 +-
.../apache/shardingsphere/scaling/mysql/MySQLScalingEntry.java | 2 +-
.../shardingsphere/scaling/mysql/MySQLScalingEntryTest.java | 2 +-
.../scaling/postgresql/PostgreSQLScalingEntry.java | 2 +-
.../scaling/postgresql/PostgreSQLScalingEntryTest.java | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/common/sqlbuilder/ScalingSQLBuilderFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/common/sqlbuilder/ScalingSQLBuilderFactory.java
index 1c0b247..ad541e9 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/common/sqlbuilder/ScalingSQLBuilderFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/common/sqlbuilder/ScalingSQLBuilderFactory.java
@@ -37,7 +37,7 @@ public final class ScalingSQLBuilderFactory {
*/
@SneakyThrows(ReflectiveOperationException.class)
public static ScalingSQLBuilder newInstance(final String databaseType) {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance(databaseType);
return scalingEntry.getSQLBuilderClass().getConstructor(Map.class).newInstance(Maps.newHashMap());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/dumper/DumperFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/dumper/DumperFactory.java
index 1686b28..260ecb9 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/dumper/DumperFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/dumper/DumperFactory.java
@@ -42,7 +42,7 @@ public final class DumperFactory {
*/
@SneakyThrows(ReflectiveOperationException.class)
public static JDBCDumper newInstanceJdbcDumper(final InventoryDumperConfiguration inventoryDumperConfig, final DataSourceManager dataSourceManager) {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(inventoryDumperConfig.getDataSourceConfig().getDatabaseType().getName());
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance(inventoryDumperConfig.getDataSourceConfig().getDatabaseType().getName());
return scalingEntry.getJdbcDumperClass().getConstructor(InventoryDumperConfiguration.class, DataSourceManager.class).newInstance(inventoryDumperConfig, dataSourceManager);
}
@@ -67,7 +67,7 @@ public final class DumperFactory {
*/
@SneakyThrows(ReflectiveOperationException.class)
public static LogDumper newInstanceLogDumper(final String databaseType, final DumperConfiguration dumperConfig, final Position<?> position) {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance(databaseType);
return scalingEntry.getLogDumperClass().getConstructor(DumperConfiguration.class, Position.class).newInstance(dumperConfig, position);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/importer/ImporterFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/importer/ImporterFactory.java
index 781b502..e97ed57 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/importer/ImporterFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/internal/executor/importer/ImporterFactory.java
@@ -52,7 +52,7 @@ public final class ImporterFactory {
*/
@SneakyThrows(ReflectiveOperationException.class)
public static Importer newInstance(final String databaseType, final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance(databaseType);
return scalingEntry.getImporterClass().getConstructor(ImporterConfiguration.class, DataSourceManager.class).newInstance(importerConfig, dataSourceManager);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java
index 565c5f4..3237e80 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerFactory.java
@@ -35,7 +35,7 @@ public final class DataConsistencyCheckerFactory {
*/
@SneakyThrows(ReflectiveOperationException.class)
public static DataConsistencyChecker newInstance(final JobContext jobContext) {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(jobContext.getJobConfig().getHandleConfig().getDatabaseType());
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance(jobContext.getJobConfig().getHandleConfig().getDatabaseType());
return scalingEntry.getDataConsistencyCheckerClass().getConstructor(JobContext.class).newInstance(jobContext);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java
index e368bc4..18f67a0 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PositionInitializerFactory.java
@@ -34,7 +34,7 @@ public final class PositionInitializerFactory {
*/
@SneakyThrows(ReflectiveOperationException.class)
public static PositionInitializer<?> newInstance(final String databaseType) {
- return ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType).getPositionInitializer().newInstance();
+ return ScalingEntryLoader.getInstance(databaseType).getPositionInitializer().newInstance();
}
/**
@@ -44,6 +44,6 @@ public final class PositionInitializerFactory {
* @return position type
*/
public static Class<?> getPositionClass(final String databaseType) {
- return ReflectionUtil.getInterfaceGenericClass(ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType).getPositionInitializer());
+ return ReflectionUtil.getInterfaceGenericClass(ScalingEntryLoader.getInstance(databaseType).getPositionInitializer());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/DataSourceCheckerFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/DataSourceCheckerFactory.java
index 2632226..679506b 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/DataSourceCheckerFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/checker/DataSourceCheckerFactory.java
@@ -37,7 +37,7 @@ public final class DataSourceCheckerFactory {
*/
@SneakyThrows(ReflectiveOperationException.class)
public static DataSourceChecker newInstance(final String databaseType) {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance(databaseType);
return scalingEntry.getDataSourceCheckerClass().getConstructor().newInstance();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntry.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntry.java
index 360e016..b7e5af6 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntry.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntry.java
@@ -50,7 +50,7 @@ public interface ScalingEntry extends DatabaseTypeAwareSPI {
*
* @return position initializer type
*/
- Class<? extends PositionInitializer> getPositionInitializer();
+ Class<? extends PositionInitializer<?>> getPositionInitializer();
/**
* Get importer type.
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntryLoader.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntryLoader.java
index 9b60baf..1d9b64b 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntryLoader.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/spi/ScalingEntryLoader.java
@@ -40,16 +40,16 @@ public final class ScalingEntryLoader {
}
/**
- * Get {@code ScalingEntry} by database type string.
+ * Get {@code ScalingEntry} by database type.
* If not found, throw {@code UnsupportedOperationException}
*
- * @param databaseType database type string
- * @return scaling entry for target database type
+ * @param databaseType database type
+ * @return scaling entry
*/
- public static ScalingEntry getScalingEntryByDatabaseType(final String databaseType) {
+ public static ScalingEntry getInstance(final String databaseType) {
if (SCALING_ENTRY_MAP.containsKey(databaseType)) {
return SCALING_ENTRY_MAP.get(databaseType);
}
- throw new UnsupportedOperationException(String.format("Cannot support database type '%s'", databaseType));
+ throw new UnsupportedOperationException(String.format("Unsupported database type '%s'", databaseType));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2ScalingEntry.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2ScalingEntry.java
index c9292c0..1dd7352 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2ScalingEntry.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2ScalingEntry.java
@@ -39,7 +39,7 @@ public final class FixtureH2ScalingEntry implements ScalingEntry {
}
@Override
- public Class<? extends PositionInitializer> getPositionInitializer() {
+ public Class<? extends PositionInitializer<?>> getPositionInitializer() {
return FixturePositionInitializer.class;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntry.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntry.java
index ae28751..742e554 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntry.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntry.java
@@ -49,7 +49,7 @@ public final class MySQLScalingEntry implements ScalingEntry {
}
@Override
- public Class<? extends PositionInitializer> getPositionInitializer() {
+ public Class<? extends PositionInitializer<?>> getPositionInitializer() {
return MySQLPositionInitializer.class;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntryTest.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntryTest.java
index 5627109..e3c21a8 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntryTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLScalingEntryTest.java
@@ -35,7 +35,7 @@ public final class MySQLScalingEntryTest {
@Test
public void assertGetScalingEntryByDatabaseType() {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType("MySQL");
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance("MySQL");
assertTrue(scalingEntry instanceof MySQLScalingEntry);
assertThat(scalingEntry.getPositionInitializer(), equalTo(MySQLPositionInitializer.class));
assertThat(scalingEntry.getDataSourceCheckerClass(), equalTo(MySQLDataSourceChecker.class));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntry.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntry.java
index faa60d1..40644df 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntry.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntry.java
@@ -49,7 +49,7 @@ public final class PostgreSQLScalingEntry implements ScalingEntry {
}
@Override
- public Class<? extends PositionInitializer> getPositionInitializer() {
+ public Class<? extends PositionInitializer<?>> getPositionInitializer() {
return PostgreSQLPositionInitializer.class;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntryTest.java b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntryTest.java
index d37c32e..6b62b85 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntryTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLScalingEntryTest.java
@@ -35,7 +35,7 @@ public final class PostgreSQLScalingEntryTest {
@Test
public void assertGetScalingEntryByDatabaseType() {
- ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType("PostgreSQL");
+ ScalingEntry scalingEntry = ScalingEntryLoader.getInstance("PostgreSQL");
assertTrue(scalingEntry instanceof PostgreSQLScalingEntry);
assertThat(scalingEntry.getPositionInitializer(), equalTo(PostgreSQLPositionInitializer.class));
assertThat(scalingEntry.getDataSourceCheckerClass(), equalTo(PostgreSQLDataSourceChecker.class));