You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/06/13 02:46:47 UTC
[shardingsphere] branch master updated: Remove synchronized for some scenes and remove unless method (#26311)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 931b41c097d Remove synchronized for some scenes and remove unless method (#26311)
931b41c097d is described below
commit 931b41c097d253e9666c1266212ac45c570fc638
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Tue Jun 13 10:46:39 2023 +0800
Remove synchronized for some scenes and remove unless method (#26311)
* Remove synchronized for some scenes and remove unless method
* Fix checkstyle
* Remove unless method
---
.../database/type/checker/DatabaseTypeChecker.java | 2 +-
.../mode/manager/ContextManager.java | 58 +++++++---------------
.../event/version/DatabaseVersionChangedEvent.java | 34 -------------
.../metadata/watcher/MetaDataChangedWatcher.java | 4 --
.../subscriber/ConfigurationChangedSubscriber.java | 16 ------
.../ConfigurationChangedSubscriberTest.java | 15 ------
6 files changed, 18 insertions(+), 111 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/checker/DatabaseTypeChecker.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/checker/DatabaseTypeChecker.java
index 58d88d61a87..736d0d0daf4 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/checker/DatabaseTypeChecker.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/checker/DatabaseTypeChecker.java
@@ -45,7 +45,7 @@ public final class DatabaseTypeChecker {
private static final Collection<String> UNSUPPORTED_URL_PREFIXES = Collections.singletonList("jdbc:mysql:aws");
private static final Collection<DatabaseType> SUPPORTED_STORAGE_TYPES = new HashSet<>(8, 1F);
-
+
private static volatile boolean isChecked;
static {
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 1087f2ad81b..da099f8c779 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -216,19 +216,19 @@ public final class ContextManager implements AutoCloseable {
alterMetaDataHeldRule(metaDataContexts.get().getMetaData().getDatabase(databaseName));
}
- private synchronized void dropTable(final String databaseName, final String schemaName, final String toBeDeletedTableName) {
+ private void dropTable(final String databaseName, final String schemaName, final String toBeDeletedTableName) {
metaDataContexts.get().getMetaData().getDatabase(databaseName).getSchema(schemaName).removeTable(toBeDeletedTableName);
metaDataContexts.get().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules().stream().filter(MutableDataNodeRule.class::isInstance).findFirst()
.ifPresent(optional -> ((MutableDataNodeRule) optional).remove(schemaName, toBeDeletedTableName));
}
- private synchronized void dropView(final String databaseName, final String schemaName, final String toBeDeletedViewName) {
+ private void dropView(final String databaseName, final String schemaName, final String toBeDeletedViewName) {
metaDataContexts.get().getMetaData().getDatabase(databaseName).getSchema(schemaName).removeView(toBeDeletedViewName);
metaDataContexts.get().getMetaData().getDatabase(databaseName).getRuleMetaData().getRules().stream().filter(MutableDataNodeRule.class::isInstance).findFirst()
.ifPresent(optional -> ((MutableDataNodeRule) optional).remove(schemaName, toBeDeletedViewName));
}
- private synchronized void alterTable(final String databaseName, final String schemaName, final ShardingSphereTable beBoChangedTable) {
+ private void alterTable(final String databaseName, final String schemaName, final ShardingSphereTable beBoChangedTable) {
ShardingSphereDatabase database = metaDataContexts.get().getMetaData().getDatabase(databaseName);
if (isSingleTable(database, beBoChangedTable.getName())) {
database.reloadRules(MutableDataNodeRule.class);
@@ -236,7 +236,7 @@ public final class ContextManager implements AutoCloseable {
database.getSchema(schemaName).putTable(beBoChangedTable.getName(), beBoChangedTable);
}
- private synchronized void alterView(final String databaseName, final String schemaName, final ShardingSphereView beBoChangedView) {
+ private void alterView(final String databaseName, final String schemaName, final ShardingSphereView beBoChangedView) {
ShardingSphereDatabase database = metaDataContexts.get().getMetaData().getDatabase(databaseName);
if (isSingleTable(database, beBoChangedView.getName())) {
database.reloadRules(MutableDataNodeRule.class);
@@ -255,7 +255,7 @@ public final class ContextManager implements AutoCloseable {
* @param ruleConfigs rule configurations
*/
@SuppressWarnings("rawtypes")
- public synchronized void alterRuleConfiguration(final String databaseName, final Collection<RuleConfiguration> ruleConfigs) {
+ public void alterRuleConfiguration(final String databaseName, final Collection<RuleConfiguration> ruleConfigs) {
try {
Collection<ResourceHeldRule> staleResourceHeldRules = getStaleResourceHeldRules(databaseName);
staleResourceHeldRules.forEach(ResourceHeldRule::closeStaleResource);
@@ -275,7 +275,7 @@ public final class ContextManager implements AutoCloseable {
* @param reloadDatabase reload database
* @param currentDatabase current database
*/
- public synchronized void alterSchemaMetaData(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
+ public void alterSchemaMetaData(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
Map<String, ShardingSphereSchema> toBeAlterSchemas = SchemaManager.getToBeDeletedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas());
Map<String, ShardingSphereSchema> toBeAddedSchemas = SchemaManager.getToBeAddedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas());
toBeAddedSchemas.forEach((key, value) -> metaDataContexts.get().getPersistService().getDatabaseMetaDataService().persist(databaseName, key, value));
@@ -289,7 +289,7 @@ public final class ContextManager implements AutoCloseable {
* @param dataSourcePropsMap altered data source properties map
*/
@SuppressWarnings("rawtypes")
- public synchronized void alterDataSourceConfiguration(final String databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap) {
+ public void alterDataSourceConfiguration(final String databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap) {
try {
Collection<ResourceHeldRule> staleResourceHeldRules = getStaleResourceHeldRules(databaseName);
staleResourceHeldRules.forEach(ResourceHeldRule::closeStaleResource);
@@ -319,7 +319,7 @@ public final class ContextManager implements AutoCloseable {
* @param resource resource
* @return ShardingSphere databases
*/
- public synchronized Map<String, ShardingSphereDatabase> renewDatabase(final ShardingSphereDatabase database, final SwitchingResource resource) {
+ public Map<String, ShardingSphereDatabase> renewDatabase(final ShardingSphereDatabase database, final SwitchingResource resource) {
Map<String, DataSource> newDataSource =
database.getResourceMetaData().getDataSources().entrySet().stream().filter(entry -> !resource.getStaleDataSources().containsKey(entry.getKey()))
.collect(Collectors.toMap(Entry::getKey, Entry::getValue, (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
@@ -328,27 +328,6 @@ public final class ContextManager implements AutoCloseable {
database.getRuleMetaData(), database.getSchemas()));
}
- /**
- * Alter data source and rule configuration.
- *
- * @param databaseName database name
- * @param dataSourcePropsMap data source props map
- * @param ruleConfigs rule configurations
- */
- @SuppressWarnings("rawtypes")
- public synchronized void alterDataSourceAndRuleConfiguration(final String databaseName,
- final Map<String, DataSourceProperties> dataSourcePropsMap, final Collection<RuleConfiguration> ruleConfigs) {
- try {
- Collection<ResourceHeldRule> staleResourceHeldRules = getStaleResourceHeldRules(databaseName);
- staleResourceHeldRules.forEach(ResourceHeldRule::closeStaleResource);
- SwitchingResource switchingResource = new ResourceSwitchManager().create(metaDataContexts.get().getMetaData().getDatabase(databaseName).getResourceMetaData(), dataSourcePropsMap);
- metaDataContexts.set(createMetaDataContexts(databaseName, true, switchingResource, ruleConfigs));
- switchingResource.closeStaleDataSources();
- } catch (final SQLException ex) {
- log.error("Alter database: {} data source and rule configuration failed", databaseName, ex);
- }
- }
-
@SuppressWarnings("rawtypes")
private Collection<ResourceHeldRule> getStaleResourceHeldRules(final String databaseName) {
Collection<ResourceHeldRule> result = new LinkedList<>();
@@ -367,8 +346,8 @@ public final class ContextManager implements AutoCloseable {
* @return MetaDataContexts meta data contexts
* @throws SQLException SQL exception
*/
- public synchronized MetaDataContexts createMetaDataContexts(final String databaseName, final boolean internalLoadMetaData, final SwitchingResource switchingResource,
- final Collection<RuleConfiguration> ruleConfigs) throws SQLException {
+ public MetaDataContexts createMetaDataContexts(final String databaseName, final boolean internalLoadMetaData, final SwitchingResource switchingResource,
+ final Collection<RuleConfiguration> ruleConfigs) throws SQLException {
Map<String, ShardingSphereDatabase> changedDatabases = createChangedDatabases(databaseName, internalLoadMetaData, switchingResource, ruleConfigs);
ConfigurationProperties props = metaDataContexts.get().getMetaData().getProps();
ShardingSphereRuleMetaData changedGlobalMetaData = new ShardingSphereRuleMetaData(
@@ -438,7 +417,7 @@ public final class ContextManager implements AutoCloseable {
* @param originalDatabase original database
* @return ShardingSphere databases
*/
- public synchronized Map<String, ShardingSphereDatabase> newShardingSphereDatabase(final ShardingSphereDatabase originalDatabase) {
+ public Map<String, ShardingSphereDatabase> newShardingSphereDatabase(final ShardingSphereDatabase originalDatabase) {
return Collections.singletonMap(originalDatabase.getName().toLowerCase(), new ShardingSphereDatabase(originalDatabase.getName(),
originalDatabase.getProtocolType(), originalDatabase.getResourceMetaData(), originalDatabase.getRuleMetaData(),
metaDataContexts.get().getPersistService().getDatabaseMetaDataService().loadSchemas(originalDatabase.getName())));
@@ -479,7 +458,7 @@ public final class ContextManager implements AutoCloseable {
*
* @param databaseName to be reloaded database name
*/
- public synchronized void reloadDatabaseMetaData(final String databaseName) {
+ public void reloadDatabaseMetaData(final String databaseName) {
try {
ShardingSphereDatabase database = metaDataContexts.get().getMetaData().getDatabase(databaseName);
ShardingSphereResourceMetaData currentResourceMetaData = database.getResourceMetaData();
@@ -491,7 +470,6 @@ public final class ContextManager implements AutoCloseable {
metaDataContexts.set(reloadedMetaDataContexts);
metaDataContexts.get().getMetaData().getDatabases().values().forEach(each -> each.getSchemas()
.forEach((schemaName, schema) -> metaDataContexts.get().getPersistService().getDatabaseMetaDataService().compareAndPersist(each.getName(), schemaName, schema)));
- alterMetaDataHeldRule(database);
switchingResource.closeStaleDataSources();
} catch (final SQLException ex) {
log.error("Reload database meta data: {} failed", databaseName, ex);
@@ -505,7 +483,7 @@ public final class ContextManager implements AutoCloseable {
* @param reloadDatabase reload database
* @param currentDatabase current database
*/
- public synchronized void deletedSchemaNames(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
+ public void deletedSchemaNames(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
SchemaManager.getToBeDeletedSchemaNames(reloadDatabase.getSchemas(), currentDatabase.getSchemas()).keySet()
.forEach(each -> metaDataContexts.get().getPersistService().getDatabaseMetaDataService().dropSchema(databaseName, each));
}
@@ -517,7 +495,7 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName to be reloaded schema name
* @param dataSourceName data source name
*/
- public synchronized void reloadSchema(final String databaseName, final String schemaName, final String dataSourceName) {
+ public void reloadSchema(final String databaseName, final String schemaName, final String dataSourceName) {
try {
ShardingSphereSchema reloadedSchema = loadSchema(databaseName, schemaName, dataSourceName);
if (reloadedSchema.getTables().isEmpty()) {
@@ -529,7 +507,6 @@ public final class ContextManager implements AutoCloseable {
metaDataContexts.get().getPersistService().getDatabaseMetaDataService()
.compareAndPersist(metaDataContexts.get().getMetaData().getDatabase(databaseName).getName(), schemaName, reloadedSchema);
}
- alterMetaDataHeldRule(metaDataContexts.get().getMetaData().getDatabase(databaseName));
} catch (final SQLException ex) {
log.error("Reload meta data of database: {} schema: {} with data source: {} failed", databaseName, schemaName, dataSourceName, ex);
}
@@ -553,7 +530,7 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName schema name
* @param tableName to be reloaded table name
*/
- public synchronized void reloadTable(final String databaseName, final String schemaName, final String tableName) {
+ public void reloadTable(final String databaseName, final String schemaName, final String tableName) {
Map<String, DataSource> dataSourceMap = metaDataContexts.get().getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources();
try {
reloadTable(databaseName, schemaName, tableName, dataSourceMap);
@@ -570,7 +547,7 @@ public final class ContextManager implements AutoCloseable {
* @param dataSourceName data source name
* @param tableName to be reloaded table name
*/
- public synchronized void reloadTable(final String databaseName, final String schemaName, final String dataSourceName, final String tableName) {
+ public void reloadTable(final String databaseName, final String schemaName, final String dataSourceName, final String tableName) {
Map<String, DataSource> dataSourceMap = Collections.singletonMap(
dataSourceName, metaDataContexts.get().getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName));
try {
@@ -580,7 +557,7 @@ public final class ContextManager implements AutoCloseable {
}
}
- private synchronized void reloadTable(final String databaseName, final String schemaName, final String tableName, final Map<String, DataSource> dataSourceMap) throws SQLException {
+ private void reloadTable(final String databaseName, final String schemaName, final String tableName, final Map<String, DataSource> dataSourceMap) throws SQLException {
ShardingSphereDatabase database = metaDataContexts.get().getMetaData().getDatabase(databaseName);
GenericSchemaBuilderMaterial material = new GenericSchemaBuilderMaterial(database.getProtocolType(),
database.getResourceMetaData().getStorageTypes(), dataSourceMap, database.getRuleMetaData().getRules(), metaDataContexts.get().getMetaData().getProps(), schemaName);
@@ -591,7 +568,6 @@ public final class ContextManager implements AutoCloseable {
dropTable(databaseName, schemaName, tableName);
}
metaDataContexts.get().getPersistService().getDatabaseMetaDataService().compareAndPersist(database.getName(), schemaName, database.getSchema(schemaName));
- alterMetaDataHeldRule(metaDataContexts.get().getMetaData().getDatabase(databaseName));
}
/**
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/DatabaseVersionChangedEvent.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/DatabaseVersionChangedEvent.java
deleted file mode 100644
index b93ce7c22fa..00000000000
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/DatabaseVersionChangedEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
-
-/**
- * Database version changed event.
- */
-@RequiredArgsConstructor
-@Getter
-public final class DatabaseVersionChangedEvent implements GovernanceEvent {
-
- private final String databaseName;
-
- private final String activeVersion;
-}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
index d4505b2d558..25e6e806522 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -37,7 +37,6 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.confi
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetaDataChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.DatabaseVersionChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
@@ -142,9 +141,6 @@ public final class MetaDataChangedWatcher implements GovernanceWatcher<Governanc
if (!databaseName.isPresent() || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- if (event.getType() == Type.UPDATED && event.getKey().equals(DatabaseMetaDataNode.getActiveVersionPath(databaseName.get()))) {
- return Optional.of(new DatabaseVersionChangedEvent(databaseName.get(), event.getValue()));
- }
Optional<String> databaseVersion = DatabaseMetaDataNode.getVersionByDataSourcesPath(event.getKey());
if (databaseVersion.isPresent() && event.getType() != Type.DELETED) {
return Optional.of(createDataSourceChangedEvent(databaseName.get(), databaseVersion.get(), event));
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
index d657ba02769..a4f4bf7d554 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
@@ -18,8 +18,6 @@
package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import com.google.common.eventbus.Subscribe;
-import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.datasource.state.DataSourceState;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDatabase;
@@ -30,7 +28,6 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.confi
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.props.PropertiesChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.DatabaseVersionChangedEvent;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.event.storage.StorageNodeDataSource;
import org.apache.shardingsphere.mode.event.storage.StorageNodeDataSourceChangedEvent;
@@ -97,19 +94,6 @@ public final class ConfigurationChangedSubscriber {
disableDataSources();
}
- /**
- * Renew with new database version.
- *
- * @param event database version changed event
- */
- @Subscribe
- public synchronized void renew(final DatabaseVersionChangedEvent event) {
- Map<String, DataSourceProperties> dataSourcePropertiesMap = persistService.getDataSourceService().load(event.getDatabaseName(), event.getActiveVersion());
- Collection<RuleConfiguration> ruleConfigs = persistService.getDatabaseRulePersistService().load(event.getDatabaseName(), event.getActiveVersion());
- contextManager.alterDataSourceAndRuleConfiguration(event.getDatabaseName(), dataSourcePropertiesMap, ruleConfigs);
- disableDataSources();
- }
-
/**
* Renew properties.
*
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
index d79e9102d75..2d5c73f3473 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
@@ -45,7 +45,6 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.confi
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.props.PropertiesChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.DatabaseVersionChangedEvent;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -76,7 +75,6 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -173,19 +171,6 @@ class ConfigurationChangedSubscriberTest {
return result;
}
- @Test
- void assertRenewDatabaseVersionChangedEvent() {
- when(persistService.getDataSourceService().load("db", "1")).thenReturn(getVersionChangedDataSourcePropertiesMap());
- when(persistService.getDatabaseRulePersistService().load("db", "1")).thenReturn(Collections.emptyList());
- Map<String, DataSource> dataSourceMap = initContextManager();
- subscriber.renew(new DatabaseVersionChangedEvent("db", "1"));
- assertThat(contextManager.getDataSourceMap("db").get("ds_0"), is(dataSourceMap.get("ds_0")));
- assertNotNull(contextManager.getDataSourceMap("db").get("ds_1"));
- assertThat(DataSourcePropertiesCreator.create(getChangedDataSource()), is(DataSourcePropertiesCreator.create(contextManager.getDataSourceMap("db").get("ds_1"))));
- assertNotNull(contextManager.getDataSourceMap("db").get("primary_ds"));
- assertThat(DataSourcePropertiesCreator.create(new MockedDataSource()), is(DataSourcePropertiesCreator.create(contextManager.getDataSourceMap("db").get("primary_ds"))));
- }
-
@Test
void assertRenewProperties() {
subscriber.renew(new PropertiesChangedEvent(PropertiesBuilder.build(new Property(ConfigurationPropertyKey.SQL_SHOW.getKey(), Boolean.TRUE.toString()))));