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 38778dc6dae Rename ruleTypeName to ruleType (#34659)
38778dc6dae is described below
commit 38778dc6dae79fa23d377efca1d4e6e8a1ddb9cd
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 13 16:26:05 2025 +0800
Rename ruleTypeName to ruleType (#34659)
---
.../config/database/DatabaseRulePersistService.java | 16 ++++++++--------
.../config/global/GlobalRulePersistService.java | 6 +++---
.../persist/service/MetaDataManagerPersistService.java | 4 ++--
.../node/path/config/global/GlobalRuleNodePath.java | 18 +++++++++---------
.../path/metadata/DatabaseRuleMetaDataNodePath.java | 18 +++++++++---------
.../node/tuple/YamlRepositoryTupleSwapperEngine.java | 6 +++---
.../service/ClusterMetaDataManagerPersistService.java | 4 ++--
.../StandaloneMetaDataManagerPersistService.java | 4 ++--
.../it/yaml/YamlRepositoryTupleSwapperEngineIT.java | 10 ++++------
9 files changed, 42 insertions(+), 44 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index 9ecb051c3f9..7860b9abe7f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -87,12 +87,12 @@ public final class DatabaseRulePersistService {
return result;
}
- private Collection<MetaDataVersion> persistDataNodes(final String
databaseName, final String ruleTypeName, final Collection<RepositoryTuple>
repositoryTuples) {
+ private Collection<MetaDataVersion> persistDataNodes(final String
databaseName, final String ruleType, final Collection<RepositoryTuple>
repositoryTuples) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (RepositoryTuple each : repositoryTuples) {
- VersionNodePathGenerator versionNodePathGenerator =
DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator(databaseName,
ruleTypeName, each.getKey());
+ VersionNodePathGenerator versionNodePathGenerator =
DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator(databaseName,
ruleType, each.getKey());
int nextVersion =
metaDataVersionPersistService.persist(versionNodePathGenerator,
each.getValue());
- result.add(new
MetaDataVersion(DatabaseRuleMetaDataNodePath.getRulePath(databaseName,
ruleTypeName, each.getKey()), Math.max(MetaDataVersion.INIT_VERSION,
nextVersion - 1)));
+ result.add(new
MetaDataVersion(DatabaseRuleMetaDataNodePath.getRulePath(databaseName,
ruleType, each.getKey()), Math.max(MetaDataVersion.INIT_VERSION, nextVersion -
1)));
}
return result;
}
@@ -101,10 +101,10 @@ public final class DatabaseRulePersistService {
* Delete configurations.
*
* @param databaseName database name
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
*/
- public void delete(final String databaseName, final String ruleTypeName) {
-
repository.delete(DatabaseRuleMetaDataNodePath.getRulePath(databaseName,
ruleTypeName));
+ public void delete(final String databaseName, final String ruleType) {
+
repository.delete(DatabaseRuleMetaDataNodePath.getRulePath(databaseName,
ruleType));
}
/**
@@ -127,10 +127,10 @@ public final class DatabaseRulePersistService {
return result;
}
- private Collection<MetaDataVersion> delete(final String databaseName,
final String ruleTypeName, final Collection<RepositoryTuple> repositoryTuples) {
+ private Collection<MetaDataVersion> delete(final String databaseName,
final String ruleType, final Collection<RepositoryTuple> repositoryTuples) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (RepositoryTuple each : repositoryTuples) {
- String toBeDeletedKey =
DatabaseRuleMetaDataNodePath.getRulePath(databaseName, ruleTypeName,
each.getKey());
+ String toBeDeletedKey =
DatabaseRuleMetaDataNodePath.getRulePath(databaseName, ruleType, each.getKey());
repository.delete(toBeDeletedKey);
result.add(new MetaDataVersion(toBeDeletedKey));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
index 6cb80a107e8..c922046c739 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
@@ -63,11 +63,11 @@ public final class GlobalRulePersistService {
/**
* Load global rule configuration.
*
- * @param ruleTypeName rule type name to be loaded
+ * @param ruleType rule type to be loaded
* @return global rule configuration
*/
- public Optional<RuleConfiguration> load(final String ruleTypeName) {
- return
yamlRepositoryTupleSwapperEngine.swapToRuleConfiguration(ruleTypeName,
repositoryTuplePersistService.load(GlobalRuleNodePath.getRulePath(ruleTypeName)));
+ public Optional<RuleConfiguration> load(final String ruleType) {
+ return
yamlRepositoryTupleSwapperEngine.swapToRuleConfiguration(ruleType,
repositoryTuplePersistService.load(GlobalRuleNodePath.getRulePath(ruleType)));
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
index 840c0e0fd97..ad5c4213939 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
@@ -158,9 +158,9 @@ public interface MetaDataManagerPersistService {
* Remove rule configuration.
*
* @param database database
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
*/
- void removeRuleConfiguration(ShardingSphereDatabase database, String
ruleTypeName);
+ void removeRuleConfiguration(ShardingSphereDatabase database, String
ruleType);
/**
* Alter global rule configuration.
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
index e003a626363..dee36692ffe 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
@@ -45,21 +45,21 @@ public final class GlobalRuleNodePath {
/**
* Get global rule path.
*
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
* @return global rule path
*/
- public static String getRulePath(final String ruleTypeName) {
- return String.join("/", getRootPath(), ruleTypeName);
+ public static String getRulePath(final String ruleType) {
+ return String.join("/", getRootPath(), ruleType);
}
/**
* Get global rule version node path generator.
*
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
* @return global rule version node path generator
*/
- public static VersionNodePathGenerator getVersionNodePathGenerator(final
String ruleTypeName) {
- return new VersionNodePathGenerator(getRulePath(ruleTypeName));
+ public static VersionNodePathGenerator getVersionNodePathGenerator(final
String ruleType) {
+ return new VersionNodePathGenerator(getRulePath(ruleType));
}
/**
@@ -74,10 +74,10 @@ public final class GlobalRuleNodePath {
/**
* Get rule version node path parser.
*
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
* @return rule version node path parser
*/
- public static VersionNodePathParser getRuleVersionNodePathParser(final
String ruleTypeName) {
- return new VersionNodePathParser(ruleTypeName);
+ public static VersionNodePathParser getRuleVersionNodePathParser(final
String ruleType) {
+ return new VersionNodePathParser(ruleType);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
index 1999061f9c4..c2d1edb3662 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
@@ -45,34 +45,34 @@ public final class DatabaseRuleMetaDataNodePath {
* Get database rule path.
*
* @param databaseName database name
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
* @return database rule path
*/
- public static String getRulePath(final String databaseName, final String
ruleTypeName) {
- return String.join("/", getRootPath(databaseName), ruleTypeName);
+ public static String getRulePath(final String databaseName, final String
ruleType) {
+ return String.join("/", getRootPath(databaseName), ruleType);
}
/**
* Get database rule path.
*
* @param databaseName database name
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
* @param ruleItemName rule item name
* @return database rule path
*/
- public static String getRulePath(final String databaseName, final String
ruleTypeName, final String ruleItemName) {
- return String.join("/", getRulePath(databaseName, ruleTypeName),
ruleItemName);
+ public static String getRulePath(final String databaseName, final String
ruleType, final String ruleItemName) {
+ return String.join("/", getRulePath(databaseName, ruleType),
ruleItemName);
}
/**
* Get database rule version node path generator.
*
* @param databaseName database name
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
* @param ruleItemName rule item name
* @return database rule version node path generator
*/
- public static VersionNodePathGenerator getVersionNodePathGenerator(final
String databaseName, final String ruleTypeName, final String ruleItemName) {
- return new VersionNodePathGenerator(getRulePath(databaseName,
ruleTypeName, ruleItemName));
+ public static VersionNodePathGenerator getVersionNodePathGenerator(final
String databaseName, final String ruleType, final String ruleItemName) {
+ return new VersionNodePathGenerator(getRulePath(databaseName,
ruleType, ruleItemName));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngine.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngine.java
index 61d50abc2d9..bb658a162f1 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngine.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/tuple/YamlRepositoryTupleSwapperEngine.java
@@ -256,19 +256,19 @@ public final class YamlRepositoryTupleSwapperEngine {
/**
* Swap to rule configuration.
*
- * @param ruleTypeName rule type name
+ * @param ruleType rule type
* @param repositoryTuples repository tuples
* @return global rule configuration
*/
@SuppressWarnings("rawtypes")
- public Optional<RuleConfiguration> swapToRuleConfiguration(final String
ruleTypeName, final Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<RuleConfiguration> swapToRuleConfiguration(final String
ruleType, final Collection<RepositoryTuple> repositoryTuples) {
if (repositoryTuples.isEmpty()) {
return Optional.empty();
}
YamlRuleConfigurationSwapperEngine yamlSwapperEngine = new
YamlRuleConfigurationSwapperEngine();
for (YamlRuleConfigurationSwapper each :
ShardingSphereServiceLoader.getServiceInstances(YamlRuleConfigurationSwapper.class))
{
Class<? extends YamlRuleConfiguration> yamlRuleConfigClass =
getYamlRuleConfigurationClass(each);
- if
(ruleTypeName.equals(Objects.requireNonNull(yamlRuleConfigClass.getAnnotation(RepositoryTupleEntity.class)).value()))
{
+ if
(ruleType.equals(Objects.requireNonNull(yamlRuleConfigClass.getAnnotation(RepositoryTupleEntity.class)).value()))
{
Optional<YamlRuleConfiguration> yamlRuleConfig =
swapToYamlRuleConfiguration(repositoryTuples, yamlRuleConfigClass);
return
yamlRuleConfig.map(yamlSwapperEngine::swapToRuleConfiguration);
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 03e6b11481b..7d92f754e8d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -198,9 +198,9 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
}
@Override
- public void removeRuleConfiguration(final ShardingSphereDatabase database,
final String ruleTypeName) {
+ public void removeRuleConfiguration(final ShardingSphereDatabase database,
final String ruleType) {
MetaDataContexts originalMetaDataContexts = new
MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(),
metaDataContextManager.getMetaDataContexts().getStatistics());
-
metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(),
ruleTypeName);
+
metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(),
ruleType);
afterRuleConfigurationDropped(database.getName(),
originalMetaDataContexts);
}
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 433da4f929f..ee7add1beca 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
@@ -231,8 +231,8 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
}
@Override
- public void removeRuleConfiguration(final ShardingSphereDatabase database,
final String ruleTypeName) {
-
metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(),
ruleTypeName);
+ public void removeRuleConfiguration(final ShardingSphereDatabase database,
final String ruleType) {
+
metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(),
ruleType);
clearServiceCache();
}
diff --git
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRepositoryTupleSwapperEngineIT.java
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRepositoryTupleSwapperEngineIT.java
index 4a386df4407..5cd1e13ad77 100644
---
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRepositoryTupleSwapperEngineIT.java
+++
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRepositoryTupleSwapperEngineIT.java
@@ -94,9 +94,9 @@ public abstract class YamlRepositoryTupleSwapperEngineIT {
private String getActualYamlContent() throws IOException {
YamlRuleConfiguration yamlRuleConfig = loadYamlRuleConfiguration();
- String ruleTypeName =
Objects.requireNonNull(yamlRuleConfig.getClass().getAnnotation(RepositoryTupleEntity.class)).value();
+ String ruleType =
Objects.requireNonNull(yamlRuleConfig.getClass().getAnnotation(RepositoryTupleEntity.class)).value();
Collection<RepositoryTuple> repositoryTuples =
engine.swapToRepositoryTuples(yamlRuleConfig).stream()
- .map(each -> new
RepositoryTuple(getRepositoryTupleKey(yamlRuleConfig instanceof
YamlGlobalRuleConfiguration, ruleTypeName, each),
each.getValue())).collect(Collectors.toList());
+ .map(each -> new
RepositoryTuple(getRepositoryTupleKey(yamlRuleConfig instanceof
YamlGlobalRuleConfiguration, ruleType, each),
each.getValue())).collect(Collectors.toList());
Optional<YamlRuleConfiguration> actualYamlRuleConfig =
engine.swapToYamlRuleConfiguration(repositoryTuples, yamlRuleConfig.getClass());
assertTrue(actualYamlRuleConfig.isPresent());
YamlRootConfiguration yamlRootConfig = new YamlRootConfiguration();
@@ -104,10 +104,8 @@ public abstract class YamlRepositoryTupleSwapperEngineIT {
return YamlEngine.marshal(yamlRootConfig);
}
- private String getRepositoryTupleKey(final boolean isGlobalRule, final
String ruleTypeName, final RepositoryTuple tuple) {
- return isGlobalRule
- ? String.format("/metadata/rules/%s/versions/0", ruleTypeName)
- : String.format("/metadata/foo_db/rules/%s/%s/versions/0",
ruleTypeName, tuple.getKey());
+ private String getRepositoryTupleKey(final boolean isGlobalRule, final
String ruleType, final RepositoryTuple tuple) {
+ return isGlobalRule ? String.format("/metadata/rules/%s/versions/0",
ruleType) : String.format("/metadata/foo_db/rules/%s/%s/versions/0", ruleType,
tuple.getKey());
}
private String getExpectedYamlContent() throws IOException {
