This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 9c59c381731 Rename DatabaseRuleItemManager (#34548)
9c59c381731 is described below
commit 9c59c3817318ec0608ac15e31ae769ed04448cd0
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Feb 1 14:38:19 2025 +0800
Rename DatabaseRuleItemManager (#34548)
---
.../metadata/manager/MetaDataContextManager.java | 6 ++---
...emManager.java => DatabaseRuleItemManager.java} | 18 +++++++-------
.../rule/type/NamedRuleItemChangedHandler.java | 4 ++--
.../rule/type/UniqueRuleItemChangedHandler.java | 4 ++--
.../rule/RuleConfigurationChangedHandlerTest.java | 28 +++++++++++-----------
.../StandaloneMetaDataManagerPersistService.java | 4 ++--
...tandaloneMetaDataManagerPersistServiceTest.java | 4 ++--
7 files changed, 34 insertions(+), 34 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
index 44d6872301a..84638d4b9c9 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.mode.metadata.manager.database.DatabaseMetaData
import
org.apache.shardingsphere.mode.metadata.manager.rule.DatabaseRuleConfigurationManager;
import
org.apache.shardingsphere.mode.metadata.manager.rule.GlobalConfigurationManager;
import
org.apache.shardingsphere.mode.metadata.manager.resource.ResourceSwitchManager;
-import org.apache.shardingsphere.mode.metadata.manager.rule.RuleItemManager;
+import
org.apache.shardingsphere.mode.metadata.manager.rule.DatabaseRuleItemManager;
import
org.apache.shardingsphere.mode.metadata.manager.statistics.StatisticsManager;
import
org.apache.shardingsphere.mode.metadata.manager.resource.StorageUnitManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
@@ -48,7 +48,7 @@ public class MetaDataContextManager {
private final DatabaseMetaDataManager databaseMetaDataManager;
- private final RuleItemManager ruleItemManager;
+ private final DatabaseRuleItemManager databaseRuleItemManager;
private final ResourceSwitchManager resourceSwitchManager;
@@ -67,7 +67,7 @@ public class MetaDataContextManager {
storageUnitManager = new StorageUnitManager(metaDataContexts,
computeNodeInstanceContext, resourceSwitchManager, metaDataPersistFacade);
databaseRuleConfigurationManager = new
DatabaseRuleConfigurationManager(metaDataContexts, computeNodeInstanceContext,
metaDataPersistFacade);
databaseMetaDataManager = new
DatabaseMetaDataManager(metaDataContexts, metaDataPersistFacade);
- ruleItemManager = new RuleItemManager(metaDataContexts,
databaseRuleConfigurationManager, metaDataPersistFacade);
+ databaseRuleItemManager = new
DatabaseRuleItemManager(metaDataContexts, databaseRuleConfigurationManager,
metaDataPersistFacade);
globalConfigurationManager = new
GlobalConfigurationManager(metaDataContexts, metaDataPersistFacade);
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/RuleItemManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
similarity index 86%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/RuleItemManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
index b0b357b399f..b0e5c1f0e2b 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/RuleItemManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
@@ -30,25 +30,25 @@ import
org.apache.shardingsphere.mode.spi.rule.item.drop.DropRuleItem;
import java.sql.SQLException;
/**
- * Rule item manager.
+ * Database rule item manager.
*/
@RequiredArgsConstructor
-public final class RuleItemManager {
+public final class DatabaseRuleItemManager {
private final MetaDataContexts metaDataContexts;
- private final DatabaseRuleConfigurationManager ruleConfigManager;
+ private final DatabaseRuleConfigurationManager databaseRuleConfigManager;
private final MetaDataPersistFacade metaDataPersistFacade;
/**
- * Alter with rule item.
+ * Alter rule item.
*
* @param alterRuleItem alter rule item
* @throws SQLException SQL Exception
*/
@SuppressWarnings({"rawtypes", "unchecked"})
- public void alterRuleItem(final AlterRuleItem alterRuleItem) throws
SQLException {
+ public void alter(final AlterRuleItem alterRuleItem) throws SQLException {
Preconditions.checkArgument(alterRuleItem.getActiveVersion().equals(metaDataPersistFacade.getRepository().query(alterRuleItem.getActiveVersionKey())),
"Invalid active version: %s of key: %s",
alterRuleItem.getActiveVersion(), alterRuleItem.getActiveVersionKey());
RuleItemConfigurationChangedProcessor processor =
TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class,
alterRuleItem.getType());
@@ -57,25 +57,25 @@ public final class RuleItemManager {
RuleConfiguration currentRuleConfig =
processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
synchronized (this) {
processor.changeRuleItemConfiguration(alterRuleItem,
currentRuleConfig, processor.swapRuleItemConfiguration(alterRuleItem,
yamlContent));
- ruleConfigManager.alterRuleConfiguration(databaseName,
currentRuleConfig);
+ databaseRuleConfigManager.alterRuleConfiguration(databaseName,
currentRuleConfig);
}
}
/**
- * Drop with rule item.
+ * Drop rule item.
*
* @param dropRuleItem drop rule item
* @throws SQLException SQL Exception
*/
@SuppressWarnings({"rawtypes", "unchecked"})
- public void dropRuleItem(final DropRuleItem dropRuleItem) throws
SQLException {
+ public void drop(final DropRuleItem dropRuleItem) throws SQLException {
String databaseName = dropRuleItem.getDatabaseName();
Preconditions.checkState(metaDataContexts.getMetaData().containsDatabase(databaseName),
"No database '%s' exists.", databaseName);
RuleItemConfigurationChangedProcessor processor =
TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class,
dropRuleItem.getType());
RuleConfiguration currentRuleConfig =
processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
synchronized (this) {
processor.dropRuleItemConfiguration(dropRuleItem,
currentRuleConfig);
- ruleConfigManager.dropRuleConfiguration(databaseName,
currentRuleConfig);
+ databaseRuleConfigManager.dropRuleConfiguration(databaseName,
currentRuleConfig);
}
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/NamedRuleItemChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/NamedRuleItemChangedHandler.java
index 2aaefbaa618..053c1612e26 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/NamedRuleItemChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/NamedRuleItemChangedHandler.java
@@ -48,9 +48,9 @@ public final class NamedRuleItemChangedHandler {
public void handle(final RuleNodePath ruleNodePath, final String
databaseName, final String itemName, final String path, final DataChangedEvent
event) throws SQLException {
String type = ruleNodePath.getRoot().getRuleType() + "." + path;
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().alterRuleItem(new
AlterNamedRuleItem(databaseName, itemName, event.getKey(), event.getValue(),
type));
+
contextManager.getMetaDataContextManager().getDatabaseRuleItemManager().alter(new
AlterNamedRuleItem(databaseName, itemName, event.getKey(), event.getValue(),
type));
} else if (Type.DELETED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().dropRuleItem(new
DropNamedRuleItem(databaseName, itemName, type));
+
contextManager.getMetaDataContextManager().getDatabaseRuleItemManager().drop(new
DropNamedRuleItem(databaseName, itemName, type));
}
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/UniqueRuleItemChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/UniqueRuleItemChangedHandler.java
index dc88ecae3f5..a1ae4b4645a 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/UniqueRuleItemChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/UniqueRuleItemChangedHandler.java
@@ -47,9 +47,9 @@ public final class UniqueRuleItemChangedHandler {
public void handle(final RuleNodePath ruleNodePath, final String
databaseName, final String path, final DataChangedEvent event) throws
SQLException {
String type = ruleNodePath.getRoot().getRuleType() + "." + path;
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().alterRuleItem(new
AlterUniqueRuleItem(databaseName, event.getKey(), event.getValue(), type));
+
contextManager.getMetaDataContextManager().getDatabaseRuleItemManager().alter(new
AlterUniqueRuleItem(databaseName, event.getKey(), event.getValue(), type));
} else if (Type.DELETED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().dropRuleItem(new
DropUniqueRuleItem(databaseName, type));
+
contextManager.getMetaDataContextManager().getDatabaseRuleItemManager().drop(new
DropUniqueRuleItem(databaseName, type));
}
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
index eb0237144cd..c89e54050d7 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
@@ -65,64 +65,64 @@ class RuleConfigurationChangedHandlerTest {
@Test
void assertHandleWithInvalidPath() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/invalid/rules/fixture", "foo", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).alterRuleItem(any());
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).dropRuleItem(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithEmptyValue() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/versions/0", "", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).alterRuleItem(any());
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).dropRuleItem(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithPathNotFound() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/versions/0", "foo",
Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).alterRuleItem(any());
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).dropRuleItem(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithIgnoreType() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx/active_version",
"foo", Type.IGNORED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).alterRuleItem(any());
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager(),
times(0)).dropRuleItem(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).alter(any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager(),
times(0)).drop(any());
}
@Test
void assertHandleWithNamedRuleItemAdded() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx/active_version",
"foo", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager()).alterRuleItem(any(AlterNamedRuleItem.class));
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterNamedRuleItem.class));
}
@Test
void assertHandleWithNamedRuleItemAltered() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx/active_version",
"foo", Type.UPDATED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager()).alterRuleItem(any(AlterNamedRuleItem.class));
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterNamedRuleItem.class));
}
@Test
void assertHandleWithNamedRuleItemDropped() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/named/xxx", "foo",
Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager()).dropRuleItem(any(DropNamedRuleItem.class));
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).drop(any(DropNamedRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemAdded() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/unique/active_version",
"foo", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager()).alterRuleItem(any(AlterUniqueRuleItem.class));
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterUniqueRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemAltered() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/unique/active_version",
"foo", Type.UPDATED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager()).alterRuleItem(any(AlterUniqueRuleItem.class));
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).alter(any(AlterUniqueRuleItem.class));
}
@Test
void assertHandleWithUniqueRuleItemDropped() throws SQLException {
handler.handle("foo_db", new
DataChangedEvent("/metadata/fixture/rules/fixture/unique/active_version",
"foo", Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getRuleItemManager()).dropRuleItem(any(DropUniqueRuleItem.class));
+
verify(contextManager.getMetaDataContextManager().getDatabaseRuleItemManager()).drop(any(DropUniqueRuleItem.class));
}
}
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 9dd08ae473b..a4e1a77c046 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -215,7 +215,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
// TODO double check here, when ruleItemEvent not existed or not
AlterRuleItemEvent @haoran
Optional<RuleChangedItem> ruleItemChanged =
buildRuleChangedItem(databaseName, each, Type.UPDATED);
if (ruleItemChanged.isPresent() && ruleItemChanged.get()
instanceof AlterRuleItem) {
-
metaDataContextManager.getRuleItemManager().alterRuleItem((AlterRuleItem)
ruleItemChanged.get());
+
metaDataContextManager.getDatabaseRuleItemManager().alter((AlterRuleItem)
ruleItemChanged.get());
}
}
clearServiceCache();
@@ -235,7 +235,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
Optional<RuleChangedItem> ruleItemChanged =
buildRuleChangedItem(databaseName, metaDataVersion, Type.DELETED);
// TODO double check here, when ruleItemEvent not existed or not
AlterRuleItemEvent @haoran
if (ruleItemChanged.isPresent() && ruleItemChanged.get()
instanceof DropRuleItem) {
-
metaDataContextManager.getRuleItemManager().dropRuleItem((DropRuleItem)
ruleItemChanged.get());
+
metaDataContextManager.getDatabaseRuleItemManager().drop((DropRuleItem)
ruleItemChanged.get());
}
}
clearServiceCache();
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index 67cf7f64b28..c7c5d6cbf35 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -178,7 +178,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
setRuleConfigurationEventBuilder(ruleItemChangedBuilder);
metaDataManagerPersistService.alterRuleConfiguration("foo_db",
ruleConfig);
verify(metaDataPersistFacade.getMetaDataVersionService()).switchActiveVersion(metaDataVersion);
-
verify(metaDataContextManager.getRuleItemManager()).alterRuleItem(any(AlterRuleItem.class));
+
verify(metaDataContextManager.getDatabaseRuleItemManager()).alter(any(AlterRuleItem.class));
}
@Test
@@ -197,7 +197,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
when(ruleItemChangedBuilder.build(eq("foo_db"), any(), any(),
any())).thenReturn(Optional.of(dropRuleItem));
setRuleConfigurationEventBuilder(ruleItemChangedBuilder);
metaDataManagerPersistService.removeRuleConfigurationItem("foo_db",
ruleConfig);
-
verify(metaDataContextManager.getRuleItemManager()).dropRuleItem(any(DropRuleItem.class));
+
verify(metaDataContextManager.getDatabaseRuleItemManager()).drop(any(DropRuleItem.class));
}
@Test
