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 9ff2362a3a2 Refactor TableMetaDataNodePathGenerator and
ViewMetaDataNodePathGenerator (#34682)
9ff2362a3a2 is described below
commit 9ff2362a3a29736acab1eaa23603f13cf2691d81
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Feb 15 20:02:10 2025 +0800
Refactor TableMetaDataNodePathGenerator and ViewMetaDataNodePathGenerator
(#34682)
---
.../persist/metadata/service/SchemaMetaDataPersistService.java | 2 +-
.../persist/metadata/service/TableMetaDataPersistService.java | 2 +-
.../metadata/persist/metadata/service/ViewMetaDataPersistService.java | 2 +-
.../node/path/metadata/database/TableMetaDataNodePathGenerator.java | 4 ++--
.../node/path/metadata/database/ViewMetaDataNodePathGenerator.java | 4 ++--
.../path/metadata/database/TableMetaDataNodePathGeneratorTest.java | 4 ++--
.../path/metadata/database/ViewMetaDataNodePathGeneratorTest.java | 4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
index f05825395aa..1b16cd93381 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
@@ -52,7 +52,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName to be added schema name
*/
public void add(final String databaseName, final String schemaName) {
-
repository.persist(TableMetaDataNodePathGenerator.getTableRootPath(databaseName,
schemaName), "");
+
repository.persist(TableMetaDataNodePathGenerator.getRootPath(databaseName,
schemaName), "");
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
index 9d6271d43ea..9c3b2cad449 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
@@ -50,7 +50,7 @@ public final class TableMetaDataPersistService {
* @return loaded tables
*/
public Collection<ShardingSphereTable> load(final String databaseName,
final String schemaName) {
- return
repository.getChildrenKeys(TableMetaDataNodePathGenerator.getTableRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
+ return
repository.getChildrenKeys(TableMetaDataNodePathGenerator.getRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
.collect(Collectors.toList());
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
index fee476c03e7..b36d7789675 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
@@ -50,7 +50,7 @@ public final class ViewMetaDataPersistService {
* @return loaded views
*/
public Collection<ShardingSphereView> load(final String databaseName,
final String schemaName) {
- return
repository.getChildrenKeys(ViewMetaDataNodePathGenerator.getViewRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
+ return
repository.getChildrenKeys(ViewMetaDataNodePathGenerator.getRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
.collect(Collectors.toList());
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGenerator.java
index b0933d3dad2..b827b594517 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGenerator.java
@@ -36,7 +36,7 @@ public final class TableMetaDataNodePathGenerator {
* @param schemaName schema name
* @return table root path
*/
- public static String getTableRootPath(final String databaseName, final
String schemaName) {
+ public static String getRootPath(final String databaseName, final String
schemaName) {
return String.join("/",
SchemaMetaDataNodePathGenerator.getSchemaPath(databaseName, schemaName),
TABLES_NODE);
}
@@ -49,7 +49,7 @@ public final class TableMetaDataNodePathGenerator {
* @return table path
*/
public static String getTablePath(final String databaseName, final String
schemaName, final String tableName) {
- return String.join("/", getTableRootPath(databaseName, schemaName),
tableName);
+ return String.join("/", getRootPath(databaseName, schemaName),
tableName);
}
/**
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGenerator.java
index f621bd57413..56c1c7fe82e 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGenerator.java
@@ -36,7 +36,7 @@ public final class ViewMetaDataNodePathGenerator {
* @param schemaName schema name
* @return view root path
*/
- public static String getViewRootPath(final String databaseName, final
String schemaName) {
+ public static String getRootPath(final String databaseName, final String
schemaName) {
return String.join("/",
SchemaMetaDataNodePathGenerator.getSchemaPath(databaseName, schemaName),
VIEWS_NODE);
}
@@ -49,7 +49,7 @@ public final class ViewMetaDataNodePathGenerator {
* @return view path
*/
public static String getViewPath(final String databaseName, final String
schemaName, final String viewName) {
- return String.join("/", getViewRootPath(databaseName, schemaName),
viewName);
+ return String.join("/", getRootPath(databaseName, schemaName),
viewName);
}
/**
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGeneratorTest.java
index 9e94a643d37..5e3af1e4074 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGeneratorTest.java
@@ -25,8 +25,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
class TableMetaDataNodePathGeneratorTest {
@Test
- void assertGetTableRootPath() {
- assertThat(TableMetaDataNodePathGenerator.getTableRootPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/tables"));
+ void assertGetRootPath() {
+ assertThat(TableMetaDataNodePathGenerator.getRootPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/tables"));
}
@Test
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGeneratorTest.java
index 962da9ca32c..06dcf33e7e9 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGeneratorTest.java
@@ -25,8 +25,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
class ViewMetaDataNodePathGeneratorTest {
@Test
- void assertGetViewRootPath() {
- assertThat(ViewMetaDataNodePathGenerator.getViewRootPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/views"));
+ void assertGetRootPath() {
+ assertThat(ViewMetaDataNodePathGenerator.getRootPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/views"));
}
@Test
