This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 f6514f7 Minor refactor (#13778)
f6514f7 is described below
commit f6514f7cedbbacee10acac7e2cbd91af69faa7c3
Author: Haoran Meng <[email protected]>
AuthorDate: Wed Nov 24 20:01:29 2021 +0800
Minor refactor (#13778)
---
.../opengauss/OpenGaussDatabaseDiscoveryType.java | 38 ++++++++++------------
.../OpenGaussDatabaseDiscoveryTypeTest.java | 6 ++--
2 files changed, 20 insertions(+), 24 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryType.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryType.java
index f324213..d56ebb0 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryType.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryType.java
@@ -49,19 +49,19 @@ import java.util.Properties;
*/
@Slf4j
public final class OpenGaussDatabaseDiscoveryType implements
DatabaseDiscoveryType {
-
+
private static final String DB_ROLE = "select local_role,db_state from
pg_stat_get_stream_replications()";
-
+
private static CoordinatorRegistryCenter coordinatorRegistryCenter;
-
+
private static final Map<String, ScheduleJobBootstrap>
SCHEDULE_JOB_BOOTSTRAP_MAP = new HashMap<>(16, 1);
-
+
private String oldPrimaryDataSource;
-
+
@Getter
@Setter
private Properties props = new Properties();
-
+
@Override
public void checkDatabaseDiscoveryConfiguration(final String schemaName,
final Map<String, DataSource> dataSourceMap) throws SQLException {
@@ -70,7 +70,7 @@ public final class OpenGaussDatabaseDiscoveryType implements
DatabaseDiscoveryTy
checkRolePrimary(statement);
}
}
-
+
private void checkRolePrimary(final Statement statement) throws
SQLException {
try (ResultSet resultSet = statement.executeQuery(DB_ROLE)) {
while (resultSet.next()) {
@@ -80,7 +80,7 @@ public final class OpenGaussDatabaseDiscoveryType implements
DatabaseDiscoveryTy
}
}
}
-
+
@Override
public void updatePrimaryDataSource(final String schemaName, final
Map<String, DataSource> dataSourceMap,
final Collection<String> disabledDataSourceNames, final String
groupName) {
@@ -98,7 +98,7 @@ public final class OpenGaussDatabaseDiscoveryType implements
DatabaseDiscoveryTy
.post(new PrimaryDataSourceChangedEvent(schemaName,
groupName, newPrimaryDataSource));
}
}
-
+
private String determinePrimaryDataSource(final Map<String, DataSource>
dataSourceMap) {
String result = "";
for (Map.Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
@@ -117,7 +117,7 @@ public final class OpenGaussDatabaseDiscoveryType
implements DatabaseDiscoveryTy
}
return result;
}
-
+
@Override
public void updateMemberState(final String schemaName, final Map<String,
DataSource> dataSourceMap,
final Collection<String> disabledDataSourceNames) {
@@ -127,7 +127,7 @@ public final class OpenGaussDatabaseDiscoveryType
implements DatabaseDiscoveryTy
}
determineDisabledDataSource(schemaName, activeDataSourceMap);
}
-
+
private void determineDisabledDataSource(final String schemaName, final
Map<String, DataSource> dataSourceMap) {
for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
boolean disable = true;
@@ -142,14 +142,10 @@ public final class OpenGaussDatabaseDiscoveryType
implements DatabaseDiscoveryTy
} catch (final SQLException ex) {
log.error("An exception occurred while find data source urls",
ex);
}
- if (disable) {
- ShardingSphereEventBus.getInstance().post(new
DataSourceDisabledEvent(schemaName, entry.getKey(), true));
- } else {
- ShardingSphereEventBus.getInstance().post(new
DataSourceDisabledEvent(schemaName, entry.getKey(), false));
- }
+ ShardingSphereEventBus.getInstance().post(new
DataSourceDisabledEvent(schemaName, entry.getKey(), disable));
}
}
-
+
@Override
public void startPeriodicalUpdate(final String schemaName, final
Map<String, DataSource> dataSourceMap,
final Collection<String> disabledDataSourceNames, final String
groupName) {
@@ -167,18 +163,18 @@ public final class OpenGaussDatabaseDiscoveryType
implements DatabaseDiscoveryTy
JobConfiguration.newBuilder("opengauss-" + groupName,
1).cron(props.getProperty("keepAliveCron")).build()));
SCHEDULE_JOB_BOOTSTRAP_MAP.get(groupName).schedule();
}
-
+
@Override
public String getPrimaryDataSource() {
return oldPrimaryDataSource;
}
-
+
@Override
public void updateProperties(final String groupName, final Properties
props) {
new JobConfigurationAPIImpl(coordinatorRegistryCenter)
.updateJobConfiguration(createJobConfiguration("opengauss-" +
groupName, props.getProperty("keepAliveCron")));
}
-
+
private JobConfigurationPOJO createJobConfiguration(final String jobName,
final String cron) {
JobConfigurationPOJO result = new JobConfigurationPOJO();
result.setJobName(jobName);
@@ -186,7 +182,7 @@ public final class OpenGaussDatabaseDiscoveryType
implements DatabaseDiscoveryTy
result.setShardingTotalCount(1);
return result;
}
-
+
@Override
public String getType() {
return "openGauss";
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryTypeTest.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryTypeTest.java
index 1222ca5..b0475b0 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryTypeTest.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryTypeTest.java
@@ -42,11 +42,11 @@ public final class OpenGaussDatabaseDiscoveryTypeTest {
private static final String DB_ROLE = "select local_role,db_state from
pg_stat_get_stream_replications()";
private static final String STANDBYS = "select client_addr,sync_state from
pg_stat_replication";
-
+
private final OpenGaussDatabaseDiscoveryType ogHaType = new
OpenGaussDatabaseDiscoveryType();
@Test
- public void checkHAConfig() {
+ public void assertCheckHAConfig() {
DataSource dataSource = mock(DataSource.class);
Connection connection = mock(Connection.class);
Statement statement = mock(Statement.class);
@@ -74,7 +74,7 @@ public final class OpenGaussDatabaseDiscoveryTypeTest {
}
@Test
- public void updatePrimaryDataSource() {
+ public void assertUpdatePrimaryDataSource() {
List<DataSource> dataSources = new LinkedList<>();
List<Connection> connections = new LinkedList<>();
List<Statement> statements = new LinkedList<>();
