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 a2117dcbd18 Rename DatabaseDiscoveryProviderAlgorithm to
DatabaseDiscoveryProvider (#23985)
a2117dcbd18 is described below
commit a2117dcbd1813f8fd072ad060633bfd439f8cfd8
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Feb 3 23:57:32 2023 +0800
Rename DatabaseDiscoveryProviderAlgorithm to DatabaseDiscoveryProvider
(#23985)
---
docs/document/content/dev-manual/ha.cn.md | 10 ++++-----
docs/document/content/dev-manual/ha.en.md | 10 ++++-----
...gorithm.java => DatabaseDiscoveryProvider.java} | 4 ++--
.../algorithm/DatabaseDiscoveryEngine.java | 14 ++++++-------
.../dbdiscovery/heartbeat/HeartbeatJob.java | 6 +++---
.../rule/DatabaseDiscoveryDataSourceRule.java | 8 ++++----
.../dbdiscovery/rule/DatabaseDiscoveryRule.java | 24 +++++++++++-----------
...a => CoreDatabaseDiscoveryProviderFixture.java} | 4 ++--
.../rule/DatabaseDiscoveryDataSourceRuleTest.java | 10 ++++-----
...here.dbdiscovery.spi.DatabaseDiscoveryProvider} | 2 +-
...AlterDatabaseDiscoveryRuleStatementUpdater.java | 4 ++--
...reateDatabaseDiscoveryRuleStatementUpdater.java | 4 ++--
...> DistSQLDatabaseDiscoveryProviderFixture.java} | 4 ++--
...baseDiscoveryProviderStatementUpdaterTest.java} | 2 +-
...here.dbdiscovery.spi.DatabaseDiscoveryProvider} | 2 +-
....java => DatabaseDiscoveryProviderSegment.java} | 4 ++--
...java => MGRMySQLDatabaseDiscoveryProvider.java} | 6 +++---
...ormalReplicationDatabaseDiscoveryProvider.java} | 6 +++---
...here.dbdiscovery.spi.DatabaseDiscoveryProvider} | 4 ++--
....java => MGRDatabaseDiscoveryProviderTest.java} | 10 ++++-----
...lReplicationDatabaseDiscoveryProviderTest.java} | 14 ++++++-------
...ormalReplicationDatabaseDiscoveryProvider.java} | 6 +++---
...here.dbdiscovery.spi.DatabaseDiscoveryProvider} | 2 +-
...lReplicationDatabaseDiscoveryProviderTest.java} | 4 ++--
...> DatabasePermittedPrivilegesProviderTest.java} | 2 +-
...ava => AllPermittedPrivilegesProviderTest.java} | 2 +-
...aseDiscoveryRuleConfigurationImportChecker.java | 4 ++--
27 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/docs/document/content/dev-manual/ha.cn.md
b/docs/document/content/dev-manual/ha.cn.md
index 5091fc7049c..539f7a729dd 100644
--- a/docs/document/content/dev-manual/ha.cn.md
+++ b/docs/document/content/dev-manual/ha.cn.md
@@ -5,11 +5,11 @@ weight = 9
chapter = true
+++
-## DatabaseDiscoveryProviderAlgorithm
+## DatabaseDiscoveryProvider
### 全限定类名
-[`org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProviderAlgorithm.java)
+[`org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProvider.java)
### 定义
@@ -19,6 +19,6 @@ chapter = true
| *配置标识* | *详细说明* | *全限定类名* |
| ---------------------------- | ---------------------------------- |
---------- |
-| MySQL.MGR | 基于 MySQL MGR 的数据库发现算法 |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java)
|
-| MySQL.NORMAL_REPLICATION | 基于 MySQL 主从同步的数据库发现算法 |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java)
|
-| openGauss.NORMAL_REPLICATION | 基于 openGauss 主从同步的数据库发现算法 |
[`org.apache.shardingsphere.dbdiscovery.opengauss.OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java)
|
+| MySQL.MGR | 基于 MySQL MGR 的数据库发现算法 |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProvider.java)
|
+| MySQL.NORMAL_REPLICATION | 基于 MySQL 主从同步的数据库发现算法 |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MySQLNormalReplicationDatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProvider.java)
|
+| openGauss.NORMAL_REPLICATION | 基于 openGauss 主从同步的数据库发现算法 |
[`org.apache.shardingsphere.dbdiscovery.opengauss.OpenGaussNormalReplicationDatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProvider.java)
|
diff --git a/docs/document/content/dev-manual/ha.en.md
b/docs/document/content/dev-manual/ha.en.md
index 304ad182e97..9f541a06b85 100644
--- a/docs/document/content/dev-manual/ha.en.md
+++ b/docs/document/content/dev-manual/ha.en.md
@@ -5,11 +5,11 @@ weight = 9
chapter = true
+++
-## DatabaseDiscoveryProviderAlgorithm
+## DatabaseDiscoveryProvider
### Fully-qualified class name
-[`org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProviderAlgorithm.java)
+[`org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProvider.java)
### Definition
@@ -19,7 +19,7 @@ Database discovery provider algorithm's definition
| *Configuration Type* | *Description*
| *Fully-qualified class name* |
| ---------------------------- |
---------------------------------------------------------------- |
---------------------------- |
-| MySQL.MGR | MySQL MGR-based database discovery provider
algorithm |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java)
|
-| MySQL.NORMAL_REPLICATION | Database discovery provider algorithm of
MySQL’s replication |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java)
|
-| openGauss.NORMAL_REPLICATION | Database discovery provider algorithm of
openGauss’s replication |
[`org.apache.shardingsphere.dbdiscovery.opengauss.OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java)
|
+| MySQL.MGR | MySQL MGR-based database discovery provider
algorithm |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProvider.java)
|
+| MySQL.NORMAL_REPLICATION | Database discovery provider algorithm of
MySQL’s replication |
[`org.apache.shardingsphere.dbdiscovery.mysql.type.MySQLNormalReplicationDatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProvider.java)
|
+| openGauss.NORMAL_REPLICATION | Database discovery provider algorithm of
openGauss’s replication |
[`org.apache.shardingsphere.dbdiscovery.opengauss.OpenGaussNormalReplicationDatabaseDiscoveryProvider`](https://github.com/apache/shardingsphere/blob/master/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProvider.java)
|
diff --git
a/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProviderAlgorithm.java
b/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProvider.java
similarity index 94%
rename from
features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProviderAlgorithm.java
rename to
features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProvider.java
index 489f7c897a4..3673385a9f8 100644
---
a/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProviderAlgorithm.java
+++
b/features/db-discovery/api/src/main/java/org/apache/shardingsphere/dbdiscovery/spi/DatabaseDiscoveryProvider.java
@@ -25,9 +25,9 @@ import java.util.Collection;
import java.util.Optional;
/**
- * Database discovery provider algorithm.
+ * Database discovery provider.
*/
-public interface DatabaseDiscoveryProviderAlgorithm extends TypedSPI {
+public interface DatabaseDiscoveryProvider extends TypedSPI {
/**
* Check environment.
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java
index 7851a917511..73d279d6eab 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/algorithm/DatabaseDiscoveryEngine.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.dbdiscovery.algorithm;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import org.apache.shardingsphere.infra.datasource.state.DataSourceState;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDatabase;
@@ -44,7 +44,7 @@ import java.util.Optional;
@Slf4j
public final class DatabaseDiscoveryEngine {
- private final DatabaseDiscoveryProviderAlgorithm
databaseDiscoveryProviderAlgorithm;
+ private final DatabaseDiscoveryProvider provider;
private final EventBusContext eventBusContext;
@@ -55,7 +55,7 @@ public final class DatabaseDiscoveryEngine {
* @param dataSourceMap data source map
*/
public void checkEnvironment(final String databaseName, final Map<String,
DataSource> dataSourceMap) {
- databaseDiscoveryProviderAlgorithm.checkEnvironment(databaseName,
dataSourceMap.values());
+ provider.checkEnvironment(databaseName, dataSourceMap.values());
}
/**
@@ -81,7 +81,7 @@ public final class DatabaseDiscoveryEngine {
private Optional<String> findPrimaryDataSourceName(final Map<String,
DataSource> dataSourceMap) {
for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
try {
- if
(databaseDiscoveryProviderAlgorithm.isPrimaryInstance(entry.getValue())) {
+ if (provider.isPrimaryInstance(entry.getValue())) {
return Optional.of(entry.getKey());
}
} catch (final SQLException ex) {
@@ -107,11 +107,11 @@ public final class DatabaseDiscoveryEngine {
eventBusContext.post(new DataSourceDisabledEvent(databaseName,
groupName, entry.getKey(), replicaStorageNode));
continue;
}
- if
(databaseDiscoveryProviderAlgorithm.getMinEnabledReplicas().isPresent() && 0 ==
databaseDiscoveryProviderAlgorithm.getMinEnabledReplicas().get()) {
+ if (provider.getMinEnabledReplicas().isPresent() && 0 ==
provider.getMinEnabledReplicas().get()) {
eventBusContext.post(new DataSourceDisabledEvent(databaseName,
groupName, entry.getKey(), replicaStorageNode));
continue;
}
- if (enabledReplicasCount >
databaseDiscoveryProviderAlgorithm.getMinEnabledReplicas().get()) {
+ if (enabledReplicasCount > provider.getMinEnabledReplicas().get())
{
enabledReplicasCount -=
disabledDataSourceNames.contains(entry.getKey()) ? 0 : 1;
eventBusContext.post(new DataSourceDisabledEvent(databaseName,
groupName, entry.getKey(), replicaStorageNode));
}
@@ -124,7 +124,7 @@ public final class DatabaseDiscoveryEngine {
private ReplicaDataSourceStatus loadReplicaStatus(final DataSource
replicaDataSource) {
try {
- return
databaseDiscoveryProviderAlgorithm.loadReplicaStatus(replicaDataSource);
+ return provider.loadReplicaStatus(replicaDataSource);
} catch (final SQLException ex) {
log.error("Load data source replica status error: ", ex);
return new ReplicaDataSourceStatus(false, 0L);
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/heartbeat/HeartbeatJob.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/heartbeat/HeartbeatJob.java
index dfe30a045a9..cab23c449bf 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/heartbeat/HeartbeatJob.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/heartbeat/HeartbeatJob.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.dbdiscovery.heartbeat;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.dbdiscovery.algorithm.DatabaseDiscoveryEngine;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.elasticjob.api.ShardingContext;
import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
@@ -42,7 +42,7 @@ public final class HeartbeatJob implements SimpleJob {
private final Map<String, DataSource> dataSourceMap;
- private final DatabaseDiscoveryProviderAlgorithm
databaseDiscoveryProviderAlgorithm;
+ private final DatabaseDiscoveryProvider databaseDiscoveryProvider;
private final Collection<String> disabledDataSourceNames;
@@ -50,7 +50,7 @@ public final class HeartbeatJob implements SimpleJob {
@Override
public void execute(final ShardingContext shardingContext) {
- new DatabaseDiscoveryEngine(databaseDiscoveryProviderAlgorithm,
eventBusContext).changePrimaryDataSource(databaseName, groupName,
originalPrimaryDataSourceName,
+ new DatabaseDiscoveryEngine(databaseDiscoveryProvider,
eventBusContext).changePrimaryDataSource(databaseName, groupName,
originalPrimaryDataSourceName,
dataSourceMap, disabledDataSourceNames);
}
}
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
index c02c6c52844..1bf4b50ed8d 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRule.java
@@ -23,7 +23,7 @@ import lombok.Getter;
import
org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryDataSourceRuleConfiguration;
import
org.apache.shardingsphere.dbdiscovery.exception.MissingRequiredDataSourceNamesConfigurationException;
import
org.apache.shardingsphere.dbdiscovery.exception.MissingRequiredGroupNameConfigurationException;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import javax.sql.DataSource;
@@ -49,19 +49,19 @@ public final class DatabaseDiscoveryDataSourceRule {
private final Properties heartbeatProps;
- private final DatabaseDiscoveryProviderAlgorithm
databaseDiscoveryProviderAlgorithm;
+ private final DatabaseDiscoveryProvider provider;
private final Collection<String> disabledDataSourceNames = new HashSet<>();
private volatile String primaryDataSourceName;
public DatabaseDiscoveryDataSourceRule(final
DatabaseDiscoveryDataSourceRuleConfiguration config,
- final Properties props, final
DatabaseDiscoveryProviderAlgorithm databaseDiscoveryProviderAlgorithm) {
+ final Properties props, final
DatabaseDiscoveryProvider provider) {
checkConfiguration(config);
groupName = config.getGroupName();
dataSourceNames = config.getDataSourceNames();
this.heartbeatProps = props;
- this.databaseDiscoveryProviderAlgorithm =
databaseDiscoveryProviderAlgorithm;
+ this.provider = provider;
}
private void checkConfiguration(final
DatabaseDiscoveryDataSourceRuleConfiguration config) {
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
index d0c8836cdcd..d0a3063f13d 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryDa
import
org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryHeartBeatConfiguration;
import
org.apache.shardingsphere.dbdiscovery.exception.DBDiscoveryDataSourceRuleNotFoundException;
import org.apache.shardingsphere.dbdiscovery.heartbeat.HeartbeatJob;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.datasource.state.DataSourceState;
@@ -68,7 +68,7 @@ public final class DatabaseDiscoveryRule implements
DatabaseRule, DataSourceCont
private final Map<String, DataSource> dataSourceMap;
- private final Map<String, DatabaseDiscoveryProviderAlgorithm>
discoveryTypes;
+ private final Map<String, DatabaseDiscoveryProvider> providerTypes;
@Getter
private final Map<String, DatabaseDiscoveryDataSourceRule> dataSourceRules;
@@ -83,16 +83,16 @@ public final class DatabaseDiscoveryRule implements
DatabaseRule, DataSourceCont
this.dataSourceMap = dataSourceMap;
this.instanceContext = instanceContext;
this.scheduleContext =
ScheduleContextFactory.newInstance(instanceContext.getModeConfiguration());
- discoveryTypes =
getDiscoveryProviderAlgorithms(ruleConfig.getDiscoveryTypes());
+ providerTypes = getDiscoveryProviders(ruleConfig.getDiscoveryTypes());
dataSourceRules = getDataSourceRules(ruleConfig.getDataSources(),
ruleConfig.getDiscoveryHeartbeats());
findPrimaryReplicaRelationship(databaseName, dataSourceMap);
initHeartBeatJobs();
}
- private static Map<String, DatabaseDiscoveryProviderAlgorithm>
getDiscoveryProviderAlgorithms(final Map<String, AlgorithmConfiguration>
discoveryTypesConfig) {
- Map<String, DatabaseDiscoveryProviderAlgorithm> result = new
LinkedHashMap<>(discoveryTypesConfig.size(), 1);
+ private static Map<String, DatabaseDiscoveryProvider>
getDiscoveryProviders(final Map<String, AlgorithmConfiguration>
discoveryTypesConfig) {
+ Map<String, DatabaseDiscoveryProvider> result = new
LinkedHashMap<>(discoveryTypesConfig.size(), 1);
for (Entry<String, AlgorithmConfiguration> entry :
discoveryTypesConfig.entrySet()) {
- result.put(entry.getKey(),
TypedSPILoader.getService(DatabaseDiscoveryProviderAlgorithm.class,
entry.getValue().getType(), entry.getValue().getProps()));
+ result.put(entry.getKey(),
TypedSPILoader.getService(DatabaseDiscoveryProvider.class,
entry.getValue().getType(), entry.getValue().getProps()));
}
return result;
}
@@ -102,7 +102,7 @@ public final class DatabaseDiscoveryRule implements
DatabaseRule, DataSourceCont
Map<String, DatabaseDiscoveryDataSourceRule> result = new
HashMap<>(dataSources.size(), 1);
for (DatabaseDiscoveryDataSourceRuleConfiguration each : dataSources) {
result.put(each.getGroupName(), new
DatabaseDiscoveryDataSourceRule(each,
Strings.isNullOrEmpty(each.getDiscoveryHeartbeatName()) ? new Properties()
- :
heartbeatConfig.get(each.getDiscoveryHeartbeatName()).getProps(),
discoveryTypes.get(each.getDiscoveryTypeName())));
+ :
heartbeatConfig.get(each.getDiscoveryHeartbeatName()).getProps(),
providerTypes.get(each.getDiscoveryTypeName())));
}
return result;
}
@@ -112,7 +112,7 @@ public final class DatabaseDiscoveryRule implements
DatabaseRule, DataSourceCont
String groupName = entry.getKey();
DatabaseDiscoveryDataSourceRule dataSourceRule = entry.getValue();
Map<String, DataSource> originalDataSourceMap =
dataSourceRule.getDataSourceGroup(dataSourceMap);
- DatabaseDiscoveryEngine engine = new
DatabaseDiscoveryEngine(dataSourceRule.getDatabaseDiscoveryProviderAlgorithm(),
instanceContext.getEventBusContext());
+ DatabaseDiscoveryEngine engine = new
DatabaseDiscoveryEngine(dataSourceRule.getProvider(),
instanceContext.getEventBusContext());
engine.checkEnvironment(databaseName, originalDataSourceMap);
dataSourceRule.changePrimaryDataSourceName(engine.changePrimaryDataSource(
databaseName, groupName,
entry.getValue().getPrimaryDataSourceName(), originalDataSourceMap,
dataSourceRule.getDisabledDataSourceNames()));
@@ -161,23 +161,23 @@ public final class DatabaseDiscoveryRule implements
DatabaseRule, DataSourceCont
public void closeSingleHeartBeatJob(final String groupName) {
DatabaseDiscoveryDataSourceRule dataSourceRule =
dataSourceRules.get(groupName);
ShardingSpherePreconditions.checkNotNull(dataSourceRule, () -> new
DBDiscoveryDataSourceRuleNotFoundException(databaseName));
-
scheduleContext.closeSchedule(dataSourceRule.getDatabaseDiscoveryProviderAlgorithm().getType()
+ "-" + databaseName + "-" + dataSourceRule.getGroupName());
+ scheduleContext.closeSchedule(dataSourceRule.getProvider().getType() +
"-" + databaseName + "-" + dataSourceRule.getGroupName());
}
@Override
public void closeAllHeartBeatJob() {
for (Entry<String, DatabaseDiscoveryDataSourceRule> entry :
dataSourceRules.entrySet()) {
DatabaseDiscoveryDataSourceRule rule = entry.getValue();
-
scheduleContext.closeSchedule(rule.getDatabaseDiscoveryProviderAlgorithm().getType()
+ "-" + databaseName + "-" + rule.getGroupName());
+ scheduleContext.closeSchedule(rule.getProvider().getType() + "-" +
databaseName + "-" + rule.getGroupName());
}
}
private void initHeartBeatJobs() {
for (Entry<String, DatabaseDiscoveryDataSourceRule> entry :
dataSourceRules.entrySet()) {
DatabaseDiscoveryDataSourceRule rule = entry.getValue();
- String jobName =
rule.getDatabaseDiscoveryProviderAlgorithm().getType() + "-" + databaseName +
"-" + rule.getGroupName();
+ String jobName = rule.getProvider().getType() + "-" + databaseName
+ "-" + rule.getGroupName();
CronJob job = new CronJob(jobName, each -> new
HeartbeatJob(databaseName, rule.getGroupName(),
rule.getPrimaryDataSourceName(), rule.getDataSourceGroup(dataSourceMap),
- rule.getDatabaseDiscoveryProviderAlgorithm(),
rule.getDisabledDataSourceNames(),
instanceContext.getEventBusContext()).execute(null),
+ rule.getProvider(), rule.getDisabledDataSourceNames(),
instanceContext.getEventBusContext()).execute(null),
rule.getHeartbeatProps().getProperty("keep-alive-cron"));
scheduleContext.startSchedule(job);
}
diff --git
a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderAlgorithmFixture.java
b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderFixture.java
similarity index 92%
rename from
features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderAlgorithmFixture.java
rename to
features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderFixture.java
index 1b463afc223..fc13e830add 100644
---
a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderAlgorithmFixture.java
+++
b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderFixture.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.dbdiscovery.fixture;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import javax.sql.DataSource;
import java.util.Collection;
import java.util.Optional;
-public final class CoreDatabaseDiscoveryProviderAlgorithmFixture implements
DatabaseDiscoveryProviderAlgorithm {
+public final class CoreDatabaseDiscoveryProviderFixture implements
DatabaseDiscoveryProvider {
@Override
public void checkEnvironment(final String databaseName, final
Collection<DataSource> dataSource) {
diff --git
a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRuleTest.java
b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRuleTest.java
index 96f88a6a66e..b1111b3f321 100644
---
a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRuleTest.java
+++
b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryDataSourceRuleTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.dbdiscovery.rule;
import
org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryDataSourceRuleConfiguration;
import
org.apache.shardingsphere.dbdiscovery.exception.MissingRequiredDataSourceNamesConfigurationException;
-import
org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProviderAlgorithm;
+import
org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProvider;
import org.junit.Test;
import java.util.Arrays;
@@ -34,24 +34,24 @@ public final class DatabaseDiscoveryDataSourceRuleTest {
private final DatabaseDiscoveryDataSourceRule
databaseDiscoveryDataSourceRule = new DatabaseDiscoveryDataSourceRule(
new DatabaseDiscoveryDataSourceRuleConfiguration("test_pr",
Arrays.asList("ds_0", "ds_1"), "ha_heartbeat", "discoveryTypeName"), new
Properties(),
- new MGRMySQLDatabaseDiscoveryProviderAlgorithm());
+ new MGRMySQLDatabaseDiscoveryProvider());
@Test(expected = IllegalArgumentException.class)
public void assertNewHADataSourceRuleWithoutName() {
new DatabaseDiscoveryDataSourceRule(new
DatabaseDiscoveryDataSourceRuleConfiguration("", Arrays.asList("ds_0", "ds_1"),
"ha_heartbeat", "discoveryTypeName"),
- new Properties(), new
MGRMySQLDatabaseDiscoveryProviderAlgorithm());
+ new Properties(), new MGRMySQLDatabaseDiscoveryProvider());
}
@Test(expected =
MissingRequiredDataSourceNamesConfigurationException.class)
public void assertNewHADataSourceRuleWithNullDataSourceName() {
new DatabaseDiscoveryDataSourceRule(new
DatabaseDiscoveryDataSourceRuleConfiguration("ds", null, "ha_heartbeat",
"discoveryTypeName"),
- new Properties(), new
MGRMySQLDatabaseDiscoveryProviderAlgorithm());
+ new Properties(), new MGRMySQLDatabaseDiscoveryProvider());
}
@Test(expected =
MissingRequiredDataSourceNamesConfigurationException.class)
public void assertNewHADataSourceRuleWithEmptyDataSourceName() {
new DatabaseDiscoveryDataSourceRule(new
DatabaseDiscoveryDataSourceRuleConfiguration("ds", Collections.emptyList(),
"ha_heartbeat", "discoveryTypeName"),
- new Properties(), new
MGRMySQLDatabaseDiscoveryProviderAlgorithm());
+ new Properties(), new MGRMySQLDatabaseDiscoveryProvider());
}
@Test
diff --git
a/features/db-discovery/core/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
b/features/db-discovery/core/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
similarity index 96%
rename from
features/db-discovery/core/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
rename to
features/db-discovery/core/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
index 750d604bf9c..dd379eaceea 100644
---
a/features/db-discovery/core/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
+++
b/features/db-discovery/core/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.dbdiscovery.fixture.CoreDatabaseDiscoveryProviderAlgorithmFixture
+org.apache.shardingsphere.dbdiscovery.fixture.CoreDatabaseDiscoveryProviderFixture
diff --git
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
index 698bc92468f..aa28a03d188 100644
---
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
+++
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryDa
import
org.apache.shardingsphere.dbdiscovery.distsql.handler.converter.DatabaseDiscoveryRuleStatementConverter;
import
org.apache.shardingsphere.dbdiscovery.distsql.parser.segment.DatabaseDiscoveryRuleSegment;
import
org.apache.shardingsphere.dbdiscovery.distsql.parser.statement.AlterDatabaseDiscoveryRuleStatement;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import
org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
@@ -87,7 +87,7 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdater
implements RuleDef
Map<String, List<DatabaseDiscoveryRuleSegment>> segmentMap =
sqlStatement.getRules().stream().collect(Collectors.groupingBy(each ->
each.getClass().getSimpleName()));
Collection<String> invalidInput =
segmentMap.getOrDefault(DatabaseDiscoveryRuleSegment.class.getSimpleName(),
Collections.emptyList()).stream()
.map(each -> each.getDiscoveryType().getName()).distinct()
- .filter(each ->
!TypedSPILoader.contains(DatabaseDiscoveryProviderAlgorithm.class,
each)).collect(Collectors.toList());
+ .filter(each ->
!TypedSPILoader.contains(DatabaseDiscoveryProvider.class,
each)).collect(Collectors.toList());
ShardingSpherePreconditions.checkState(invalidInput.isEmpty(), () ->
new InvalidAlgorithmConfigurationException("database discovery", invalidInput));
}
diff --git
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
index f284084b096..fc1ee56dadb 100644
---
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
+++
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryDa
import
org.apache.shardingsphere.dbdiscovery.distsql.handler.converter.DatabaseDiscoveryRuleStatementConverter;
import
org.apache.shardingsphere.dbdiscovery.distsql.parser.segment.DatabaseDiscoveryRuleSegment;
import
org.apache.shardingsphere.dbdiscovery.distsql.parser.statement.CreateDatabaseDiscoveryRuleStatement;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import
org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException;
import
org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
@@ -108,7 +108,7 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdater implements RuleDe
Map<String, List<DatabaseDiscoveryRuleSegment>> segmentMap =
sqlStatement.getRules().stream().collect(Collectors.groupingBy(each ->
each.getClass().getSimpleName()));
Collection<String> invalidInput =
segmentMap.getOrDefault(DatabaseDiscoveryRuleSegment.class.getSimpleName(),
Collections.emptyList()).stream()
.map(each -> each.getDiscoveryType().getName()).distinct()
- .filter(each ->
!TypedSPILoader.contains(DatabaseDiscoveryProviderAlgorithm.class,
each)).collect(Collectors.toList());
+ .filter(each ->
!TypedSPILoader.contains(DatabaseDiscoveryProvider.class,
each)).collect(Collectors.toList());
ShardingSpherePreconditions.checkState(invalidInput.isEmpty(), () ->
new InvalidAlgorithmConfigurationException("database discovery", invalidInput));
}
diff --git
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderAlgorithmFixture.java
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderFixture.java
similarity index 92%
rename from
features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderAlgorithmFixture.java
rename to
features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderFixture.java
index 6131ac45e40..ba81c9f514d 100644
---
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderAlgorithmFixture.java
+++
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderFixture.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.dbdiscovery.distsql.handler.fixture;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import javax.sql.DataSource;
import java.util.Collection;
import java.util.Optional;
-public final class DistSQLDatabaseDiscoveryProviderAlgorithmFixture implements
DatabaseDiscoveryProviderAlgorithm {
+public final class DistSQLDatabaseDiscoveryProviderFixture implements
DatabaseDiscoveryProvider {
@Override
public void checkEnvironment(final String databaseName, final
Collection<DataSource> dataSource) {
diff --git
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest.java
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderStatementUpdaterTest.java
similarity index 98%
rename from
features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest.java
rename to
features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderStatementUpdaterTest.java
index ddd886c1ac1..9c455cdd016 100644
---
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest.java
+++
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderStatementUpdaterTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
-public final class DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest {
+public final class DropDatabaseDiscoveryProviderStatementUpdaterTest {
private final DropDatabaseDiscoveryTypeStatementUpdater updater = new
DropDatabaseDiscoveryTypeStatementUpdater();
diff --git
a/features/db-discovery/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
b/features/db-discovery/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
similarity index 94%
rename from
features/db-discovery/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
rename to
features/db-discovery/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
index ac124ac3796..129bf62f0d8 100644
---
a/features/db-discovery/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
+++
b/features/db-discovery/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.dbdiscovery.distsql.handler.fixture.DistSQLDatabaseDiscoveryProviderAlgorithmFixture
+org.apache.shardingsphere.dbdiscovery.distsql.handler.fixture.DistSQLDatabaseDiscoveryProviderFixture
diff --git
a/features/db-discovery/distsql/statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/segment/DatabaseDiscoveryProviderAlgorithmSegment.java
b/features/db-discovery/distsql/statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/segment/DatabaseDiscoveryProviderSegment.java
similarity index 90%
rename from
features/db-discovery/distsql/statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/segment/DatabaseDiscoveryProviderAlgorithmSegment.java
rename to
features/db-discovery/distsql/statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/segment/DatabaseDiscoveryProviderSegment.java
index 8db8aaefb8d..a0f08b5d88b 100644
---
a/features/db-discovery/distsql/statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/segment/DatabaseDiscoveryProviderAlgorithmSegment.java
+++
b/features/db-discovery/distsql/statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/segment/DatabaseDiscoveryProviderSegment.java
@@ -23,11 +23,11 @@ import
org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
/**
- * Database discovery provider algorithm segment.
+ * Database discovery provider segment.
*/
@RequiredArgsConstructor
@Getter
-public final class DatabaseDiscoveryProviderAlgorithmSegment implements
ASTNode {
+public final class DatabaseDiscoveryProviderSegment implements ASTNode {
private final String discoveryProviderName;
diff --git
a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java
b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProvider.java
similarity index 97%
rename from
features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java
rename to
features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProvider.java
index 0517321ca3c..acb07b8b13a 100644
---
a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java
+++
b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProvider.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.dbdiscovery.mysql.exception.mgr.InvalidMGRGroup
import
org.apache.shardingsphere.dbdiscovery.mysql.exception.mgr.InvalidMGRModeException;
import
org.apache.shardingsphere.dbdiscovery.mysql.exception.mgr.InvalidMGRPluginException;
import
org.apache.shardingsphere.dbdiscovery.mysql.exception.mgr.InvalidMGRReplicationGroupMemberException;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import
org.apache.shardingsphere.infra.database.metadata.dialect.MySQLDataSourceMetaData;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
@@ -43,9 +43,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
/**
- * MGR database discovery provider algorithm for MySQL.
+ * MGR database discovery provider for MySQL.
*/
-public final class MGRMySQLDatabaseDiscoveryProviderAlgorithm implements
DatabaseDiscoveryProviderAlgorithm {
+public final class MGRMySQLDatabaseDiscoveryProvider implements
DatabaseDiscoveryProvider {
private static final String QUERY_PLUGIN_STATUS = "SELECT PLUGIN_STATUS
FROM information_schema.PLUGINS WHERE PLUGIN_NAME='group_replication'";
diff --git
a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProvider.java
similarity index 97%
rename from
features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
rename to
features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProvider.java
index 3f340b03db4..def5436aa33 100644
---
a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
+++
b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProvider.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.dbdiscovery.mysql.type;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.dbdiscovery.mysql.exception.replica.DuplicatePrimaryDataSourceException;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
@@ -40,9 +40,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
/**
- * Normal replication database discovery provider algorithm for MySQL.
+ * Normal replication database discovery provider for MySQL.
*/
-public final class MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm
implements DatabaseDiscoveryProviderAlgorithm {
+public final class MySQLNormalReplicationDatabaseDiscoveryProvider implements
DatabaseDiscoveryProvider {
private static final String SHOW_SLAVE_STATUS = "SHOW SLAVE STATUS";
diff --git
a/features/db-discovery/provider/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
b/features/db-discovery/provider/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
similarity index 92%
rename from
features/db-discovery/provider/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
rename to
features/db-discovery/provider/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
index 1667781515f..bfba97339e9 100644
---
a/features/db-discovery/provider/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
+++
b/features/db-discovery/provider/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProviderAlgorithm
-org.apache.shardingsphere.dbdiscovery.mysql.type.MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm
+org.apache.shardingsphere.dbdiscovery.mysql.type.MGRMySQLDatabaseDiscoveryProvider
+org.apache.shardingsphere.dbdiscovery.mysql.type.MySQLNormalReplicationDatabaseDiscoveryProvider
diff --git
a/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRDatabaseDiscoveryProviderAlgorithmTest.java
b/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRDatabaseDiscoveryProviderTest.java
similarity index 89%
rename from
features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRDatabaseDiscoveryProviderAlgorithmTest.java
rename to
features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRDatabaseDiscoveryProviderTest.java
index 612f0e094f2..04d571fa200 100644
---
a/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRDatabaseDiscoveryProviderAlgorithmTest.java
+++
b/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRDatabaseDiscoveryProviderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.dbdiscovery.mysql.type;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
@@ -38,11 +38,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class MGRDatabaseDiscoveryProviderAlgorithmTest {
+public final class MGRDatabaseDiscoveryProviderTest {
@Test
public void assertCheckEnvironment() throws SQLException {
- DatabaseDiscoveryProviderAlgorithm actual =
TypedSPILoader.getService(DatabaseDiscoveryProviderAlgorithm.class,
"MySQL.MGR", PropertiesBuilder.build(new Property("group-name", "foo_group")));
+ DatabaseDiscoveryProvider actual =
TypedSPILoader.getService(DatabaseDiscoveryProvider.class, "MySQL.MGR",
PropertiesBuilder.build(new Property("group-name", "foo_group")));
actual.checkEnvironment("foo_db",
Collections.singletonList(mockEnvironmentAvailableDataSource()));
}
@@ -61,7 +61,7 @@ public final class MGRDatabaseDiscoveryProviderAlgorithmTest {
@Test
public void assertIsPrimaryInstance() throws SQLException {
- DatabaseDiscoveryProviderAlgorithm actual =
TypedSPILoader.getService(DatabaseDiscoveryProviderAlgorithm.class,
"MySQL.MGR");
+ DatabaseDiscoveryProvider actual =
TypedSPILoader.getService(DatabaseDiscoveryProvider.class, "MySQL.MGR");
assertTrue(actual.isPrimaryInstance(mockPrimaryDataSource()));
}
@@ -82,7 +82,7 @@ public final class MGRDatabaseDiscoveryProviderAlgorithmTest {
public void assertLoadReplicaStatus() throws SQLException {
DataSource dataSource = mock(DataSource.class, RETURNS_DEEP_STUBS);
when(dataSource.getConnection().getMetaData().getURL()).thenReturn("jdbc:mysql://127.0.0.1:3306/foo_ds");
- ReplicaDataSourceStatus actual = new
MGRMySQLDatabaseDiscoveryProviderAlgorithm().loadReplicaStatus(dataSource);
+ ReplicaDataSourceStatus actual = new
MGRMySQLDatabaseDiscoveryProvider().loadReplicaStatus(dataSource);
assertFalse(actual.isOnline());
assertThat(actual.getReplicationDelayMilliseconds(), is(0L));
}
diff --git
a/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
b/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderTest.java
similarity index 86%
rename from
features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
rename to
features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderTest.java
index b90eb9271a0..f134b33b7d1 100644
---
a/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
+++
b/features/db-discovery/provider/mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.dbdiscovery.mysql.type;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
@@ -37,16 +37,16 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class
MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest {
+public final class MySQLNormalReplicationDatabaseDiscoveryProviderTest {
@Test
public void assertCheckEnvironment() throws SQLException {
- new
MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm().checkEnvironment("foo_db",
Collections.singleton(mockDataSourceForReplicationInstances()));
+ new
MySQLNormalReplicationDatabaseDiscoveryProvider().checkEnvironment("foo_db",
Collections.singleton(mockDataSourceForReplicationInstances()));
}
@Test
public void assertIsPrimaryInstance() throws SQLException {
- assertTrue(new
MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm().isPrimaryInstance(mockDataSourceForReplicationInstances()));
+ assertTrue(new
MySQLNormalReplicationDatabaseDiscoveryProvider().isPrimaryInstance(mockDataSourceForReplicationInstances()));
}
private DataSource mockDataSourceForReplicationInstances() throws
SQLException {
@@ -66,10 +66,10 @@ public final class
MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithmTest
@Test
public void assertLoadReplicaStatus() throws SQLException {
- DatabaseDiscoveryProviderAlgorithm algorithm = new
MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm();
- algorithm.init(PropertiesBuilder.build(new
Property("delay-milliseconds-threshold", "15000")));
+ DatabaseDiscoveryProvider provider = new
MySQLNormalReplicationDatabaseDiscoveryProvider();
+ provider.init(PropertiesBuilder.build(new
Property("delay-milliseconds-threshold", "15000")));
DataSource dataSource = mockDataSourceForReplicaStatus();
- ReplicaDataSourceStatus actual =
algorithm.loadReplicaStatus(dataSource);
+ ReplicaDataSourceStatus actual =
provider.loadReplicaStatus(dataSource);
assertTrue(actual.isOnline());
assertThat(actual.getReplicationDelayMilliseconds(), is(10000L));
}
diff --git
a/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
b/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProvider.java
similarity index 95%
rename from
features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
rename to
features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProvider.java
index d0435a2e6fa..e7d76ae03c2 100644
---
a/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
+++
b/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.dbdiscovery.opengauss;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import javax.sql.DataSource;
@@ -30,9 +30,9 @@ import java.util.Optional;
import java.util.Properties;
/**
- * Normal replication database discovery provider algorithm for openGauss.
+ * Normal replication database discovery provider for openGauss.
*/
-public final class
OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm implements
DatabaseDiscoveryProviderAlgorithm {
+public final class OpenGaussNormalReplicationDatabaseDiscoveryProvider
implements DatabaseDiscoveryProvider {
private static final String QUERY_DB_ROLE = "SELECT local_role,db_state
FROM pg_stat_get_stream_replications()";
diff --git
a/features/db-discovery/provider/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
b/features/db-discovery/provider/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
similarity index 94%
rename from
features/db-discovery/provider/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
rename to
features/db-discovery/provider/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
index 95642d91e1d..d68c592d063 100644
---
a/features/db-discovery/provider/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm
+++
b/features/db-discovery/provider/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.dbdiscovery.opengauss.OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm
+org.apache.shardingsphere.dbdiscovery.opengauss.OpenGaussNormalReplicationDatabaseDiscoveryProvider
diff --git
a/features/db-discovery/provider/opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
b/features/db-discovery/provider/opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderTest.java
similarity index 96%
rename from
features/db-discovery/provider/opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
rename to
features/db-discovery/provider/opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderTest.java
index cb9d10c4bd9..6a315753ff6 100644
---
a/features/db-discovery/provider/opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithmTest.java
+++
b/features/db-discovery/provider/opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderTest.java
@@ -28,11 +28,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class
OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithmTest {
+public final class OpenGaussNormalReplicationDatabaseDiscoveryProviderTest {
@Test
public void assertIsPrimaryInstance() throws SQLException {
- assertTrue(new
OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm().isPrimaryInstance(mockDatSource()));
+ assertTrue(new
OpenGaussNormalReplicationDatabaseDiscoveryProvider().isPrimaryInstance(mockDatSource()));
}
private DataSource mockDatSource() throws SQLException {
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderAlgorithmTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderTest.java
similarity index 97%
rename from
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderAlgorithmTest.java
rename to
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderTest.java
index 4d7d5a76d02..70dd002b281 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderAlgorithmTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderTest.java
@@ -34,7 +34,7 @@ import java.util.Properties;
import static org.junit.Assert.assertTrue;
-public final class DatabasePermittedPrivilegesProviderAlgorithmTest {
+public final class DatabasePermittedPrivilegesProviderTest {
@Test
public void assertBuildAuthorityRegistry() {
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/simple/model/privilege/AllPermittedPrivilegesProviderAlgorithmTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/simple/model/privilege/AllPermittedPrivilegesProviderTest.java
similarity index 95%
rename from
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/simple/model/privilege/AllPermittedPrivilegesProviderAlgorithmTest.java
rename to
kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/simple/model/privilege/AllPermittedPrivilegesProviderTest.java
index 152aad11b89..b78c6570e26 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/simple/model/privilege/AllPermittedPrivilegesProviderAlgorithmTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/simple/model/privilege/AllPermittedPrivilegesProviderTest.java
@@ -25,7 +25,7 @@ import java.util.Collections;
import static org.junit.Assert.assertTrue;
-public final class AllPermittedPrivilegesProviderAlgorithmTest {
+public final class AllPermittedPrivilegesProviderTest {
@Test
public void assertFindPrivileges() {
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
index 014d477fd2a..8ea324a6e4a 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.checker;
import
org.apache.shardingsphere.dbdiscovery.api.config.DatabaseDiscoveryRuleConfiguration;
-import
org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
+import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProvider;
import
org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException;
import
org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
@@ -62,7 +62,7 @@ public final class
DatabaseDiscoveryRuleConfigurationImportChecker {
private void checkDiscoverTypeAndHeartbeat(final String databaseName,
final DatabaseDiscoveryRuleConfiguration currentRuleConfig) {
Collection<String> invalidInput =
currentRuleConfig.getDiscoveryTypes().values().stream().map(AlgorithmConfiguration::getType)
- .filter(each ->
!TypedSPILoader.contains(DatabaseDiscoveryProviderAlgorithm.class,
each)).collect(Collectors.toList());
+ .filter(each ->
!TypedSPILoader.contains(DatabaseDiscoveryProvider.class,
each)).collect(Collectors.toList());
ShardingSpherePreconditions.checkState(invalidInput.isEmpty(), () ->
new InvalidAlgorithmConfigurationException(DB_DISCOVERY.toLowerCase(),
invalidInput));
currentRuleConfig.getDataSources().forEach(each -> {
if
(!currentRuleConfig.getDiscoveryTypes().containsKey(each.getDiscoveryTypeName()))
{
