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 d65a9d87f22 Simplify NodePath class name (#34684)
d65a9d87f22 is described below
commit d65a9d87f2244e38c85adf2d5471ce5874d2f6eb
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Feb 15 21:21:41 2025 +0800
Simplify NodePath class name (#34684)
---
.../database/DataSourceUnitPersistService.java | 12 ++--
.../database/DatabaseRulePersistService.java | 12 ++--
.../service/SchemaMetaDataPersistService.java | 10 ++--
.../service/TableMetaDataPersistService.java | 12 ++--
.../service/ViewMetaDataPersistService.java | 12 ++--
.../mode/manager/ContextManagerTest.java | 4 +-
...Generator.java => SchemaNodePathGenerator.java} | 4 +-
...dePathParser.java => SchemaNodePathParser.java} | 6 +-
...hGenerator.java => TableNodePathGenerator.java} | 6 +-
...odePathParser.java => TableNodePathParser.java} | 8 +--
...thGenerator.java => ViewNodePathGenerator.java} | 6 +-
...NodePathParser.java => ViewNodePathParser.java} | 8 +--
...tor.java => DatabaseRuleNodePathGenerator.java} | 4 +-
...rator.java => DataSourceNodePathGenerator.java} | 4 +-
...thParser.java => DataSourceNodePathParser.java} | 14 ++---
...rTest.java => SchemaNodePathGeneratorTest.java} | 6 +-
...rserTest.java => SchemaNodePathParserTest.java} | 10 ++--
...orTest.java => TableNodePathGeneratorTest.java} | 12 ++--
...arserTest.java => TableNodePathParserTest.java} | 8 +--
...torTest.java => ViewNodePathGeneratorTest.java} | 12 ++--
...ParserTest.java => ViewNodePathParserTest.java} | 8 +--
...java => DatabaseRuleNodePathGeneratorTest.java} | 14 ++---
.../DataSourceMetaDataNodePathGeneratorTest.java | 67 ----------------------
.../storage/DataSourceNodePathGeneratorTest.java | 67 ++++++++++++++++++++++
...Test.java => DataSourceNodePathParserTest.java} | 12 ++--
.../database/metadata/MetaDataChangedHandler.java | 34 +++++------
.../metadata/type/TableChangedHandler.java | 6 +-
.../database/metadata/type/ViewChangedHandler.java | 6 +-
28 files changed, 192 insertions(+), 192 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 466339b85ab..a88cae7c833 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
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePo
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
-import
org.apache.shardingsphere.mode.node.path.metadata.storage.DataSourceMetaDataNodePathGenerator;
+import
org.apache.shardingsphere.mode.node.path.metadata.storage.DataSourceNodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -55,7 +55,7 @@ public final class DataSourceUnitPersistService {
* @return data source pool properties map
*/
public Map<String, DataSourcePoolProperties> load(final String
databaseName) {
- Collection<String> childrenKeys =
repository.getChildrenKeys(DataSourceMetaDataNodePathGenerator.getStorageUnitsPath(databaseName));
+ Collection<String> childrenKeys =
repository.getChildrenKeys(DataSourceNodePathGenerator.getStorageUnitsPath(databaseName));
return childrenKeys.stream().collect(Collectors.toMap(each -> each,
each -> load(databaseName, each), (a, b) -> b, () -> new
LinkedHashMap<>(childrenKeys.size(), 1F)));
}
@@ -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.getStorageUnitVersion(databaseName,
dataSourceName).getActiveVersionPath()));
- String dataSourceContent =
repository.query(DataSourceMetaDataNodePathGenerator.getStorageUnitVersion(databaseName,
dataSourceName).getVersionPath(activeVersion));
+ int activeVersion =
Integer.parseInt(repository.query(DataSourceNodePathGenerator.getStorageUnitVersion(databaseName,
dataSourceName).getActiveVersionPath()));
+ String dataSourceContent =
repository.query(DataSourceNodePathGenerator.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.getStorageUnitVersion(databaseName,
entry.getKey());
+ VersionNodePathGenerator versionNodePathGenerator =
DataSourceNodePathGenerator.getStorageUnitVersion(databaseName, entry.getKey());
metaDataVersionPersistService.persist(versionNodePathGenerator,
YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
}
}
@@ -93,6 +93,6 @@ public final class DataSourceUnitPersistService {
* @param dataSourceName data source name
*/
public void delete(final String databaseName, final String dataSourceName)
{
-
repository.delete(DataSourceMetaDataNodePathGenerator.getStorageUnitPath(databaseName,
dataSourceName));
+
repository.delete(DataSourceNodePathGenerator.getStorageUnitPath(databaseName,
dataSourceName));
}
}
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 5485a3730e0..43492938707 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
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigur
import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import
org.apache.shardingsphere.mode.node.path.config.database.item.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.metadata.rule.DatabaseRuleMetaDataNodePathGenerator;
+import
org.apache.shardingsphere.mode.node.path.metadata.rule.DatabaseRuleNodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import
org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
@@ -67,7 +67,7 @@ public final class DatabaseRulePersistService {
* @return configurations
*/
public Collection<RuleConfiguration> load(final String databaseName) {
- return
yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(DatabaseRuleMetaDataNodePathGenerator.getRootPath(databaseName)));
+ return
yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(DatabaseRuleNodePathGenerator.getRootPath(databaseName)));
}
/**
@@ -92,9 +92,9 @@ public final class DatabaseRulePersistService {
Collection<MetaDataVersion> result = new LinkedList<>();
for (RepositoryTuple each : repositoryTuples) {
DatabaseRuleItem databaseRuleItem = new
DatabaseRuleItem(each.getKey());
- VersionNodePathGenerator versionNodePathGenerator =
DatabaseRuleMetaDataNodePathGenerator.getVersion(databaseName, ruleType,
databaseRuleItem);
+ VersionNodePathGenerator versionNodePathGenerator =
DatabaseRuleNodePathGenerator.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)));
+ result.add(new
MetaDataVersion(DatabaseRuleNodePathGenerator.getRulePath(databaseName,
ruleType, databaseRuleItem), Math.max(MetaDataVersion.INIT_VERSION, nextVersion
- 1)));
}
return result;
}
@@ -106,7 +106,7 @@ public final class DatabaseRulePersistService {
* @param ruleType rule type
*/
public void delete(final String databaseName, final String ruleType) {
-
repository.delete(DatabaseRuleMetaDataNodePathGenerator.getRulePath(databaseName,
ruleType));
+
repository.delete(DatabaseRuleNodePathGenerator.getRulePath(databaseName,
ruleType));
}
/**
@@ -132,7 +132,7 @@ public final class DatabaseRulePersistService {
private Collection<MetaDataVersion> delete(final String databaseName,
final String ruleType, final Collection<RepositoryTuple> repositoryTuples) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (RepositoryTuple each : repositoryTuples) {
- String toBeDeletedKey =
DatabaseRuleMetaDataNodePathGenerator.getRulePath(databaseName, ruleType, new
DatabaseRuleItem(each.getKey()));
+ String toBeDeletedKey =
DatabaseRuleNodePathGenerator.getRulePath(databaseName, ruleType, new
DatabaseRuleItem(each.getKey()));
repository.delete(toBeDeletedKey);
result.add(new MetaDataVersion(toBeDeletedKey));
}
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 1b16cd93381..ce54be7dec4 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
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.SchemaMetaDataNodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.TableMetaDataNodePathGenerator;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.SchemaNodePathGenerator;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePathGenerator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
@@ -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.getRootPath(databaseName,
schemaName), "");
+ repository.persist(TableNodePathGenerator.getRootPath(databaseName,
schemaName), "");
}
/**
@@ -62,7 +62,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName to be dropped schema name
*/
public void drop(final String databaseName, final String schemaName) {
-
repository.delete(SchemaMetaDataNodePathGenerator.getSchemaPath(databaseName,
schemaName));
+ repository.delete(SchemaNodePathGenerator.getSchemaPath(databaseName,
schemaName));
}
/**
@@ -112,7 +112,7 @@ public final class SchemaMetaDataPersistService {
* @return schemas
*/
public Collection<ShardingSphereSchema> load(final String databaseName) {
- return
repository.getChildrenKeys(SchemaMetaDataNodePathGenerator.getRootPath(databaseName)).stream()
+ return
repository.getChildrenKeys(SchemaNodePathGenerator.getRootPath(databaseName)).stream()
.map(each -> new ShardingSphereSchema(each,
tableMetaDataPersistService.load(databaseName, each),
viewMetaDataPersistService.load(databaseName,
each))).collect(Collectors.toList());
}
}
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 9c3b2cad449..2f2d8df0188 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
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlTableSwapper;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.TableMetaDataNodePathGenerator;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -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.getRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
+ return
repository.getChildrenKeys(TableNodePathGenerator.getRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
.collect(Collectors.toList());
}
@@ -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.getVersion(databaseName,
schemaName, tableName).getActiveVersionPath()));
- String tableContent =
repository.query(TableMetaDataNodePathGenerator.getVersion(databaseName,
schemaName, tableName).getVersionPath(activeVersion));
+ int activeVersion =
Integer.parseInt(repository.query(TableNodePathGenerator.getVersion(databaseName,
schemaName, tableName).getActiveVersionPath()));
+ String tableContent =
repository.query(TableNodePathGenerator.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.getVersion(databaseName, schemaName, tableName);
+ VersionNodePathGenerator versionNodePathGenerator =
TableNodePathGenerator.getVersion(databaseName, schemaName, tableName);
metaDataVersionPersistService.persist(versionNodePathGenerator,
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
@@ -91,7 +91,7 @@ public final class TableMetaDataPersistService {
* @param tableName to be dropped table name
*/
public void drop(final String databaseName, final String schemaName, final
String tableName) {
-
repository.delete(TableMetaDataNodePathGenerator.getTablePath(databaseName,
schemaName, tableName.toLowerCase()));
+ repository.delete(TableNodePathGenerator.getTablePath(databaseName,
schemaName, tableName.toLowerCase()));
}
/**
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 b36d7789675..50700ae10e0 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
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereView;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.ViewMetaDataNodePathGenerator;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.ViewNodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -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.getRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
+ return
repository.getChildrenKeys(ViewNodePathGenerator.getRootPath(databaseName,
schemaName)).stream().map(each -> load(databaseName, schemaName, each))
.collect(Collectors.toList());
}
@@ -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.getVersion(databaseName,
schemaName, viewName).getActiveVersionPath()));
- String view =
repository.query(ViewMetaDataNodePathGenerator.getVersion(databaseName,
schemaName, viewName).getVersionPath(activeVersion));
+ int activeVersion =
Integer.parseInt(repository.query(ViewNodePathGenerator.getVersion(databaseName,
schemaName, viewName).getActiveVersionPath()));
+ String view =
repository.query(ViewNodePathGenerator.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.getVersion(databaseName, schemaName, viewName);
+ VersionNodePathGenerator versionNodePathGenerator =
ViewNodePathGenerator.getVersion(databaseName, schemaName, viewName);
metaDataVersionPersistService.persist(versionNodePathGenerator,
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
@@ -91,6 +91,6 @@ public final class ViewMetaDataPersistService {
* @param viewName to be dropped view name
*/
public void drop(final String databaseName, final String schemaName, final
String viewName) {
-
repository.delete(ViewMetaDataNodePathGenerator.getViewPath(databaseName,
schemaName, viewName.toLowerCase()));
+ repository.delete(ViewNodePathGenerator.getViewPath(databaseName,
schemaName, viewName.toLowerCase()));
}
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index dc0f32e038f..d50681a0abd 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -38,7 +38,7 @@ import
org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import
org.apache.shardingsphere.infra.rule.attribute.datanode.MutableDataNodeRuleAttribute;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.SchemaMetaDataNodePathGenerator;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.SchemaNodePathGenerator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.junit.jupiter.api.BeforeEach;
@@ -146,7 +146,7 @@ class ContextManagerTest {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
ShardingSphereDatabase database = mockDatabase();
contextManager.reloadSchema(database, "foo_schema", "foo_ds");
-
verify(contextManager.getPersistServiceFacade().getRepository()).delete(SchemaMetaDataNodePathGenerator.getSchemaPath("foo_db",
"foo_schema"));
+
verify(contextManager.getPersistServiceFacade().getRepository()).delete(SchemaNodePathGenerator.getSchemaPath("foo_db",
"foo_schema"));
}
@Test
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGenerator.java
similarity index 94%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathGenerator.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGenerator.java
index f843299bb90..24cc6fde30e 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGenerator.java
@@ -22,10 +22,10 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerator;
/**
- * Schema meta data node path generator.
+ * Schema node path generator.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SchemaMetaDataNodePathGenerator {
+public final class SchemaNodePathGenerator {
private static final String SCHEMAS_NODE = "schemas";
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParser.java
similarity index 85%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathParser.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParser.java
index d3732de6ade..0ff422438df 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParser.java
@@ -26,10 +26,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Schema meta data node path parser.
+ * Schema node path parser.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SchemaMetaDataNodePathParser {
+public final class SchemaNodePathParser {
/**
* Find schema name.
@@ -40,7 +40,7 @@ public final class SchemaMetaDataNodePathParser {
*/
public static Optional<String> findSchemaName(final String path, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
Pattern.compile(SchemaMetaDataNodePathGenerator.getSchemaPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(SchemaNodePathGenerator.getSchemaPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
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/TableNodePathGenerator.java
similarity index 91%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGenerator.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathGenerator.java
index b827b594517..0c9bbf40fa8 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/TableNodePathGenerator.java
@@ -22,10 +22,10 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
- * Table meta data node path generator.
+ * Table node path generator.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class TableMetaDataNodePathGenerator {
+public final class TableNodePathGenerator {
private static final String TABLES_NODE = "tables";
@@ -37,7 +37,7 @@ public final class TableMetaDataNodePathGenerator {
* @return table root path
*/
public static String getRootPath(final String databaseName, final String
schemaName) {
- return String.join("/",
SchemaMetaDataNodePathGenerator.getSchemaPath(databaseName, schemaName),
TABLES_NODE);
+ return String.join("/",
SchemaNodePathGenerator.getSchemaPath(databaseName, schemaName), TABLES_NODE);
}
/**
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParser.java
similarity index 83%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathParser.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParser.java
index 8294840b1b1..59aa6ccc9f9 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParser.java
@@ -27,13 +27,13 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Table meta data node path parser.
+ * Table node path parser.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class TableMetaDataNodePathParser {
+public final class TableNodePathParser {
private static final VersionNodePathParser VERSION_PARSER = new
VersionNodePathParser(
-
TableMetaDataNodePathGenerator.getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
+ TableNodePathGenerator.getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
/**
* Find table name.
@@ -43,7 +43,7 @@ public final class TableMetaDataNodePathParser {
*/
public static Optional<String> findTableName(final String path) {
Pattern pattern = Pattern.compile(
-
TableMetaDataNodePathGenerator.getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
+
TableNodePathGenerator.getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
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/ViewNodePathGenerator.java
similarity index 91%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGenerator.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGenerator.java
index 56c1c7fe82e..5d67828e1d2 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/ViewNodePathGenerator.java
@@ -22,10 +22,10 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
- * View meta data path generator.
+ * View path generator.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ViewMetaDataNodePathGenerator {
+public final class ViewNodePathGenerator {
private static final String VIEWS_NODE = "views";
@@ -37,7 +37,7 @@ public final class ViewMetaDataNodePathGenerator {
* @return view root path
*/
public static String getRootPath(final String databaseName, final String
schemaName) {
- return String.join("/",
SchemaMetaDataNodePathGenerator.getSchemaPath(databaseName, schemaName),
VIEWS_NODE);
+ return String.join("/",
SchemaNodePathGenerator.getSchemaPath(databaseName, schemaName), VIEWS_NODE);
}
/**
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParser.java
similarity index 84%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathParser.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParser.java
index 1758455902b..4186d5ba02d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParser.java
@@ -27,13 +27,13 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * View meta data path parser.
+ * View path parser.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ViewMetaDataNodePathParser {
+public final class ViewNodePathParser {
private static final VersionNodePathParser VERSION_PARSER = new
VersionNodePathParser(
-
ViewMetaDataNodePathGenerator.getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
+ ViewNodePathGenerator.getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
/**
* Get view name.
@@ -43,7 +43,7 @@ public final class ViewMetaDataNodePathParser {
*/
public static Optional<String> findViewName(final String path) {
Pattern pattern = Pattern.compile(
-
ViewMetaDataNodePathGenerator.getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
+ ViewNodePathGenerator.getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGenerator.java
similarity index 96%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleMetaDataNodePathGenerator.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGenerator.java
index f874dc124ef..6941f97deb3 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGenerator.java
@@ -24,10 +24,10 @@ import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerat
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
- * Database rule meta data node path generator.
+ * Database rule node path generator.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseRuleMetaDataNodePathGenerator {
+public final class DatabaseRuleNodePathGenerator {
private static final String RULE_NODE = "rules";
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java
similarity index 97%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathGenerator.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java
index ca4f88aa5eb..1a2150ef969 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerat
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
- * Data source meta data node path generator.
+ * Data source node path generator.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DataSourceMetaDataNodePathGenerator {
+public final class DataSourceNodePathGenerator {
private static final String DATA_SOURCES_NODE = "data_sources";
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParser.java
similarity index 77%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathParser.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParser.java
index 62779da170c..a46797ec6b0 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParser.java
@@ -27,16 +27,16 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Data source meta data node path parser.
+ * Data source node path parser.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DataSourceMetaDataNodePathParser {
+public final class DataSourceNodePathParser {
private static final VersionNodePathParser STORAGE_UNITS_VERSION_PARSER =
- new VersionNodePathParser(String.join("/",
DataSourceMetaDataNodePathGenerator.getStorageUnitsPath(NodePathPattern.IDENTIFIER),
NodePathPattern.IDENTIFIER));
+ new VersionNodePathParser(String.join("/",
DataSourceNodePathGenerator.getStorageUnitsPath(NodePathPattern.IDENTIFIER),
NodePathPattern.IDENTIFIER));
private static final VersionNodePathParser STORAGE_NODES_VERSION_PARSER =
- new VersionNodePathParser(String.join("/",
DataSourceMetaDataNodePathGenerator.getStorageNodesPath(NodePathPattern.IDENTIFIER),
NodePathPattern.IDENTIFIER));
+ new VersionNodePathParser(String.join("/",
DataSourceNodePathGenerator.getStorageNodesPath(NodePathPattern.IDENTIFIER),
NodePathPattern.IDENTIFIER));
/**
* Find storage unit name by storage unit path.
@@ -45,7 +45,7 @@ public final class DataSourceMetaDataNodePathParser {
* @return found storage unit name
*/
public static Optional<String> findStorageUnitNameByStorageUnitPath(final
String path) {
- Pattern pattern =
Pattern.compile(DataSourceMetaDataNodePathGenerator.getStorageUnitPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(DataSourceNodePathGenerator.getStorageUnitPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -57,7 +57,7 @@ public final class DataSourceMetaDataNodePathParser {
* @return found storage unit name
*/
public static Optional<String> findStorageNodeNameByStorageNodePath(final
String path) {
- Pattern pattern =
Pattern.compile(DataSourceMetaDataNodePathGenerator.getStorageNodePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(DataSourceNodePathGenerator.getStorageNodePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -69,7 +69,7 @@ public final class DataSourceMetaDataNodePathParser {
* @return is data source root path or not
*/
public static boolean isDataSourceRootPath(final String path) {
- return
Pattern.compile(DataSourceMetaDataNodePathGenerator.getDataSourceRootPath(NodePathPattern.IDENTIFIER)
+ "?", Pattern.CASE_INSENSITIVE).matcher(path).find();
+ return
Pattern.compile(DataSourceNodePathGenerator.getDataSourceRootPath(NodePathPattern.IDENTIFIER)
+ "?", Pattern.CASE_INSENSITIVE).matcher(path).find();
}
/**
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGeneratorTest.java
similarity index 79%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathGeneratorTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGeneratorTest.java
index 37cd4cf9fd1..343cd835f2b 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGeneratorTest.java
@@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SchemaMetaDataNodePathGeneratorTest {
+class SchemaNodePathGeneratorTest {
@Test
void assertGetRootPath() {
- assertThat(SchemaMetaDataNodePathGenerator.getRootPath("foo_db"),
is("/metadata/foo_db/schemas"));
+ assertThat(SchemaNodePathGenerator.getRootPath("foo_db"),
is("/metadata/foo_db/schemas"));
}
@Test
void assertGetSchemaPath() {
- assertThat(SchemaMetaDataNodePathGenerator.getSchemaPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
+ assertThat(SchemaNodePathGenerator.getSchemaPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathParserTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParserTest.java
similarity index 75%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathParserTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParserTest.java
index d776e1653cf..e7d9d3e8992 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaMetaDataNodePathParserTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParserTest.java
@@ -26,31 +26,31 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class SchemaMetaDataNodePathParserTest {
+class SchemaNodePathParserTest {
@Test
void assertFindSchemaNameWithNotContainsChildPath() {
- Optional<String> actual =
SchemaMetaDataNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema",
false);
+ Optional<String> actual =
SchemaNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema",
false);
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_schema"));
}
@Test
void assertNotFindSchemaNameWithNotContainsChildPath() {
- Optional<String> actual =
SchemaMetaDataNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
false);
+ Optional<String> actual =
SchemaNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
false);
assertFalse(actual.isPresent());
}
@Test
void assertFindSchemaNameWithContainsChildPath() {
- Optional<String> actual =
SchemaMetaDataNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
true);
+ Optional<String> actual =
SchemaNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
true);
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_schema"));
}
@Test
void assertNotFindSchemaNameWithContainsChildPath() {
- Optional<String> actual =
SchemaMetaDataNodePathParser.findSchemaName("/xxx/foo_db/schemas/foo_schema/tables",
true);
+ Optional<String> actual =
SchemaNodePathParser.findSchemaName("/xxx/foo_db/schemas/foo_schema/tables",
true);
assertFalse(actual.isPresent());
}
}
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/TableNodePathGeneratorTest.java
similarity index 63%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathGeneratorTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathGeneratorTest.java
index 5e3af1e4074..94870e41a4d 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/TableNodePathGeneratorTest.java
@@ -22,24 +22,24 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class TableMetaDataNodePathGeneratorTest {
+class TableNodePathGeneratorTest {
@Test
void assertGetRootPath() {
- assertThat(TableMetaDataNodePathGenerator.getRootPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/tables"));
+ assertThat(TableNodePathGenerator.getRootPath("foo_db", "foo_schema"),
is("/metadata/foo_db/schemas/foo_schema/tables"));
}
@Test
void assertGetTablePath() {
- assertThat(TableMetaDataNodePathGenerator.getTablePath("foo_db",
"foo_schema", "foo_tbl"),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
+ assertThat(TableNodePathGenerator.getTablePath("foo_db", "foo_schema",
"foo_tbl"), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
}
@Test
void assertGetVersion() {
- assertThat(TableMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_tbl").getActiveVersionPath(),
+ assertThat(TableNodePathGenerator.getVersion("foo_db", "foo_schema",
"foo_tbl").getActiveVersionPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"));
- 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),
+ assertThat(TableNodePathGenerator.getVersion("foo_db", "foo_schema",
"foo_tbl").getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions"));
+ assertThat(TableNodePathGenerator.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/database/TableMetaDataNodePathParserTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParserTest.java
similarity index 77%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathParserTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParserTest.java
index 9883ea3e554..4a05aeaf806 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableMetaDataNodePathParserTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParserTest.java
@@ -26,22 +26,22 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class TableMetaDataNodePathParserTest {
+class TableNodePathParserTest {
@Test
void assertFindTableName() {
- Optional<String> actual =
TableMetaDataNodePathParser.findTableName("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl");
+ Optional<String> actual =
TableNodePathParser.findTableName("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_tbl"));
}
@Test
void assertFindTableNameIfNotFound() {
-
assertFalse(TableMetaDataNodePathParser.findTableName("/xxx/foo_db/schemas/foo_schema/tables/foo_tbl").isPresent());
+
assertFalse(TableNodePathParser.findTableName("/xxx/foo_db/schemas/foo_schema/tables/foo_tbl").isPresent());
}
@Test
void assertIsTablePath() {
-
assertTrue(TableMetaDataNodePathParser.isTablePath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
+
assertTrue(TableNodePathParser.isTablePath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
}
}
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/ViewNodePathGeneratorTest.java
similarity index 64%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathGeneratorTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGeneratorTest.java
index 06dcf33e7e9..fa7ada1b3ee 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/ViewNodePathGeneratorTest.java
@@ -22,24 +22,24 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ViewMetaDataNodePathGeneratorTest {
+class ViewNodePathGeneratorTest {
@Test
void assertGetRootPath() {
- assertThat(ViewMetaDataNodePathGenerator.getRootPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/views"));
+ assertThat(ViewNodePathGenerator.getRootPath("foo_db", "foo_schema"),
is("/metadata/foo_db/schemas/foo_schema/views"));
}
@Test
void assertGetViewPath() {
- assertThat(ViewMetaDataNodePathGenerator.getViewPath("foo_db",
"foo_schema", "foo_view"),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
+ assertThat(ViewNodePathGenerator.getViewPath("foo_db", "foo_schema",
"foo_view"), is("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
}
@Test
void assertGetVersion() {
- assertThat(ViewMetaDataNodePathGenerator.getVersion("foo_db",
"foo_schema", "foo_view").getActiveVersionPath(),
+ assertThat(ViewNodePathGenerator.getVersion("foo_db", "foo_schema",
"foo_view").getActiveVersionPath(),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version"));
- 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),
+ assertThat(ViewNodePathGenerator.getVersion("foo_db", "foo_schema",
"foo_view").getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions"));
+ assertThat(ViewNodePathGenerator.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/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathParserTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParserTest.java
similarity index 77%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathParserTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParserTest.java
index c5c67869210..8da9c2b2d4c 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewMetaDataNodePathParserTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParserTest.java
@@ -26,22 +26,22 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class ViewMetaDataNodePathParserTest {
+class ViewNodePathParserTest {
@Test
void assertFindViewName() {
- Optional<String> actual =
ViewMetaDataNodePathParser.findViewName("/metadata/foo_db/schemas/foo_schema/views/foo_view");
+ Optional<String> actual =
ViewNodePathParser.findViewName("/metadata/foo_db/schemas/foo_schema/views/foo_view");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_view"));
}
@Test
void assertFindViewNameIfNotFound() {
-
assertFalse(ViewMetaDataNodePathParser.findViewName("/xxx/foo_db/schemas/foo_schema/views/foo_view").isPresent());
+
assertFalse(ViewNodePathParser.findViewName("/xxx/foo_db/schemas/foo_schema/views/foo_view").isPresent());
}
@Test
void assertIsViewPath() {
-
assertTrue(ViewMetaDataNodePathParser.isViewPath("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
+
assertTrue(ViewNodePathParser.isViewPath("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGeneratorTest.java
similarity index 65%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleMetaDataNodePathGeneratorTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGeneratorTest.java
index bcfe09eb430..91c33b0d239 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGeneratorTest.java
@@ -23,31 +23,31 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class DatabaseRuleMetaDataNodePathGeneratorTest {
+class DatabaseRuleNodePathGeneratorTest {
@Test
void assertGetRootPath() {
-
assertThat(DatabaseRuleMetaDataNodePathGenerator.getRootPath("foo_db"),
is("/metadata/foo_db/rules"));
+ assertThat(DatabaseRuleNodePathGenerator.getRootPath("foo_db"),
is("/metadata/foo_db/rules"));
}
@Test
void assertGetRulePath() {
- assertThat(DatabaseRuleMetaDataNodePathGenerator.getRulePath("foo_db",
"foo_rule"), is("/metadata/foo_db/rules/foo_rule"));
+ assertThat(DatabaseRuleNodePathGenerator.getRulePath("foo_db",
"foo_rule"), is("/metadata/foo_db/rules/foo_rule"));
}
@Test
void assertGetRulePathWithKey() {
- assertThat(DatabaseRuleMetaDataNodePathGenerator.getRulePath("foo_db",
"foo_rule", new DatabaseRuleItem("foo_rule_item")),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item"));
+ assertThat(DatabaseRuleNodePathGenerator.getRulePath("foo_db",
"foo_rule", new DatabaseRuleItem("foo_rule_item")),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item"));
}
@Test
void assertGetVersion() {
DatabaseRuleItem databaseRuleItem = new
DatabaseRuleItem("foo_rule_item");
- assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getActiveVersionPath(),
+ assertThat(DatabaseRuleNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getActiveVersionPath(),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/active_version"));
- assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getVersionsPath(),
+ assertThat(DatabaseRuleNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getVersionsPath(),
is("/metadata/foo_db/rules/foo_rule/foo_rule_item/versions"));
- assertThat(DatabaseRuleMetaDataNodePathGenerator.getVersion("foo_db",
"foo_rule", databaseRuleItem).getVersionPath(0),
+ assertThat(DatabaseRuleNodePathGenerator.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/storage/DataSourceMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathGeneratorTest.java
deleted file mode 100644
index 8f9222ab4e8..00000000000
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathGeneratorTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.mode.node.path.metadata.storage;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-class DataSourceMetaDataNodePathGeneratorTest {
-
- @Test
- void assertGetDataSourceRootPath() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getDataSourceRootPath("foo_db"),
is("/metadata/foo_db/data_sources"));
- }
-
- @Test
- void assertGetStorageUnitsPath() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitsPath("foo_db"),
is("/metadata/foo_db/data_sources/units"));
- }
-
- @Test
- void assertGetStorageNodesPath() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodesPath("foo_db"),
is("/metadata/foo_db/data_sources/nodes"));
- }
-
- @Test
- void assertGetStorageUnitPath() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitPath("foo_db",
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds"));
- }
-
- @Test
- void assertGetStorageNodePath() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodePath("foo_db",
"foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds"));
- }
-
- @Test
- void assertGetStorageUnitVersion() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageUnitVersion("foo_db",
"foo_ds").getActiveVersionPath(),
-
is("/metadata/foo_db/data_sources/units/foo_ds/active_version"));
-
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 assertGetStorageNodeVersion() {
-
assertThat(DataSourceMetaDataNodePathGenerator.getStorageNodeVersion("foo_db",
"foo_ds").getActiveVersionPath(),
-
is("/metadata/foo_db/data_sources/nodes/foo_ds/active_version"));
-
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/storage/DataSourceNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGeneratorTest.java
new file mode 100644
index 00000000000..303716814ca
--- /dev/null
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGeneratorTest.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.mode.node.path.metadata.storage;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+class DataSourceNodePathGeneratorTest {
+
+ @Test
+ void assertGetDataSourceRootPath() {
+
assertThat(DataSourceNodePathGenerator.getDataSourceRootPath("foo_db"),
is("/metadata/foo_db/data_sources"));
+ }
+
+ @Test
+ void assertGetStorageUnitsPath() {
+ assertThat(DataSourceNodePathGenerator.getStorageUnitsPath("foo_db"),
is("/metadata/foo_db/data_sources/units"));
+ }
+
+ @Test
+ void assertGetStorageNodesPath() {
+ assertThat(DataSourceNodePathGenerator.getStorageNodesPath("foo_db"),
is("/metadata/foo_db/data_sources/nodes"));
+ }
+
+ @Test
+ void assertGetStorageUnitPath() {
+ assertThat(DataSourceNodePathGenerator.getStorageUnitPath("foo_db",
"foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds"));
+ }
+
+ @Test
+ void assertGetStorageNodePath() {
+ assertThat(DataSourceNodePathGenerator.getStorageNodePath("foo_db",
"foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds"));
+ }
+
+ @Test
+ void assertGetStorageUnitVersion() {
+ assertThat(DataSourceNodePathGenerator.getStorageUnitVersion("foo_db",
"foo_ds").getActiveVersionPath(),
+
is("/metadata/foo_db/data_sources/units/foo_ds/active_version"));
+ assertThat(DataSourceNodePathGenerator.getStorageUnitVersion("foo_db",
"foo_ds").getVersionsPath(),
is("/metadata/foo_db/data_sources/units/foo_ds/versions"));
+ assertThat(DataSourceNodePathGenerator.getStorageUnitVersion("foo_db",
"foo_ds").getVersionPath(0),
is("/metadata/foo_db/data_sources/units/foo_ds/versions/0"));
+ }
+
+ @Test
+ void assertGetStorageNodeVersion() {
+ assertThat(DataSourceNodePathGenerator.getStorageNodeVersion("foo_db",
"foo_ds").getActiveVersionPath(),
+
is("/metadata/foo_db/data_sources/nodes/foo_ds/active_version"));
+ assertThat(DataSourceNodePathGenerator.getStorageNodeVersion("foo_db",
"foo_ds").getVersionsPath(),
is("/metadata/foo_db/data_sources/nodes/foo_ds/versions"));
+ assertThat(DataSourceNodePathGenerator.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/storage/DataSourceMetaDataNodePathParserTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParserTest.java
similarity index 69%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathParserTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParserTest.java
index 22d0a01a8e3..123d8fb6e7f 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceMetaDataNodePathParserTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParserTest.java
@@ -26,34 +26,34 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class DataSourceMetaDataNodePathParserTest {
+class DataSourceNodePathParserTest {
@Test
void assertFindStorageUnitNameByStorageUnitPath() {
- Optional<String> actual =
DataSourceMetaDataNodePathParser.findStorageUnitNameByStorageUnitPath("/metadata/foo_db/data_sources/units/foo_ds");
+ Optional<String> actual =
DataSourceNodePathParser.findStorageUnitNameByStorageUnitPath("/metadata/foo_db/data_sources/units/foo_ds");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_ds"));
}
@Test
void assertFindStorageUnitNameByStorageUnitPathIfNotFound() {
-
assertFalse(DataSourceMetaDataNodePathParser.findStorageUnitNameByStorageUnitPath("/xxx/foo_db/data_sources/units/foo_ds").isPresent());
+
assertFalse(DataSourceNodePathParser.findStorageUnitNameByStorageUnitPath("/xxx/foo_db/data_sources/units/foo_ds").isPresent());
}
@Test
void assertFindStorageNodeNameByStorageNodePath() {
- Optional<String> actual =
DataSourceMetaDataNodePathParser.findStorageNodeNameByStorageNodePath("/metadata/foo_db/data_sources/nodes/foo_ds");
+ Optional<String> actual =
DataSourceNodePathParser.findStorageNodeNameByStorageNodePath("/metadata/foo_db/data_sources/nodes/foo_ds");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_ds"));
}
@Test
void assertFindStorageNodeNameByStorageNodePathIfNotFound() {
-
assertFalse(DataSourceMetaDataNodePathParser.findStorageNodeNameByStorageNodePath("/xxx/foo_db/data_sources/nodes/foo_ds").isPresent());
+
assertFalse(DataSourceNodePathParser.findStorageNodeNameByStorageNodePath("/xxx/foo_db/data_sources/nodes/foo_ds").isPresent());
}
@Test
void assertIsDataSourceRootPath() {
-
assertTrue(DataSourceMetaDataNodePathParser.isDataSourceRootPath("/metadata/foo_db/data_sources/foo_ds"));
+
assertTrue(DataSourceNodePathParser.isDataSourceRootPath("/metadata/foo_db/data_sources/foo_ds"));
}
}
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 4a4a088da3b..cb9fd5f1028 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
@@ -25,10 +25,10 @@ import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.StorageUnitChangedHandler;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.TableChangedHandler;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.ViewChangedHandler;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.SchemaMetaDataNodePathParser;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.TableMetaDataNodePathParser;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.ViewMetaDataNodePathParser;
-import
org.apache.shardingsphere.mode.node.path.metadata.storage.DataSourceMetaDataNodePathParser;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.SchemaNodePathParser;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePathParser;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.ViewNodePathParser;
+import
org.apache.shardingsphere.mode.node.path.metadata.storage.DataSourceNodePathParser;
import java.util.Optional;
@@ -64,12 +64,12 @@ public final class MetaDataChangedHandler {
*/
public boolean handle(final String databaseName, final DataChangedEvent
event) {
String eventKey = event.getKey();
- Optional<String> schemaName =
SchemaMetaDataNodePathParser.findSchemaName(eventKey, false);
+ Optional<String> schemaName =
SchemaNodePathParser.findSchemaName(eventKey, false);
if (schemaName.isPresent()) {
handleSchemaChanged(databaseName, schemaName.get(), event);
return true;
}
- schemaName = SchemaMetaDataNodePathParser.findSchemaName(eventKey,
true);
+ schemaName = SchemaNodePathParser.findSchemaName(eventKey, true);
if (schemaName.isPresent() && isTableMetaDataChanged(eventKey)) {
handleTableChanged(databaseName, schemaName.get(), event);
return true;
@@ -78,7 +78,7 @@ public final class MetaDataChangedHandler {
handleViewChanged(databaseName, schemaName.get(), event);
return true;
}
- if (DataSourceMetaDataNodePathParser.isDataSourceRootPath(eventKey)) {
+ if (DataSourceNodePathParser.isDataSourceRootPath(eventKey)) {
handleDataSourceChanged(databaseName, event);
return true;
}
@@ -94,44 +94,44 @@ public final class MetaDataChangedHandler {
}
private boolean isTableMetaDataChanged(final String key) {
- return TableMetaDataNodePathParser.isTablePath(key) ||
TableMetaDataNodePathParser.getVersion().isActiveVersionPath(key);
+ return TableNodePathParser.isTablePath(key) ||
TableNodePathParser.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.getVersion().isActiveVersionPath(event.getKey())) {
+ if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType())
&& TableNodePathParser.getVersion().isActiveVersionPath(event.getKey())) {
tableChangedHandler.handleCreatedOrAltered(databaseName,
schemaName, event);
- } else if (Type.DELETED == event.getType() &&
TableMetaDataNodePathParser.isTablePath(event.getKey())) {
+ } else if (Type.DELETED == event.getType() &&
TableNodePathParser.isTablePath(event.getKey())) {
tableChangedHandler.handleDropped(databaseName, schemaName, event);
}
}
private boolean isViewMetaDataChanged(final String key) {
- return
ViewMetaDataNodePathParser.getVersion().isActiveVersionPath(key) ||
ViewMetaDataNodePathParser.isViewPath(key);
+ return ViewNodePathParser.getVersion().isActiveVersionPath(key) ||
ViewNodePathParser.isViewPath(key);
}
private void handleViewChanged(final String databaseName, final String
schemaName, final DataChangedEvent event) {
- if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType())
&& ViewMetaDataNodePathParser.getVersion().isActiveVersionPath(event.getKey()))
{
+ if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType())
&& ViewNodePathParser.getVersion().isActiveVersionPath(event.getKey())) {
viewChangedHandler.handleCreatedOrAltered(databaseName,
schemaName, event);
- } else if (Type.DELETED == event.getType() &&
ViewMetaDataNodePathParser.isViewPath(event.getKey())) {
+ } else if (Type.DELETED == event.getType() &&
ViewNodePathParser.isViewPath(event.getKey())) {
viewChangedHandler.handleDropped(databaseName, schemaName, event);
}
}
private void handleDataSourceChanged(final String databaseName, final
DataChangedEvent event) {
- Optional<String> storageUnitName =
DataSourceMetaDataNodePathParser.getStorageUnitVersion().findIdentifierByActiveVersionPath(event.getKey(),
2);
+ Optional<String> storageUnitName =
DataSourceNodePathParser.getStorageUnitVersion().findIdentifierByActiveVersionPath(event.getKey(),
2);
boolean isActiveVersion = true;
if (!storageUnitName.isPresent()) {
- storageUnitName =
DataSourceMetaDataNodePathParser.findStorageUnitNameByStorageUnitPath(event.getKey());
+ storageUnitName =
DataSourceNodePathParser.findStorageUnitNameByStorageUnitPath(event.getKey());
isActiveVersion = false;
}
if (storageUnitName.isPresent()) {
handleStorageUnitChanged(databaseName, event,
storageUnitName.get(), isActiveVersion);
return;
}
- Optional<String> storageNodeName =
DataSourceMetaDataNodePathParser.getStorageNodeVersion().findIdentifierByActiveVersionPath(event.getKey(),
2);
+ Optional<String> storageNodeName =
DataSourceNodePathParser.getStorageNodeVersion().findIdentifierByActiveVersionPath(event.getKey(),
2);
isActiveVersion = true;
if (!storageNodeName.isPresent()) {
- storageNodeName =
DataSourceMetaDataNodePathParser.findStorageNodeNameByStorageNodePath(event.getKey());
+ storageNodeName =
DataSourceNodePathParser.findStorageNodeNameByStorageNodePath(event.getKey());
isActiveVersion = false;
}
if (storageNodeName.isPresent()) {
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 3b309b2f745..80e18d5f10d 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
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.checker.ActiveVersionChecker;
import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.TableMetaDataNodePathParser;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePathParser;
/**
* Table changed handler.
@@ -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.getVersion().findIdentifierByActiveVersionPath(event.getKey(),
3)
+ String tableName =
TableNodePathParser.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);
@@ -62,7 +62,7 @@ public final class TableChangedHandler {
* @param event data changed event
*/
public void handleDropped(final String databaseName, final String
schemaName, final DataChangedEvent event) {
- String tableName =
TableMetaDataNodePathParser.findTableName(event.getKey()).orElseThrow(() -> new
IllegalStateException("Table name not found."));
+ String tableName =
TableNodePathParser.findTableName(event.getKey()).orElseThrow(() -> new
IllegalStateException("Table name not found."));
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropTable(databaseName,
schemaName, tableName);
statisticsRefreshEngine.asyncRefresh();
}
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 63861195225..53ee2c52b81 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
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.checker.ActiveVersionChecker;
import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
-import
org.apache.shardingsphere.mode.node.path.metadata.database.ViewMetaDataNodePathParser;
+import
org.apache.shardingsphere.mode.node.path.metadata.database.ViewNodePathParser;
/**
* View changed handler.
@@ -47,7 +47,7 @@ public final class ViewChangedHandler {
*/
public void handleCreatedOrAltered(final String databaseName, final String
schemaName, final DataChangedEvent event) {
String viewName =
-
ViewMetaDataNodePathParser.getVersion().findIdentifierByActiveVersionPath(event.getKey(),
3).orElseThrow(() -> new IllegalStateException("View name not found."));
+
ViewNodePathParser.getVersion().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);
@@ -62,7 +62,7 @@ public final class ViewChangedHandler {
* @param event data changed event
*/
public void handleDropped(final String databaseName, final String
schemaName, final DataChangedEvent event) {
- String viewName =
ViewMetaDataNodePathParser.findViewName(event.getKey()).orElseThrow(() -> new
IllegalStateException("View name not found."));
+ String viewName =
ViewNodePathParser.findViewName(event.getKey()).orElseThrow(() -> new
IllegalStateException("View name not found."));
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropView(databaseName,
schemaName, viewName);
statisticsRefreshEngine.asyncRefresh();
}
