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 cfaf0615a3f Rename DataNode's getVersion (#34674)
cfaf0615a3f is described below
commit cfaf0615a3f4eea00da71e5dc37dc9193b9f1529
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 15 14:48:19 2025 +0800
Rename DataNode's getVersion (#34674)
---
.../database/DataSourceUnitPersistService.java | 6 ++--
.../database/DatabaseRulePersistService.java | 2 +-
.../service/TableMetaDataPersistService.java | 6 ++--
.../service/ViewMetaDataPersistService.java | 6 ++--
.../DataSourceMetaDataNodePathGenerator.java | 4 +--
.../metadata/DataSourceMetaDataNodePathParser.java | 40 +++++++++++-----------
.../DatabaseRuleMetaDataNodePathGenerator.java | 2 +-
.../metadata/TableMetaDataNodePathGenerator.java | 2 +-
.../path/metadata/TableMetaDataNodePathParser.java | 6 ++--
.../metadata/ViewMetaDataNodePathGenerator.java | 2 +-
.../path/metadata/ViewMetaDataNodePathParser.java | 6 ++--
.../DataSourceMetaDataNodePathGeneratorTest.java | 16 ++++-----
.../DatabaseRuleMetaDataNodePathGeneratorTest.java | 8 ++---
.../TableMetaDataNodePathGeneratorTest.java | 8 ++---
.../ViewMetaDataNodePathGeneratorTest.java | 8 ++---
.../database/metadata/MetaDataChangedHandler.java | 12 +++----
.../metadata/type/TableChangedHandler.java | 2 +-
.../database/metadata/type/ViewChangedHandler.java | 2 +-
18 files changed, 69 insertions(+), 69 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
index a6fbcc145ed..5ea3f030fa6 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
@@ -68,8 +68,8 @@ public final class DataSourceUnitPersistService {
*/
@SuppressWarnings("unchecked")
public DataSourcePoolProperties load(final String databaseName, final
String dataSourceName) {
- int activeVersion =
Integer.parseInt(repository.query(DataSourceMetaDataNodePathGenerator.getStorageUnitVersionNodePathGenerator(databaseName,
dataSourceName).getActiveVersionPath()));
- String dataSourceContent =
repository.query(DataSourceMetaDataNodePathGenerator.getStorageUnitVersionNodePathGenerator(databaseName,
dataSourceName).getVersionPath(activeVersion));
+ int activeVersion =
Integer.parseInt(repository.query(DataSourceMetaDataNodePathGenerator.getStorageUnitVersion(databaseName,
dataSourceName).getActiveVersionPath()));
+ String dataSourceContent =
repository.query(DataSourceMetaDataNodePathGenerator.getStorageUnitVersion(databaseName,
dataSourceName).getVersionPath(activeVersion));
return
yamlDataSourceConfigurationSwapper.swapToDataSourcePoolProperties(YamlEngine.unmarshal(dataSourceContent,
Map.class));
}
@@ -81,7 +81,7 @@ public final class DataSourceUnitPersistService {
*/
public void persist(final String databaseName, final Map<String,
DataSourcePoolProperties> dataSourcePropsMap) {
for (Entry<String, DataSourcePoolProperties> entry :
dataSourcePropsMap.entrySet()) {
- VersionNodePathGenerator versionNodePathGenerator =
DataSourceMetaDataNodePathGenerator.getStorageUnitVersionNodePathGenerator(databaseName,
entry.getKey());
+ VersionNodePathGenerator versionNodePathGenerator =
DataSourceMetaDataNodePathGenerator.getStorageUnitVersion(databaseName,
entry.getKey());
metaDataVersionPersistService.persist(versionNodePathGenerator,
YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
}
}
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 bd13c314422..fda03b0fc15 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
@@ -92,7 +92,7 @@ public final class DatabaseRulePersistService {
Collection<MetaDataVersion> result = new LinkedList<>();
for (RepositoryTuple each : repositoryTuples) {
DatabaseRuleItem databaseRuleItem = new
DatabaseRuleItem(each.getKey());
- VersionNodePathGenerator versionNodePathGenerator =
DatabaseRuleMetaDataNodePathGenerator.getVersionNodePathGenerator(databaseName,
ruleType, databaseRuleItem);
+ VersionNodePathGenerator versionNodePathGenerator =
DatabaseRuleMetaDataNodePathGenerator.getVersion(databaseName, ruleType,
databaseRuleItem);
int nextVersion =
metaDataVersionPersistService.persist(versionNodePathGenerator,
each.getValue());
result.add(new
MetaDataVersion(DatabaseRuleMetaDataNodePathGenerator.getRulePath(databaseName,
ruleType, databaseRuleItem), Math.max(MetaDataVersion.INIT_VERSION, nextVersion
- 1)));
}
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 93311d7c8c3..d4ea0aee756 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
@@ -63,8 +63,8 @@ public final class TableMetaDataPersistService {
* @return loaded table
*/
public ShardingSphereTable load(final String databaseName, final String
schemaName, final String tableName) {
- int activeVersion =
Integer.parseInt(repository.query(TableMetaDataNodePathGenerator.getVersionNodePathGenerator(databaseName,
schemaName, tableName).getActiveVersionPath()));
- String tableContent =
repository.query(TableMetaDataNodePathGenerator.getVersionNodePathGenerator(databaseName,
schemaName, tableName).getVersionPath(activeVersion));
+ int activeVersion =
Integer.parseInt(repository.query(TableMetaDataNodePathGenerator.getVersion(databaseName,
schemaName, tableName).getActiveVersionPath()));
+ String tableContent =
repository.query(TableMetaDataNodePathGenerator.getVersion(databaseName,
schemaName, tableName).getVersionPath(activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(tableContent,
YamlShardingSphereTable.class));
}
@@ -78,7 +78,7 @@ public final class TableMetaDataPersistService {
public void persist(final String databaseName, final String schemaName,
final Collection<ShardingSphereTable> tables) {
for (ShardingSphereTable each : tables) {
String tableName = each.getName().toLowerCase();
- VersionNodePathGenerator versionNodePathGenerator =
TableMetaDataNodePathGenerator.getVersionNodePathGenerator(databaseName,
schemaName, tableName);
+ VersionNodePathGenerator versionNodePathGenerator =
TableMetaDataNodePathGenerator.getVersion(databaseName, schemaName, tableName);
metaDataVersionPersistService.persist(versionNodePathGenerator,
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
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 a901d7aecac..9642f42119a 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
@@ -63,8 +63,8 @@ public final class ViewMetaDataPersistService {
* @return loaded view
*/
public ShardingSphereView load(final String databaseName, final String
schemaName, final String viewName) {
- int activeVersion =
Integer.parseInt(repository.query(ViewMetaDataNodePathGenerator.getVersionNodePathGenerator(databaseName,
schemaName, viewName).getActiveVersionPath()));
- String view =
repository.query(ViewMetaDataNodePathGenerator.getVersionNodePathGenerator(databaseName,
schemaName, viewName).getVersionPath(activeVersion));
+ int activeVersion =
Integer.parseInt(repository.query(ViewMetaDataNodePathGenerator.getVersion(databaseName,
schemaName, viewName).getActiveVersionPath()));
+ String view =
repository.query(ViewMetaDataNodePathGenerator.getVersion(databaseName,
schemaName, viewName).getVersionPath(activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(view,
YamlShardingSphereView.class));
}
@@ -78,7 +78,7 @@ public final class ViewMetaDataPersistService {
public void persist(final String databaseName, final String schemaName,
final Collection<ShardingSphereView> views) {
for (ShardingSphereView each : views) {
String viewName = each.getName().toLowerCase();
- VersionNodePathGenerator versionNodePathGenerator =
ViewMetaDataNodePathGenerator.getVersionNodePathGenerator(databaseName,
schemaName, viewName);
+ VersionNodePathGenerator versionNodePathGenerator =
ViewMetaDataNodePathGenerator.getVersion(databaseName, schemaName, viewName);
metaDataVersionPersistService.persist(versionNodePathGenerator,
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGenerator.java
index f3d24a9514a..00bf94b88e5 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGenerator.java
@@ -94,7 +94,7 @@ public final class DataSourceMetaDataNodePathGenerator {
* @param storageUnitName storage unit name
* @return storage unit version node path generator
*/
- public static VersionNodePathGenerator
getStorageUnitVersionNodePathGenerator(final String databaseName, final String
storageUnitName) {
+ public static VersionNodePathGenerator getStorageUnitVersion(final String
databaseName, final String storageUnitName) {
return new VersionNodePathGenerator(String.join("/",
getStorageUnitsPath(databaseName), storageUnitName));
}
@@ -105,7 +105,7 @@ public final class DataSourceMetaDataNodePathGenerator {
* @param storageNodeName storage node name
* @return storage node version node path generator
*/
- public static VersionNodePathGenerator
getStorageNodeVersionNodePathGenerator(final String databaseName, final String
storageNodeName) {
+ public static VersionNodePathGenerator getStorageNodeVersion(final String
databaseName, final String storageNodeName) {
return new VersionNodePathGenerator(String.join("/",
getStorageNodesPath(databaseName), storageNodeName));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathParser.java
index 0d43b4918e8..db2da1c5bd3 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathParser.java
@@ -32,30 +32,12 @@ import java.util.regex.Pattern;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DataSourceMetaDataNodePathParser {
- private static final VersionNodePathParser STORAGE_UNITS_PARSER =
+ private static final VersionNodePathParser STORAGE_UNITS_VERSION_PARSER =
new VersionNodePathParser(String.join("/",
DataSourceMetaDataNodePathGenerator.getStorageUnitsPath(NodePathPattern.IDENTIFIER),
NodePathPattern.IDENTIFIER));
- private static final VersionNodePathParser STORAGE_NODES_PARSER =
+ private static final VersionNodePathParser STORAGE_NODES_VERSION_PARSER =
new VersionNodePathParser(String.join("/",
DataSourceMetaDataNodePathGenerator.getStorageNodesPath(NodePathPattern.IDENTIFIER),
NodePathPattern.IDENTIFIER));
- /**
- * Get storage unit version unit path parser.
- *
- * @return storage unit version node path parser
- */
- public static VersionNodePathParser getStorageUnitVersionNodePathParser() {
- return STORAGE_UNITS_PARSER;
- }
-
- /**
- * Get storage node version node path parser.
- *
- * @return storage node version node path parser
- */
- public static VersionNodePathParser getStorageNodeVersionNodePathParser() {
- return STORAGE_NODES_PARSER;
- }
-
/**
* Find storage unit name by storage unit path.
*
@@ -89,4 +71,22 @@ public final class DataSourceMetaDataNodePathParser {
public static boolean isDataSourceRootPath(final String path) {
return
Pattern.compile(DataSourceMetaDataNodePathGenerator.getDataSourceRootPath(NodePathPattern.IDENTIFIER)
+ "?", Pattern.CASE_INSENSITIVE).matcher(path).find();
}
+
+ /**
+ * Get storage unit version unit path parser.
+ *
+ * @return storage unit version node path parser
+ */
+ public static VersionNodePathParser getStorageUnitVersion() {
+ return STORAGE_UNITS_VERSION_PARSER;
+ }
+
+ /**
+ * Get storage node version node path parser.
+ *
+ * @return storage node version node path parser
+ */
+ public static VersionNodePathParser getStorageNodeVersion() {
+ return STORAGE_NODES_VERSION_PARSER;
+ }
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGenerator.java
index 74069021a3f..ce42a8049ce 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGenerator.java
@@ -73,7 +73,7 @@ public final class DatabaseRuleMetaDataNodePathGenerator {
* @param databaseRuleItem database rule item
* @return database rule version node path generator
*/
- public static VersionNodePathGenerator getVersionNodePathGenerator(final
String databaseName, final String ruleType, final DatabaseRuleItem
databaseRuleItem) {
+ public static VersionNodePathGenerator getVersion(final String
databaseName, final String ruleType, final DatabaseRuleItem databaseRuleItem) {
return new VersionNodePathGenerator(getRulePath(databaseName,
ruleType, databaseRuleItem));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGenerator.java
index 6e926eea395..e3c1c6e628f 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGenerator.java
@@ -60,7 +60,7 @@ public final class TableMetaDataNodePathGenerator {
* @param tableName table name
* @return table version node path generator
*/
- public static VersionNodePathGenerator getVersionNodePathGenerator(final
String databaseName, final String schemaName, final String tableName) {
+ public static VersionNodePathGenerator getVersion(final String
databaseName, final String schemaName, final String tableName) {
return new VersionNodePathGenerator(getTablePath(databaseName,
schemaName, tableName));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathParser.java
index 8832c94e7e7..810b8007408 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathParser.java
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class TableMetaDataNodePathParser {
- private static final VersionNodePathParser PARSER = new
VersionNodePathParser(
+ private static final VersionNodePathParser VERSION_PARSER = new
VersionNodePathParser(
TableMetaDataNodePathGenerator.getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
/**
@@ -63,7 +63,7 @@ public final class TableMetaDataNodePathParser {
*
* @return table version node path parser
*/
- public static VersionNodePathParser getVersionNodePathParser() {
- return PARSER;
+ public static VersionNodePathParser getVersion() {
+ return VERSION_PARSER;
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGenerator.java
index c6c9506f041..902f4623df9 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGenerator.java
@@ -60,7 +60,7 @@ public final class ViewMetaDataNodePathGenerator {
* @param viewName view name
* @return view version node path generator
*/
- public static VersionNodePathGenerator getVersionNodePathGenerator(final
String databaseName, final String schemaName, final String viewName) {
+ public static VersionNodePathGenerator getVersion(final String
databaseName, final String schemaName, final String viewName) {
return new VersionNodePathGenerator(getViewPath(databaseName,
schemaName, viewName));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathParser.java
index 9ed1205674a..897a7898607 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathParser.java
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ViewMetaDataNodePathParser {
- private static final VersionNodePathParser PARSER = new
VersionNodePathParser(
+ private static final VersionNodePathParser VERSION_PARSER = new
VersionNodePathParser(
ViewMetaDataNodePathGenerator.getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
/**
@@ -63,7 +63,7 @@ public final class ViewMetaDataNodePathParser {
*
* @return view version node path parser
*/
- public static VersionNodePathParser getVersionNodePathParser() {
- return PARSER;
+ public static VersionNodePathParser getVersionParser() {
+ return VERSION_PARSER;
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGeneratorTest.java
index 776e92e3baa..0338c6fd775 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePathGeneratorTest.java
@@ -50,18 +50,18 @@ class DataSourceMetaDataNodePathGeneratorTest {
}
@Test
- void assertGetStorageUnitVersionNodePathGenerator() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitVersionNodePathGenerator("foo_db",
"foo_ds").getActiveVersionPath(),
+ void assertGetStorageUnitVersion() {
+
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitVersion("foo_db",
"foo_ds").getActiveVersionPath(),
is("/metadata/foo_db/data_sources/units/foo_ds/active_version"));
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitVersionNodePathGenerator("foo_db",
"foo_ds").getVersionsPath(),
is("/metadata/foo_db/data_sources/units/foo_ds/versions"));
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitVersionNodePathGenerator("foo_db",
"foo_ds").getVersionPath(0),
is("/metadata/foo_db/data_sources/units/foo_ds/versions/0"));
+
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitVersion("foo_db",
"foo_ds").getVersionsPath(),
is("/metadata/foo_db/data_sources/units/foo_ds/versions"));
+
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitVersion("foo_db",
"foo_ds").getVersionPath(0),
is("/metadata/foo_db/data_sources/units/foo_ds/versions/0"));
}
@Test
- void assertGetStorageNodeVersionNodePathGenerator() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodeVersionNodePathGenerator("foo_db",
"foo_ds").getActiveVersionPath(),
+ void assertGetStorageNodeVersion() {
+
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodeVersion("foo_db",
"foo_ds").getActiveVersionPath(),
is("/metadata/foo_db/data_sources/nodes/foo_ds/active_version"));
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodeVersionNodePathGenerator("foo_db",
"foo_ds").getVersionsPath(),
is("/metadata/foo_db/data_sources/nodes/foo_ds/versions"));
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodeVersionNodePathGenerator("foo_db",
"foo_ds").getVersionPath(0),
is("/metadata/foo_db/data_sources/nodes/foo_ds/versions/0"));
+
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodeVersion("foo_db",
"foo_ds").getVersionsPath(),
is("/metadata/foo_db/data_sources/nodes/foo_ds/versions"));
+
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodeVersion("foo_db",
"foo_ds").getVersionPath(0),
is("/metadata/foo_db/data_sources/nodes/foo_ds/versions/0"));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGeneratorTest.java
index 5bfaf236a85..00b250f25a6 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathGeneratorTest.java
@@ -41,13 +41,13 @@ class DatabaseRuleMetaDataNodePathGeneratorTest {
}
@Test
- void assertGetVersionNodePathGenerator() {
+ void assertGetVersion() {
DatabaseRuleItem databaseRuleItem = new
DatabaseRuleItem("foo_rule_item");
-
assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_rule", databaseRuleItem).getActiveVersionPath(),
+ assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getActiveVersionPath(),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/active_version"));
-
assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_rule", databaseRuleItem).getVersionsPath(),
+ assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getVersionsPath(),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/versions"));
-
assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_rule", databaseRuleItem).getVersionPath(0),
+ assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getVersionPath(0),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/versions/0"));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGeneratorTest.java
index d7efd72f507..3cdf02311cb 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePathGeneratorTest.java
@@ -35,11 +35,11 @@ class TableMetaDataNodePathGeneratorTest {
}
@Test
- void assertGetVersionNodePathGenerator() {
-
assertThat(TableMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_schema", "foo_tbl").getActiveVersionPath(),
+ void assertGetVersion() {
+ assertThat(TableMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_tbl").getActiveVersionPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"));
-
assertThat(TableMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_schema", "foo_tbl").getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions"));
-
assertThat(TableMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_schema", "foo_tbl").getVersionPath(0),
+ assertThat(TableMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_tbl").getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions"));
+ assertThat(TableMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_tbl").getVersionPath(0),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0"));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGeneratorTest.java
index 99e811d2c69..c91ce69c747 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePathGeneratorTest.java
@@ -35,11 +35,11 @@ class ViewMetaDataNodePathGeneratorTest {
}
@Test
- void assertGetVersionNodePathGenerator() {
-
assertThat(ViewMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_schema", "foo_view").getActiveVersionPath(),
+ void assertGetVersion() {
+ assertThat(ViewMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_view").getActiveVersionPath(),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version"));
-
assertThat(ViewMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_schema", "foo_view").getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions"));
-
assertThat(ViewMetaDataNodePathGenerator.getVersionNodePathGenerator("foo_db",
"foo_schema", "foo_view").getVersionPath(0),
+ assertThat(ViewMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_view").getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions"));
+ assertThat(ViewMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_view").getVersionPath(0),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions/0"));
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java
index bc27879c9fd..8f294201965 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java
@@ -94,11 +94,11 @@ public final class MetaDataChangedHandler {
}
private boolean isTableMetaDataChanged(final String key) {
- return TableMetaDataNodePathParser.isTablePath(key) ||
TableMetaDataNodePathParser.getVersionNodePathParser().isActiveVersionPath(key);
+ return TableMetaDataNodePathParser.isTablePath(key) ||
TableMetaDataNodePathParser.getVersion().isActiveVersionPath(key);
}
private void handleTableChanged(final String databaseName, final String
schemaName, final DataChangedEvent event) {
- if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType())
&&
TableMetaDataNodePathParser.getVersionNodePathParser().isActiveVersionPath(event.getKey()))
{
+ if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType())
&&
TableMetaDataNodePathParser.getVersion().isActiveVersionPath(event.getKey())) {
tableChangedHandler.handleCreatedOrAltered(databaseName,
schemaName, event);
} else if (Type.DELETED == event.getType() &&
TableMetaDataNodePathParser.isTablePath(event.getKey())) {
tableChangedHandler.handleDropped(databaseName, schemaName, event);
@@ -106,11 +106,11 @@ public final class MetaDataChangedHandler {
}
private boolean isViewMetaDataChanged(final String key) {
- return
ViewMetaDataNodePathParser.getVersionNodePathParser().isActiveVersionPath(key)
|| ViewMetaDataNodePathParser.isViewPath(key);
+ return
ViewMetaDataNodePathParser.getVersionParser().isActiveVersionPath(key) ||
ViewMetaDataNodePathParser.isViewPath(key);
}
private void handleViewChanged(final String databaseName, final String
schemaName, final DataChangedEvent event) {
- if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType())
&&
ViewMetaDataNodePathParser.getVersionNodePathParser().isActiveVersionPath(event.getKey()))
{
+ if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType())
&&
ViewMetaDataNodePathParser.getVersionParser().isActiveVersionPath(event.getKey()))
{
viewChangedHandler.handleCreatedOrAltered(databaseName,
schemaName, event);
} else if (Type.DELETED == event.getType() &&
ViewMetaDataNodePathParser.isViewPath(event.getKey())) {
viewChangedHandler.handleDropped(databaseName, schemaName, event);
@@ -118,7 +118,7 @@ public final class MetaDataChangedHandler {
}
private void handleDataSourceChanged(final String databaseName, final
DataChangedEvent event) {
- Optional<String> storageUnitName =
DataSourceMetaDataNodePathParser.getStorageUnitVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(),
2);
+ Optional<String> storageUnitName =
DataSourceMetaDataNodePathParser.getStorageUnitVersion().findIdentifierByActiveVersionPath(event.getKey(),
2);
boolean isActiveVersion = true;
if (!storageUnitName.isPresent()) {
storageUnitName =
DataSourceMetaDataNodePathParser.findStorageUnitNameByStorageUnitPath(event.getKey());
@@ -128,7 +128,7 @@ public final class MetaDataChangedHandler {
handleStorageUnitChanged(databaseName, event,
storageUnitName.get(), isActiveVersion);
return;
}
- Optional<String> storageNodeName =
DataSourceMetaDataNodePathParser.getStorageNodeVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(),
2);
+ Optional<String> storageNodeName =
DataSourceMetaDataNodePathParser.getStorageNodeVersion().findIdentifierByActiveVersionPath(event.getKey(),
2);
isActiveVersion = true;
if (!storageNodeName.isPresent()) {
storageNodeName =
DataSourceMetaDataNodePathParser.findStorageNodeNameByStorageNodePath(event.getKey());
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/TableChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/TableChangedHandler.java
index 6ccd439b7ac..c464acf2db1 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/TableChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/TableChangedHandler.java
@@ -46,7 +46,7 @@ public final class TableChangedHandler {
* @param event data changed event
*/
public void handleCreatedOrAltered(final String databaseName, final String
schemaName, final DataChangedEvent event) {
- String tableName =
TableMetaDataNodePathParser.getVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(),
3)
+ String tableName =
TableMetaDataNodePathParser.getVersion().findIdentifierByActiveVersionPath(event.getKey(),
3)
.orElseThrow(() -> new IllegalStateException("Table name not
found."));
ActiveVersionChecker.checkActiveVersion(contextManager, event);
ShardingSphereTable table =
contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getDatabaseMetaDataFacade().getTable().load(databaseName,
schemaName, tableName);
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/ViewChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/ViewChangedHandler.java
index df90226e9f0..b9e1ebf1064 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/ViewChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/ViewChangedHandler.java
@@ -47,7 +47,7 @@ public final class ViewChangedHandler {
*/
public void handleCreatedOrAltered(final String databaseName, final String
schemaName, final DataChangedEvent event) {
String viewName =
-
ViewMetaDataNodePathParser.getVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(),
3).orElseThrow(() -> new IllegalStateException("View name not found."));
+
ViewMetaDataNodePathParser.getVersionParser().findIdentifierByActiveVersionPath(event.getKey(),
3).orElseThrow(() -> new IllegalStateException("View name not found."));
ActiveVersionChecker.checkActiveVersion(contextManager, event);
ShardingSphereView view =
contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getDatabaseMetaDataFacade().getView().load(databaseName,
schemaName, viewName);
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().alterView(databaseName,
schemaName, view);
