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 8b9129bdab7 Rename SchemaMetaDataNodePath (#34964)
8b9129bdab7 is described below
commit 8b9129bdab79376df47f17e3dadbe079a24b6e7a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Mar 13 10:09:03 2025 +0800
Rename SchemaMetaDataNodePath (#34964)
---
.../metadata/service/SchemaMetaDataPersistService.java | 10 +++++-----
.../metadata/service/TableMetaDataPersistService.java | 10 +++++-----
.../metadata/service/ViewMetaDataPersistService.java | 10 +++++-----
...tadataNodePath.java => SchemaMetaDataNodePath.java} | 8 ++++----
...etadataNodePath.java => TableMetaDataNodePath.java} | 12 ++++++------
...MetadataNodePath.java => ViewMetaDataNodePath.java} | 12 ++++++------
...dePathTest.java => SchemaMetaDataNodePathTest.java} | 16 ++++++++--------
...odePathTest.java => TableMetaDataNodePathTest.java} | 18 +++++++++---------
...NodePathTest.java => ViewMetaDataNodePathTest.java} | 18 +++++++++---------
.../mode/node/path/version/VersionNodePathTest.java | 12 ++++++------
.../database/metadata/SchemaChangedHandler.java | 6 +++---
.../handler/database/metadata/TableChangedHandler.java | 10 +++++-----
.../handler/database/metadata/ViewChangedHandler.java | 10 +++++-----
13 files changed, 76 insertions(+), 76 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
index 3c97ccd0256..7742480610f 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
@@ -21,8 +21,8 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericS
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.mode.metadata.persist.version.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetadataNodePath;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetaDataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetaDataNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
@@ -53,7 +53,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName to be added schema name
*/
public void add(final String databaseName, final String schemaName) {
- repository.persist(NodePathGenerator.toPath(new
TableMetadataNodePath(databaseName, schemaName, null), false), "");
+ repository.persist(NodePathGenerator.toPath(new
TableMetaDataNodePath(databaseName, schemaName, null), false), "");
}
/**
@@ -63,7 +63,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName to be dropped schema name
*/
public void drop(final String databaseName, final String schemaName) {
- repository.delete(NodePathGenerator.toPath(new
SchemaMetadataNodePath(databaseName, schemaName), false));
+ repository.delete(NodePathGenerator.toPath(new
SchemaMetaDataNodePath(databaseName, schemaName), false));
}
/**
@@ -113,7 +113,7 @@ public final class SchemaMetaDataPersistService {
* @return schemas
*/
public Collection<ShardingSphereSchema> load(final String databaseName) {
- return repository.getChildrenKeys(NodePathGenerator.toPath(new
SchemaMetadataNodePath(databaseName, null), false)).stream()
+ return repository.getChildrenKeys(NodePathGenerator.toPath(new
SchemaMetaDataNodePath(databaseName, null), false)).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 1dd0e0c6e58..6c1c5428a61 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
@@ -24,7 +24,7 @@ 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.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetaDataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -51,7 +51,7 @@ public final class TableMetaDataPersistService {
* @return loaded tables
*/
public Collection<ShardingSphereTable> load(final String databaseName,
final String schemaName) {
- return repository.getChildrenKeys(NodePathGenerator.toPath(new
TableMetadataNodePath(databaseName, schemaName, null), false)).stream()
+ return repository.getChildrenKeys(NodePathGenerator.toPath(new
TableMetaDataNodePath(databaseName, schemaName, null), false)).stream()
.map(each -> load(databaseName, schemaName,
each)).collect(Collectors.toList());
}
@@ -64,7 +64,7 @@ public final class TableMetaDataPersistService {
* @return loaded table
*/
public ShardingSphereTable load(final String databaseName, final String
schemaName, final String tableName) {
- VersionNodePath versionNodePath = new VersionNodePath(new
TableMetadataNodePath(databaseName, schemaName, tableName));
+ VersionNodePath versionNodePath = new VersionNodePath(new
TableMetaDataNodePath(databaseName, schemaName, tableName));
int activeVersion =
Integer.parseInt(repository.query(versionNodePath.getActiveVersionPath()));
String tableContent =
repository.query(versionNodePath.getVersionPath(activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(tableContent,
YamlShardingSphereTable.class));
@@ -80,7 +80,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();
- VersionNodePath versionNodePath = new VersionNodePath(new
TableMetadataNodePath(databaseName, schemaName, tableName));
+ VersionNodePath versionNodePath = new VersionNodePath(new
TableMetaDataNodePath(databaseName, schemaName, tableName));
versionPersistService.persist(versionNodePath,
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
@@ -93,7 +93,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(NodePathGenerator.toPath(new
TableMetadataNodePath(databaseName, schemaName, tableName.toLowerCase()),
false));
+ repository.delete(NodePathGenerator.toPath(new
TableMetaDataNodePath(databaseName, schemaName, tableName.toLowerCase()),
false));
}
/**
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 8a8eff2cac5..82e48ecc70b 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
@@ -24,7 +24,7 @@ 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.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetaDataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -51,7 +51,7 @@ public final class ViewMetaDataPersistService {
* @return loaded views
*/
public Collection<ShardingSphereView> load(final String databaseName,
final String schemaName) {
- return repository.getChildrenKeys(NodePathGenerator.toPath(new
ViewMetadataNodePath(databaseName, schemaName, null), false)).stream()
+ return repository.getChildrenKeys(NodePathGenerator.toPath(new
ViewMetaDataNodePath(databaseName, schemaName, null), false)).stream()
.map(each -> load(databaseName, schemaName,
each)).collect(Collectors.toList());
}
@@ -64,7 +64,7 @@ public final class ViewMetaDataPersistService {
* @return loaded view
*/
public ShardingSphereView load(final String databaseName, final String
schemaName, final String viewName) {
- VersionNodePath versionNodePath = new VersionNodePath(new
ViewMetadataNodePath(databaseName, schemaName, viewName));
+ VersionNodePath versionNodePath = new VersionNodePath(new
ViewMetaDataNodePath(databaseName, schemaName, viewName));
int activeVersion =
Integer.parseInt(repository.query(versionNodePath.getActiveVersionPath()));
String view =
repository.query(versionNodePath.getVersionPath(activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(view,
YamlShardingSphereView.class));
@@ -80,7 +80,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();
- VersionNodePath versionNodePath = new VersionNodePath(new
ViewMetadataNodePath(databaseName, schemaName, viewName));
+ VersionNodePath versionNodePath = new VersionNodePath(new
ViewMetaDataNodePath(databaseName, schemaName, viewName));
versionPersistService.persist(versionNodePath,
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
@@ -93,6 +93,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(NodePathGenerator.toPath(new
ViewMetadataNodePath(databaseName, schemaName, viewName.toLowerCase()), false));
+ repository.delete(NodePathGenerator.toPath(new
ViewMetaDataNodePath(databaseName, schemaName, viewName.toLowerCase()), false));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetadataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
similarity index 90%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetadataNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
index adec07e1e8d..9478a85bac3 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetadataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
@@ -25,17 +25,17 @@ import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearchCr
import
org.apache.shardingsphere.mode.node.path.type.database.metadata.DatabaseMetaDataNodePath;
/**
- * Schema metadata node path.
+ * Schema meta data node path.
*/
@NodePathEntity("${database}/schemas/${schemaName}")
@Getter
-public final class SchemaMetadataNodePath implements NodePath {
+public final class SchemaMetaDataNodePath implements NodePath {
private final DatabaseMetaDataNodePath database;
private final String schemaName;
- public SchemaMetadataNodePath(final String databaseName, final String
schemaName) {
+ public SchemaMetaDataNodePath(final String databaseName, final String
schemaName) {
database = new DatabaseMetaDataNodePath(databaseName);
this.schemaName = schemaName;
}
@@ -48,6 +48,6 @@ public final class SchemaMetadataNodePath implements NodePath
{
* @return created search criteria
*/
public static NodePathSearchCriteria createSchemaSearchCriteria(final
String databaseName, final boolean containsChildPath) {
- return new NodePathSearchCriteria(new
SchemaMetadataNodePath(databaseName, NodePathPattern.IDENTIFIER), false,
containsChildPath, 1);
+ return new NodePathSearchCriteria(new
SchemaMetaDataNodePath(databaseName, NodePathPattern.IDENTIFIER), false,
containsChildPath, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetadataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
similarity index 84%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetadataNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
index 56ac9ac1ac8..61453c6141c 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetadataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
@@ -24,18 +24,18 @@ import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearchCriteria;
/**
- * Table metadata node path.
+ * Table meta data node path.
*/
@NodePathEntity("${schema}/tables/${tableName}")
@Getter
-public final class TableMetadataNodePath implements NodePath {
+public final class TableMetaDataNodePath implements NodePath {
- private final SchemaMetadataNodePath schema;
+ private final SchemaMetaDataNodePath schema;
private final String tableName;
- public TableMetadataNodePath(final String databaseName, final String
schemaName, final String tableName) {
- schema = new SchemaMetadataNodePath(databaseName, schemaName);
+ public TableMetaDataNodePath(final String databaseName, final String
schemaName, final String tableName) {
+ schema = new SchemaMetaDataNodePath(databaseName, schemaName);
this.tableName = tableName;
}
@@ -47,6 +47,6 @@ public final class TableMetadataNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createTableSearchCriteria(final
String databaseName, final String schemaName) {
- return new NodePathSearchCriteria(new
TableMetadataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
false, true, 1);
+ return new NodePathSearchCriteria(new
TableMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
false, true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetadataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
similarity index 84%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetadataNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
index 4efef155686..deb06d04626 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetadataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
@@ -25,19 +25,19 @@ import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearchCriteria;
/**
- * View metadata node path.
+ * View meta data node path.
*/
@NodePathEntity("${schema}/views/${viewName}")
@RequiredArgsConstructor
@Getter
-public final class ViewMetadataNodePath implements NodePath {
+public final class ViewMetaDataNodePath implements NodePath {
- private final SchemaMetadataNodePath schema;
+ private final SchemaMetaDataNodePath schema;
private final String viewName;
- public ViewMetadataNodePath(final String databaseName, final String
schemaName, final String viewName) {
- schema = new SchemaMetadataNodePath(databaseName, schemaName);
+ public ViewMetaDataNodePath(final String databaseName, final String
schemaName, final String viewName) {
+ schema = new SchemaMetaDataNodePath(databaseName, schemaName);
this.viewName = viewName;
}
@@ -49,6 +49,6 @@ public final class ViewMetadataNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createViewSearchCriteria(final String
databaseName, final String schemaName) {
- return new NodePathSearchCriteria(new
ViewMetadataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
false, true, 1);
+ return new NodePathSearchCriteria(new
ViewMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
false, true, 1);
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/SchemaMetadataNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/SchemaMetaDataNodePathTest.java
similarity index 81%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/SchemaMetadataNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/SchemaMetaDataNodePathTest.java
index 8a763f5d43b..03a4a91ebca 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/SchemaMetadataNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/SchemaMetaDataNodePathTest.java
@@ -19,26 +19,26 @@ package
org.apache.shardingsphere.mode.node.path.type.database.metadata.database
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetaDataNodePath;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
-class SchemaMetadataNodePathTest {
+class SchemaMetaDataNodePathTest {
@Test
void assertToPath() {
- assertThat(NodePathGenerator.toPath(new
SchemaMetadataNodePath("foo_db", null), false), is("/metadata/foo_db/schemas"));
+ assertThat(NodePathGenerator.toPath(new
SchemaMetaDataNodePath("foo_db", null), false), is("/metadata/foo_db/schemas"));
}
@Test
void assertCreateSchemaSearchCriteria() {
- assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema",
SchemaMetadataNodePath.createSchemaSearchCriteria("foo_db", false)),
is("foo_schema"));
-
assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema/tables",
SchemaMetadataNodePath.createSchemaSearchCriteria("foo_db", true)),
is("foo_schema"));
-
assertFalse(NodePathSearcher.find("/metadata/foo_db/schemas/foo_schema/tables",
SchemaMetadataNodePath.createSchemaSearchCriteria("foo_db",
false)).isPresent());
-
assertFalse(NodePathSearcher.find("/xxx/foo_db/schemas/foo_schema/tables",
SchemaMetadataNodePath.createSchemaSearchCriteria("foo_db", true)).isPresent());
-
assertFalse(NodePathSearcher.find("/metadata/bar_db/schemas/foo_schema",
SchemaMetadataNodePath.createSchemaSearchCriteria("foo_db",
false)).isPresent());
+ assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema",
SchemaMetaDataNodePath.createSchemaSearchCriteria("foo_db", false)),
is("foo_schema"));
+
assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema/tables",
SchemaMetaDataNodePath.createSchemaSearchCriteria("foo_db", true)),
is("foo_schema"));
+
assertFalse(NodePathSearcher.find("/metadata/foo_db/schemas/foo_schema/tables",
SchemaMetaDataNodePath.createSchemaSearchCriteria("foo_db",
false)).isPresent());
+
assertFalse(NodePathSearcher.find("/xxx/foo_db/schemas/foo_schema/tables",
SchemaMetaDataNodePath.createSchemaSearchCriteria("foo_db", true)).isPresent());
+
assertFalse(NodePathSearcher.find("/metadata/bar_db/schemas/foo_schema",
SchemaMetaDataNodePath.createSchemaSearchCriteria("foo_db",
false)).isPresent());
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetadataNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetaDataNodePathTest.java
similarity index 84%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetadataNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetaDataNodePathTest.java
index 87479db7c51..0a2397d12d0 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetadataNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetaDataNodePathTest.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.mode.node.path.type.database.metadata.database
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetaDataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.junit.jupiter.api.Test;
@@ -28,18 +28,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class TableMetadataNodePathTest {
+class TableMetaDataNodePathTest {
@Test
void assertToPath() {
- assertThat(NodePathGenerator.toPath(new
TableMetadataNodePath("foo_db", "foo_schema", null), false),
is("/metadata/foo_db/schemas/foo_schema/tables"));
- assertThat(NodePathGenerator.toPath(new
TableMetadataNodePath("foo_db", "foo_schema", "foo_tbl"), false),
+ assertThat(NodePathGenerator.toPath(new
TableMetaDataNodePath("foo_db", "foo_schema", null), false),
is("/metadata/foo_db/schemas/foo_schema/tables"));
+ assertThat(NodePathGenerator.toPath(new
TableMetaDataNodePath("foo_db", "foo_schema", "foo_tbl"), false),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
}
@Test
void assertToVersionPath() {
- VersionNodePath versionNodePath = new VersionNodePath(new
TableMetadataNodePath("foo_db", "foo_schema", "foo_tbl"));
+ VersionNodePath versionNodePath = new VersionNodePath(new
TableMetaDataNodePath("foo_db", "foo_schema", "foo_tbl"));
assertThat(versionNodePath.getActiveVersionPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"));
assertThat(versionNodePath.getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions"));
assertThat(versionNodePath.getVersionPath(0),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0"));
@@ -47,9 +47,9 @@ class TableMetadataNodePathTest {
@Test
void assertCreateTableSearchCriteria() {
-
assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl",
TableMetadataNodePath.createTableSearchCriteria("foo_db", "foo_schema")),
is("foo_tbl"));
-
assertFalse(NodePathSearcher.find("/xxx/foo_db/schemas/foo_schema/tables/foo_tbl",
TableMetadataNodePath.createTableSearchCriteria("foo_db",
"foo_schema")).isPresent());
-
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl",
TableMetadataNodePath.createTableSearchCriteria("foo_db", "foo_schema")));
-
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0",
TableMetadataNodePath.createTableSearchCriteria("foo_db", "foo_schema")));
+
assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl",
TableMetaDataNodePath.createTableSearchCriteria("foo_db", "foo_schema")),
is("foo_tbl"));
+
assertFalse(NodePathSearcher.find("/xxx/foo_db/schemas/foo_schema/tables/foo_tbl",
TableMetaDataNodePath.createTableSearchCriteria("foo_db",
"foo_schema")).isPresent());
+
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl",
TableMetaDataNodePath.createTableSearchCriteria("foo_db", "foo_schema")));
+
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0",
TableMetaDataNodePath.createTableSearchCriteria("foo_db", "foo_schema")));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetadataNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetaDataNodePathTest.java
similarity index 84%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetadataNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetaDataNodePathTest.java
index a905a3d8c6b..4875bf6a2ac 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetadataNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetaDataNodePathTest.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.mode.node.path.type.database.metadata.database
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetaDataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.junit.jupiter.api.Test;
@@ -28,17 +28,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class ViewMetadataNodePathTest {
+class ViewMetaDataNodePathTest {
@Test
void assertToPath() {
- assertThat(NodePathGenerator.toPath(new ViewMetadataNodePath("foo_db",
"foo_schema", null), false), is("/metadata/foo_db/schemas/foo_schema/views"));
- assertThat(NodePathGenerator.toPath(new ViewMetadataNodePath("foo_db",
"foo_schema", "foo_view"), false),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
+ assertThat(NodePathGenerator.toPath(new ViewMetaDataNodePath("foo_db",
"foo_schema", null), false), is("/metadata/foo_db/schemas/foo_schema/views"));
+ assertThat(NodePathGenerator.toPath(new ViewMetaDataNodePath("foo_db",
"foo_schema", "foo_view"), false),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
}
@Test
void assertToVersionPath() {
- VersionNodePath versionNodePath = new VersionNodePath(new
ViewMetadataNodePath("foo_db", "foo_schema", "foo_view"));
+ VersionNodePath versionNodePath = new VersionNodePath(new
ViewMetaDataNodePath("foo_db", "foo_schema", "foo_view"));
assertThat(versionNodePath.getActiveVersionPath(),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version"));
assertThat(versionNodePath.getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions"));
assertThat(versionNodePath.getVersionPath(0),
is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions/0"));
@@ -46,9 +46,9 @@ class ViewMetadataNodePathTest {
@Test
void assertCreateViewSearchCriteria() {
-
assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema/views/foo_view",
ViewMetadataNodePath.createViewSearchCriteria("foo_db", "foo_schema")),
is("foo_view"));
-
assertFalse(NodePathSearcher.find("/xxx/foo_db/schemas/foo_schema/views/foo_view",
ViewMetadataNodePath.createViewSearchCriteria("foo_db",
"foo_schema")).isPresent());
-
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/views/foo_view",
ViewMetadataNodePath.createViewSearchCriteria("foo_db", "foo_schema")));
-
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions/0",
ViewMetadataNodePath.createViewSearchCriteria("foo_db", "foo_schema")));
+
assertThat(NodePathSearcher.get("/metadata/foo_db/schemas/foo_schema/views/foo_view",
ViewMetaDataNodePath.createViewSearchCriteria("foo_db", "foo_schema")),
is("foo_view"));
+
assertFalse(NodePathSearcher.find("/xxx/foo_db/schemas/foo_schema/views/foo_view",
ViewMetaDataNodePath.createViewSearchCriteria("foo_db",
"foo_schema")).isPresent());
+
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/views/foo_view",
ViewMetaDataNodePath.createViewSearchCriteria("foo_db", "foo_schema")));
+
assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions/0",
ViewMetaDataNodePath.createViewSearchCriteria("foo_db", "foo_schema")));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
index fa46267aa98..148cc82a745 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.node.path.version;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetaDataNodePath;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -30,31 +30,31 @@ class VersionNodePathTest {
@Test
void assertGetActiveVersionPath() {
- assertThat(new VersionNodePath(new TableMetadataNodePath("foo_db",
"foo_schema", "foo_tbl")).getActiveVersionPath(),
+ assertThat(new VersionNodePath(new TableMetaDataNodePath("foo_db",
"foo_schema", "foo_tbl")).getActiveVersionPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"));
}
@Test
void assertGetVersionsPath() {
- assertThat(new VersionNodePath(new TableMetadataNodePath("foo_db",
"foo_schema", "foo_tbl")).getVersionsPath(),
+ assertThat(new VersionNodePath(new TableMetaDataNodePath("foo_db",
"foo_schema", "foo_tbl")).getVersionsPath(),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions"));
}
@Test
void assertGetVersionPath() {
- assertThat(new VersionNodePath(new TableMetadataNodePath("foo_db",
"foo_schema", "foo_tbl")).getVersionPath(0),
+ assertThat(new VersionNodePath(new TableMetaDataNodePath("foo_db",
"foo_schema", "foo_tbl")).getVersionPath(0),
is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0"));
}
@Test
void assertIsActiveVersionPath() {
- VersionNodePath versionNodePath = new VersionNodePath(new
TableMetadataNodePath("foo_db", "foo_schema", NodePathPattern.IDENTIFIER));
+ VersionNodePath versionNodePath = new VersionNodePath(new
TableMetaDataNodePath("foo_db", "foo_schema", NodePathPattern.IDENTIFIER));
assertTrue(versionNodePath.isActiveVersionPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"));
}
@Test
void assertIsNotActiveVersionPath() {
- VersionNodePath versionNodePath = new VersionNodePath(new
TableMetadataNodePath("foo_db", "foo_schema", NodePathPattern.IDENTIFIER));
+ VersionNodePath versionNodePath = new VersionNodePath(new
TableMetaDataNodePath("foo_db", "foo_schema", NodePathPattern.IDENTIFIER));
assertFalse(versionNodePath.isActiveVersionPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0"));
assertFalse(versionNodePath.isActiveVersionPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
assertFalse(versionNodePath.isActiveVersionPath("/metadata/bar_db/schemas/foo_schema/tables/foo_tbl/active_version"));
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
index e4577b4b780..db426385b6c 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRe
import org.apache.shardingsphere.mode.node.path.NodePath;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetaDataNodePath;
/**
* Schema changed handler.
@@ -42,12 +42,12 @@ public final class SchemaChangedHandler implements
DatabaseNodeValueChangedHandl
@Override
public NodePath getSubscribedNodePath(final String databaseName) {
- return new SchemaMetadataNodePath(databaseName,
NodePathPattern.IDENTIFIER);
+ return new SchemaMetaDataNodePath(databaseName,
NodePathPattern.IDENTIFIER);
}
@Override
public void handle(final String databaseName, final DataChangedEvent
event) {
- String schemaName = NodePathSearcher.get(event.getKey(),
SchemaMetadataNodePath.createSchemaSearchCriteria(databaseName, false));
+ String schemaName = NodePathSearcher.get(event.getKey(),
SchemaMetaDataNodePath.createSchemaSearchCriteria(databaseName, false));
switch (event.getType()) {
case ADDED:
case UPDATED:
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
index a71a4a6d5ad..7e3cfd580ec 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
@@ -25,8 +25,8 @@ import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRe
import org.apache.shardingsphere.mode.node.path.NodePath;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetadataNodePath;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetaDataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetaDataNodePath;
/**
* Table changed handler.
@@ -44,13 +44,13 @@ public final class TableChangedHandler implements
DatabaseLeafValueChangedHandle
@Override
public NodePath getSubscribedNodePath(final String databaseName) {
- return new TableMetadataNodePath(databaseName,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER);
+ return new TableMetaDataNodePath(databaseName,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER);
}
@Override
public void handle(final String databaseName, final DataChangedEvent
event) {
- String schemaName = NodePathSearcher.get(event.getKey(),
SchemaMetadataNodePath.createSchemaSearchCriteria(databaseName, true));
- String tableName = NodePathSearcher.get(event.getKey(),
TableMetadataNodePath.createTableSearchCriteria(databaseName, schemaName));
+ String schemaName = NodePathSearcher.get(event.getKey(),
SchemaMetaDataNodePath.createSchemaSearchCriteria(databaseName, true));
+ String tableName = NodePathSearcher.get(event.getKey(),
TableMetaDataNodePath.createTableSearchCriteria(databaseName, schemaName));
switch (event.getType()) {
case ADDED:
case UPDATED:
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
index 0d29a249c64..0b0f2df4c81 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
@@ -25,8 +25,8 @@ import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRe
import org.apache.shardingsphere.mode.node.path.NodePath;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetadataNodePath;
-import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.SchemaMetaDataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetaDataNodePath;
/**
* View changed handler.
@@ -44,13 +44,13 @@ public final class ViewChangedHandler implements
DatabaseLeafValueChangedHandler
@Override
public NodePath getSubscribedNodePath(final String databaseName) {
- return new ViewMetadataNodePath(databaseName,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER);
+ return new ViewMetaDataNodePath(databaseName,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER);
}
@Override
public void handle(final String databaseName, final DataChangedEvent
event) {
- String schemaName = NodePathSearcher.get(event.getKey(),
SchemaMetadataNodePath.createSchemaSearchCriteria(databaseName, true));
- String viewName = NodePathSearcher.get(event.getKey(),
ViewMetadataNodePath.createViewSearchCriteria(databaseName, schemaName));
+ String schemaName = NodePathSearcher.get(event.getKey(),
SchemaMetaDataNodePath.createSchemaSearchCriteria(databaseName, true));
+ String viewName = NodePathSearcher.get(event.getKey(),
ViewMetaDataNodePath.createViewSearchCriteria(databaseName, schemaName));
switch (event.getType()) {
case ADDED:
case UPDATED:
