Move DatabaseMetaDataNodePath.getVersionPath to VersionNodePathGenera…

…tor (#34635)
apache · Feb 12, 2025 · d8dd89c · d8dd89c
1 parent 02e5e17
commit d8dd89c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 23 deletions.
diff --git a/...rg/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java b/...rg/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
@@ -20,7 +20,6 @@
 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.VersionNodePathGenerator;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
@@ -82,11 +81,11 @@ private List<Integer> getVersions(final String path) {
     /**
      * Load content.
      *
-     * @param path content path
-     * @param version content version
+     * @param activeVersionPath active version path
+     * @param activeVersion active version
      * @return loaded content
      */
-    public String loadContent(final String path, final int version) {
-        return repository.query(DatabaseMetaDataNodePath.getVersionPath(path, version));
+    public String loadContent(final String activeVersionPath, final int activeVersion) {
+        return repository.query(VersionNodePathGenerator.getVersionPath(activeVersionPath, activeVersion));
     }
 }
diff --git a/...main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePath.java b/...main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePath.java
@@ -35,8 +35,6 @@ public final class DatabaseMetaDataNodePath {
 
     private static final String SCHEMAS_NODE = "schemas";
 
-    private static final String VERSIONS_NODE = "versions";
-
     private static final String ACTIVE_VERSION_NODE = "active_version";
 
     /**
@@ -79,17 +77,6 @@ public static String getSchemaPath(final String databaseName, final String schem
         return String.join("/", getSchemaRootPath(databaseName), schemaName);
     }
 
-    /**
-     * Get version path.
-     *
-     * @param rulePath rule path
-     * @param activeVersion active version
-     * @return version path
-     */
-    public static String getVersionPath(final String rulePath, final int activeVersion) {
-        return rulePath.replace(ACTIVE_VERSION_NODE, VERSIONS_NODE) + "/" + activeVersion;
-    }
-
     /**
      * Find database name.
      *

diff --git a/.../main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGenerator.java b/.../main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGenerator.java
@@ -58,4 +58,15 @@ public String getVersionsPath() {
     public String getVersionPath(final int version) {
         return String.join("/", getVersionsPath(), String.valueOf(version));
     }
+
+    /**
+     * Get version path.
+     *
+     * @param activeVersionPath active version path
+     * @param activeVersion active version
+     * @return version path
+     */
+    public static String getVersionPath(final String activeVersionPath, final int activeVersion) {
+        return String.join("/", activeVersionPath.replace(ACTIVE_VERSION, VERSIONS), String.valueOf(activeVersion));
+    }
 }
diff --git a/.../java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePathTest.java b/.../java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePathTest.java
@@ -49,11 +49,6 @@ void assertGetSchemaPath() {
         assertThat(DatabaseMetaDataNodePath.getSchemaPath("foo_db", "foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
     }
 
-    @Test
-    void assertGetVersionPath() {
-        assertThat(DatabaseMetaDataNodePath.getVersionPath("foo_rule", 1), is("foo_rule/1"));
-    }
-
     @Test
     void assertFindDatabaseNameWithNotContainsChildPath() {
         Optional<String> actual = DatabaseMetaDataNodePath.findDatabaseName("/metadata/foo_db", false);

diff --git a/...t/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGeneratorTest.java b/...t/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGeneratorTest.java
@@ -38,4 +38,9 @@ void assertGetVersionsPath() {
     void assertGetVersionPath() {
         assertThat(new VersionNodePathGenerator("foo").getVersionPath(0), is("foo/versions/0"));
     }
+
+    @Test
+    void assertGetVersionPathFromActiveVersion() {
+        assertThat(VersionNodePathGenerator.getVersionPath("foo_rule/active_version", 1), is("foo_rule/versions/1"));
+    }
 }