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 f01ef5a500b Rename currentActiveVersion to activeVersion (#34663)
f01ef5a500b is described below
commit f01ef5a500b2e9981ff98d53fa1cb7bdd1b1f0ca
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 13 17:45:16 2025 +0800
Rename currentActiveVersion to activeVersion (#34663)
---
.../mode/metadata/changed/RuleItemChangedBuilder.java | 6 +++---
.../metadata/changed/executor/RuleItemChangedBuildExecutor.java | 4 ++--
.../changed/executor/type/RuleItemAlteredBuildExecutor.java | 6 +++---
.../changed/executor/type/RuleItemDroppedBuildExecutor.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedBuilder.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedBuilder.java
index dd03b73de27..645743c7c17 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedBuilder.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedBuilder.java
@@ -34,17 +34,17 @@ public final class RuleItemChangedBuilder {
*
* @param databaseName database name
* @param path path
- * @param currentActiveVersion current active version
+ * @param activeVersion active version
* @param executor rule item changed build executor
* @param <T> type of rule changed item
* @return built rule item
*/
- public <T extends RuleChangedItem> Optional<T> build(final String
databaseName, final String path, final Integer currentActiveVersion, final
RuleItemChangedBuildExecutor<T> executor) {
+ public <T extends RuleChangedItem> Optional<T> build(final String
databaseName, final String path, final Integer activeVersion, final
RuleItemChangedBuildExecutor<T> executor) {
for (DatabaseRuleNodePathProvider each :
ShardingSphereServiceLoader.getServiceInstances(DatabaseRuleNodePathProvider.class))
{
if
(!each.getDatabaseRuleNodePath().getRoot().isValidatedPath(path)) {
continue;
}
- Optional<T> result =
executor.build(each.getDatabaseRuleNodePath(), databaseName, path,
currentActiveVersion);
+ Optional<T> result =
executor.build(each.getDatabaseRuleNodePath(), databaseName, path,
activeVersion);
if (result.isPresent()) {
return result;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/RuleItemChangedBuildExecutor.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/RuleItemChangedBuildExecutor.java
index f332af53385..fc109a20b5d 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/RuleItemChangedBuildExecutor.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/RuleItemChangedBuildExecutor.java
@@ -35,8 +35,8 @@ public interface RuleItemChangedBuildExecutor<T extends
RuleChangedItem> {
* @param databaseRuleNodePath rule node path
* @param databaseName database name
* @param path path
- * @param currentActiveVersion current active version
+ * @param activeVersion active version
* @return built rule item
*/
- Optional<T> build(DatabaseRuleNodePath databaseRuleNodePath, String
databaseName, String path, Integer currentActiveVersion);
+ Optional<T> build(DatabaseRuleNodePath databaseRuleNodePath, String
databaseName, String path, Integer activeVersion);
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
index 7cd49f2881e..870cd857629 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
@@ -34,16 +34,16 @@ import java.util.Optional;
public final class RuleItemAlteredBuildExecutor implements
RuleItemChangedBuildExecutor<AlterRuleItem> {
@Override
- public Optional<AlterRuleItem> build(final DatabaseRuleNodePath
databaseRuleNodePath, final String databaseName, final String path, final
Integer currentActiveVersion) {
+ public Optional<AlterRuleItem> build(final DatabaseRuleNodePath
databaseRuleNodePath, final String databaseName, final String path, final
Integer activeVersion) {
for (Entry<String, NamedDatabaseRuleItemNodePath> entry :
databaseRuleNodePath.getNamedItems().entrySet()) {
Optional<String> itemName =
entry.getValue().getVersionNodePathParser().findIdentifierByActiveVersionPath(path,
1);
if (itemName.isPresent()) {
- return Optional.of(new AlterNamedRuleItem(databaseName,
itemName.get(), path, currentActiveVersion,
databaseRuleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
+ return Optional.of(new AlterNamedRuleItem(databaseName,
itemName.get(), path, activeVersion,
databaseRuleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
}
}
for (Entry<String, UniqueDatabaseRuleItemNodePath> entry :
databaseRuleNodePath.getUniqueItems().entrySet()) {
if
(entry.getValue().getVersionNodePathParser().isActiveVersionPath(path)) {
- return Optional.of(new AlterUniqueRuleItem(databaseName, path,
currentActiveVersion, databaseRuleNodePath.getRoot().getRuleType() + "." +
entry.getKey()));
+ return Optional.of(new AlterUniqueRuleItem(databaseName, path,
activeVersion, databaseRuleNodePath.getRoot().getRuleType() + "." +
entry.getKey()));
}
}
return Optional.empty();
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
index 2d18b445233..cc70a4c8920 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
@@ -34,7 +34,7 @@ import java.util.Optional;
public final class RuleItemDroppedBuildExecutor implements
RuleItemChangedBuildExecutor<DropRuleItem> {
@Override
- public Optional<DropRuleItem> build(final DatabaseRuleNodePath
databaseRuleNodePath, final String databaseName, final String path, final
Integer currentActiveVersion) {
+ public Optional<DropRuleItem> build(final DatabaseRuleNodePath
databaseRuleNodePath, final String databaseName, final String path, final
Integer activeVersion) {
for (Entry<String, NamedDatabaseRuleItemNodePath> entry :
databaseRuleNodePath.getNamedItems().entrySet()) {
Optional<String> itemName =
entry.getValue().findNameByItemPath(path);
if (itemName.isPresent()) {
