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 18f1a14e7b5 Rename VersionNodePath (#34579)
18f1a14e7b5 is described below
commit 18f1a14e7b590b96963dbc6ff39864059e4a26af
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 6 22:34:27 2025 +0800
Rename VersionNodePath (#34579)
---
.../metadata/persist/version/MetaDataVersionPersistService.java | 6 +++---
.../{MetaDataVersionNodePath.java => VersionNodePath.java} | 8 ++++----
...{MetaDataVersionNodePathTest.java => VersionNodePathTest.java} | 8 ++++----
.../mode/manager/standalone/changed/RuleItemChangedBuilder.java | 4 ++--
.../changed/executor/type/RuleItemAlteredBuildExecutor.java | 4 ++--
.../changed/executor/type/RuleItemDroppedBuildExecutor.java | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
index 44dabe630c8..414a7e6e73b 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
-import
org.apache.shardingsphere.mode.node.path.version.MetaDataVersionNodePath;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
@@ -48,8 +48,8 @@ public final class MetaDataVersionPersistService {
if
(each.getNextActiveVersion().equals(each.getCurrentActiveVersion())) {
continue;
}
- repository.persist(new
MetaDataVersionNodePath(each.getPath()).getActiveVersionPath(),
String.valueOf(each.getNextActiveVersion()));
- MetaDataVersionNodePath versionNodePath = new
MetaDataVersionNodePath(each.getPath());
+ repository.persist(new
VersionNodePath(each.getPath()).getActiveVersionPath(),
String.valueOf(each.getNextActiveVersion()));
+ VersionNodePath versionNodePath = new
VersionNodePath(each.getPath());
getVersions(versionNodePath.getVersionsPath()).stream()
.filter(version -> version <
each.getNextActiveVersion()).forEach(version ->
repository.delete(versionNodePath.getVersionPath(version)));
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/MetaDataVersionNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePath.java
similarity index 91%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/MetaDataVersionNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePath.java
index d1cd6ff5196..5f65a48828e 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/MetaDataVersionNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePath.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Meta data version node path.
+ * Version node path.
*/
@RequiredArgsConstructor
@Getter
-public final class MetaDataVersionNodePath {
+public final class VersionNodePath {
private static final String ACTIVE_VERSION = "active_version";
@@ -36,7 +36,7 @@ public final class MetaDataVersionNodePath {
/**
* Get active version path.
*
- * @return path of active version node
+ * @return active version path
*/
public String getActiveVersionPath() {
return String.join("/", path, ACTIVE_VERSION);
@@ -45,7 +45,7 @@ public final class MetaDataVersionNodePath {
/**
* Get versions path.
*
- * @return path of versions
+ * @return versions path
*/
public String getVersionsPath() {
return String.join("/", path, VERSIONS);
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/MetaDataVersionNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
similarity index 77%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/MetaDataVersionNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
index 6ebfd984c9e..4f94288fcce 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/MetaDataVersionNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
@@ -22,20 +22,20 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class MetaDataVersionNodePathTest {
+class VersionNodePathTest {
@Test
void assertGetActiveVersionPath() {
- assertThat(new MetaDataVersionNodePath("foo").getActiveVersionPath(),
is("foo/active_version"));
+ assertThat(new VersionNodePath("foo").getActiveVersionPath(),
is("foo/active_version"));
}
@Test
void assertGetVersionsPath() {
- assertThat(new MetaDataVersionNodePath("foo").getVersionsPath(),
is("foo/versions"));
+ assertThat(new VersionNodePath("foo").getVersionsPath(),
is("foo/versions"));
}
@Test
void assertGetVersionPath() {
- assertThat(new MetaDataVersionNodePath("foo").getVersionPath(0),
is("foo/versions/0"));
+ assertThat(new VersionNodePath("foo").getVersionPath(0),
is("foo/versions/0"));
}
}
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/RuleItemChangedBuilder.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/RuleItemChangedBuilder.java
index 7ca9d8e3a13..8480bfc7541 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/RuleItemChangedBuilder.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/RuleItemChangedBuilder.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.manager.standalone.changed;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import
org.apache.shardingsphere.mode.manager.standalone.changed.executor.RuleItemChangedBuildExecutor;
-import
org.apache.shardingsphere.mode.node.path.version.MetaDataVersionNodePath;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.node.spi.RuleNodePathProvider;
import org.apache.shardingsphere.mode.spi.rule.item.RuleChangedItem;
@@ -42,7 +42,7 @@ public final class RuleItemChangedBuilder {
*/
public <T extends RuleChangedItem> Optional<T> build(final String
databaseName, final MetaDataVersion metaDataVersion, final
RuleItemChangedBuildExecutor<T> executor) {
for (RuleNodePathProvider each :
ShardingSphereServiceLoader.getServiceInstances(RuleNodePathProvider.class)) {
- if (!each.getRuleNodePath().getRoot().isValidatedPath(new
MetaDataVersionNodePath(metaDataVersion.getPath()).getActiveVersionPath())) {
+ if (!each.getRuleNodePath().getRoot().isValidatedPath(new
VersionNodePath(metaDataVersion.getPath()).getActiveVersionPath())) {
continue;
}
Optional<T> result = executor.build(each.getRuleNodePath(),
databaseName, metaDataVersion);
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemAlteredBuildExecutor.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemAlteredBuildExecutor.java
index 4c060fa2bd2..eae8e56db86 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemAlteredBuildExecutor.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemAlteredBuildExecutor.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.mode.manager.standalone.changed.executor.RuleIt
import org.apache.shardingsphere.mode.node.path.config.rule.RuleNodePath;
import
org.apache.shardingsphere.mode.node.path.config.rule.item.NamedRuleItemNodePath;
import
org.apache.shardingsphere.mode.node.path.config.rule.item.UniqueRuleItemNodePath;
-import
org.apache.shardingsphere.mode.node.path.version.MetaDataVersionNodePath;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterNamedRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterUniqueRuleItem;
@@ -37,7 +37,7 @@ public final class RuleItemAlteredBuildExecutor implements
RuleItemChangedBuildE
@Override
public Optional<AlterRuleItem> build(final RuleNodePath ruleNodePath,
final String databaseName, final MetaDataVersion metaDataVersion) {
- String activeVersionPath = new
MetaDataVersionNodePath(metaDataVersion.getPath()).getActiveVersionPath();
+ String activeVersionPath = new
VersionNodePath(metaDataVersion.getPath()).getActiveVersionPath();
for (Entry<String, NamedRuleItemNodePath> entry :
ruleNodePath.getNamedItems().entrySet()) {
Optional<String> itemName =
entry.getValue().getNameByActiveVersion(activeVersionPath);
if (itemName.isPresent()) {
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemDroppedBuildExecutor.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemDroppedBuildExecutor.java
index 767a35e42be..39a323ba038 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemDroppedBuildExecutor.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/changed/executor/type/RuleItemDroppedBuildExecutor.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.mode.manager.standalone.changed.executor.RuleIt
import org.apache.shardingsphere.mode.node.path.config.rule.RuleNodePath;
import
org.apache.shardingsphere.mode.node.path.config.rule.item.NamedRuleItemNodePath;
import
org.apache.shardingsphere.mode.node.path.config.rule.item.UniqueRuleItemNodePath;
-import
org.apache.shardingsphere.mode.node.path.version.MetaDataVersionNodePath;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropNamedRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropUniqueRuleItem;
@@ -37,7 +37,7 @@ public final class RuleItemDroppedBuildExecutor implements
RuleItemChangedBuildE
@Override
public Optional<DropRuleItem> build(final RuleNodePath ruleNodePath, final
String databaseName, final MetaDataVersion metaDataVersion) {
- String activeVersionPath = new
MetaDataVersionNodePath(metaDataVersion.getPath()).getActiveVersionPath();
+ String activeVersionPath = new
VersionNodePath(metaDataVersion.getPath()).getActiveVersionPath();
for (Entry<String, NamedRuleItemNodePath> entry :
ruleNodePath.getNamedItems().entrySet()) {
Optional<String> itemName =
entry.getValue().getNameByItemPath(activeVersionPath);
if (itemName.isPresent()) {
