You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/04/23 11:46:36 UTC
[shardingsphere] branch master updated: Rename DatabaseDiscoveryType.findPrimaryDataSource() (#17035)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 4e5f995e845 Rename DatabaseDiscoveryType.findPrimaryDataSource() (#17035)
4e5f995e845 is described below
commit 4e5f995e845a15b565d6d2f65874f005766035e6
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Apr 23 19:46:25 2022 +0800
Rename DatabaseDiscoveryType.findPrimaryDataSource() (#17035)
---
.../apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryType.java | 4 ++--
.../shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java | 2 +-
.../dbdiscovery/fixture/CoreFixtureDatabaseDiscoveryType.java | 2 +-
.../distsql/handler/fixture/DistSQLFixtureDatabaseDiscoveryType.java | 2 +-
.../dbdiscovery/mysql/AbstractDatabaseDiscoveryType.java | 2 +-
.../dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryTypeTest.java | 4 ++--
.../replication/MySQLNormalReplicationDatabaseDiscoveryTypeTest.java | 4 ++--
.../replication/OpenGaussNormalReplicationDatabaseDiscoveryType.java | 2 +-
.../OpenGaussNormalReplicationDatabaseDiscoveryTypeTest.java | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryType.java
index a786b5f48ca..6dbb65886f0 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryType.java
@@ -40,12 +40,12 @@ public interface DatabaseDiscoveryType extends ShardingSphereAlgorithm {
HighlyAvailableStatus loadHighlyAvailableStatus(DataSource dataSource) throws SQLException;
/**
- * Determine primary data source.
+ * Find primary data source.
*
* @param dataSourceMap data source map
* @return determined name of primary data source
*/
- Optional<String> determinePrimaryDataSource(Map<String, DataSource> dataSourceMap);
+ Optional<String> findPrimaryDataSource(Map<String, DataSource> dataSourceMap);
/**
* Update member state.
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java
index 1964f9de6c5..2f6070be88b 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java
@@ -91,7 +91,7 @@ public final class DatabaseDiscoveryEngine {
* @param groupName group name
*/
public void updatePrimaryDataSource(final String databaseName, final Map<String, DataSource> dataSourceMap, final Collection<String> disabledDataSourceNames, final String groupName) {
- Optional<String> newPrimaryDataSource = databaseDiscoveryType.determinePrimaryDataSource(getActiveDataSourceMap(dataSourceMap, disabledDataSourceNames));
+ Optional<String> newPrimaryDataSource = databaseDiscoveryType.findPrimaryDataSource(getActiveDataSourceMap(dataSourceMap, disabledDataSourceNames));
if (!newPrimaryDataSource.isPresent()) {
return;
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreFixtureDatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreFixtureDatabaseDiscoveryType.java
index 85b7217a655..ff1be3bd024 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreFixtureDatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreFixtureDatabaseDiscoveryType.java
@@ -34,7 +34,7 @@ public final class CoreFixtureDatabaseDiscoveryType implements DatabaseDiscovery
}
@Override
- public Optional<String> determinePrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
+ public Optional<String> findPrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
return Optional.of("primary");
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLFixtureDatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLFixtureDatabas [...]
index 8f960c2007d..035b0f7f9e6 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLFixtureDatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLFixtureDatabaseDiscoveryType.java
@@ -34,7 +34,7 @@ public final class DistSQLFixtureDatabaseDiscoveryType implements DatabaseDiscov
}
@Override
- public Optional<String> determinePrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
+ public Optional<String> findPrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
return Optional.empty();
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/AbstractDatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/AbstractDatabaseDiscoveryType.java
index f90b4e9899a..c9af67d89d6 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/AbstractDatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/AbstractDatabaseDiscoveryType.java
@@ -41,7 +41,7 @@ public abstract class AbstractDatabaseDiscoveryType implements DatabaseDiscovery
private String oldPrimaryDataSource;
@Override
- public final Optional<String> determinePrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
+ public final Optional<String> findPrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
return findPrimaryDataSourceName(loadPrimaryDataSourceURL(dataSourceMap), dataSourceMap);
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryTypeTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryTypeTest.java
index 6ba6ad80e71..18590f032d9 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryTypeTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryTypeTest.java
@@ -77,7 +77,7 @@ public final class MGRDatabaseDiscoveryTypeTest {
}
@Test
- public void assertDeterminePrimaryDataSource() throws SQLException {
+ public void assertFindPrimaryDataSource() throws SQLException {
List<DataSource> dataSources = new LinkedList<>();
List<Connection> connections = new LinkedList<>();
List<Statement> statements = new LinkedList<>();
@@ -107,7 +107,7 @@ public final class MGRDatabaseDiscoveryTypeTest {
dataSourceMap.put(String.format("ds_%s", i), dataSources.get(i));
}
databaseDiscoveryType.getProps().setProperty("group-name", "group_name");
- Optional<String> actual = databaseDiscoveryType.determinePrimaryDataSource(dataSourceMap);
+ Optional<String> actual = databaseDiscoveryType.findPrimaryDataSource(dataSourceMap);
assertTrue(actual.isPresent());
assertThat(actual.get(), is("ds_2"));
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryTypeTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabas [...]
index a492faa3ba1..36de28ed312 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryTypeTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryTypeTest.java
@@ -42,11 +42,11 @@ public final class MySQLNormalReplicationDatabaseDiscoveryTypeTest {
}
@Test
- public void assertDeterminePrimaryDataSource() throws SQLException {
+ public void assertFindPrimaryDataSource() throws SQLException {
Map<String, DataSource> dataSourceMap = new HashMap<>(2, 1);
dataSourceMap.put("ds_0", mockDataSource(3306));
dataSourceMap.put("ds_1", mockDataSource(3307));
- Optional<String> actual = new MySQLNormalReplicationDatabaseDiscoveryType().determinePrimaryDataSource(dataSourceMap);
+ Optional<String> actual = new MySQLNormalReplicationDatabaseDiscoveryType().findPrimaryDataSource(dataSourceMap);
assertTrue(actual.isPresent());
assertThat(actual.get(), is("ds_0"));
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicat [...]
index f965f126b3c..4fd5213dca0 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryType.java
@@ -62,7 +62,7 @@ public final class OpenGaussNormalReplicationDatabaseDiscoveryType implements Da
}
@Override
- public Optional<String> determinePrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
+ public Optional<String> findPrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
try (
Connection connection = entry.getValue().getConnection();
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryTypeTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalRepl [...]
index ac8d5ed0cfb..590910d22da 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryTypeTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryTypeTest.java
@@ -42,7 +42,7 @@ public final class OpenGaussNormalReplicationDatabaseDiscoveryTypeTest {
private static final String DB_ROLE = "SELECT local_role,db_state FROM pg_stat_get_stream_replications()";
@Test
- public void assertDeterminePrimaryDataSource() throws SQLException {
+ public void assertFindPrimaryDataSource() throws SQLException {
List<DataSource> dataSources = new LinkedList<>();
List<Connection> connections = new LinkedList<>();
List<Statement> statements = new LinkedList<>();
@@ -69,7 +69,7 @@ public final class OpenGaussNormalReplicationDatabaseDiscoveryTypeTest {
for (int i = 0; i < 3; i++) {
dataSourceMap.put(String.format("ds_%s", i), dataSources.get(i));
}
- Optional<String> actual = new OpenGaussNormalReplicationDatabaseDiscoveryType().determinePrimaryDataSource(dataSourceMap);
+ Optional<String> actual = new OpenGaussNormalReplicationDatabaseDiscoveryType().findPrimaryDataSource(dataSourceMap);
assertTrue(actual.isPresent());
assertThat(actual.get(), is("ds_2"));
}