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 118209d57ba Refactor DatabaseMetaDataNode (#34254)
118209d57ba is described below
commit 118209d57bac0a53c579ca4e97f3c6fc71e6b182
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 5 13:09:38 2025 +0800
Refactor DatabaseMetaDataNode (#34254)
* Refactor SwitchingTransactionRuleTestCase
* Refactor DatabaseMetaDataNode
* Refactor DatabaseMetaDataNode
* Refactor DatabaseMetaDataNodePath
* Refactor DatabaseMetaDataNodePath
---
.../persist/node/DatabaseMetaDataNode.java | 152 ---------------------
.../persist/node/DatabaseMetaDataNodePath.java | 134 ++++++++++++++++++
.../database/DatabaseMetaDataPersistService.java | 8 +-
.../schema/SchemaMetaDataPersistService.java | 8 +-
.../version/MetaDataVersionPersistService.java | 4 +-
.../persist/node/DatabaseMetaDataNodePathTest.java | 112 +++++++++++++++
.../persist/node/DatabaseMetaDataNodeTest.java | 108 ---------------
.../mode/manager/ContextManagerTest.java | 4 +-
.../database/metadata/MetaDataChangedHandler.java | 6 +-
.../global/ListenerAssistedChangedHandler.java | 6 +-
.../listener/DataChangedEventListenerRegistry.java | 4 +-
.../type/DatabaseMetaDataChangedListener.java | 4 +-
12 files changed, 268 insertions(+), 282 deletions(-)
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNode.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNode.java
deleted file mode 100644
index c35a9ef2aa4..00000000000
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNode.java
+++ /dev/null
@@ -1,152 +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.metadata.persist.node;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Database meta data node.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseMetaDataNode {
-
- private static final String ROOT_NODE = "metadata";
-
- private static final String SCHEMAS_NODE = "schemas";
-
- private static final String TABLES_NODE = "tables";
-
- private static final String ACTIVE_VERSION = "active_version";
-
- private static final String VERSIONS = "versions";
-
- /**
- * Get database name path.
- *
- * @param databaseName database name
- * @return database name path
- */
- public static String getDatabaseNamePath(final String databaseName) {
- return String.join("/", getMetaDataNode(), databaseName);
- }
-
- /**
- * Get schema path.
- *
- * @param databaseName database name
- * @param schemaName schema name
- * @return tables path
- */
- public static String getMetaDataSchemaPath(final String databaseName,
final String schemaName) {
- return String.join("/", getMetaDataSchemasPath(databaseName),
schemaName);
- }
-
- /**
- * Get meta data schemas path.
- *
- * @param databaseName database name
- * @return schemas path
- */
- public static String getMetaDataSchemasPath(final String databaseName) {
- return String.join("/", getDatabaseNamePath(databaseName),
SCHEMAS_NODE);
- }
-
- /**
- * Get meta data tables path.
- *
- * @param databaseName database name
- * @param schemaName schema name
- * @return tables path
- */
- public static String getMetaDataTablesPath(final String databaseName,
final String schemaName) {
- return String.join("/", getMetaDataSchemaPath(databaseName,
schemaName), TABLES_NODE);
- }
-
- /**
- * Get database name.
- *
- * @param path path
- * @return database name
- */
- public static Optional<String> getDatabaseName(final String path) {
- Pattern pattern = Pattern.compile(getMetaDataNode() + "/([\\w\\-]+)$",
Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(path);
- return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
- }
-
- /**
- * Get database name by schema path.
- *
- * @param schemaPath database path
- * @return database name
- */
- public static Optional<String> getDatabaseNameBySchemaNode(final String
schemaPath) {
- Pattern pattern = Pattern.compile(getMetaDataNode() + "/([\\w\\-]+)?",
Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(schemaPath);
- return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
- }
-
- /**
- * Get schema name.
- *
- * @param path path
- * @return schema name
- */
- public static Optional<String> getSchemaName(final String path) {
- Pattern pattern = Pattern.compile(getMetaDataNode() +
"/([\\w\\-]+)/schemas/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(path);
- return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
- }
-
- /**
- * Get schema name by table path.
- *
- * @param tablePath table path
- * @return schema name
- */
- public static Optional<String> getSchemaNameByTableNode(final String
tablePath) {
- Pattern pattern = Pattern.compile(getMetaDataNode() +
"/([\\w\\-]+)/schemas/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(tablePath);
- return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
- }
-
- /**
- * Get version node by active version path.
- *
- * @param rulePath rule path
- * @param activeVersion active version
- * @return active version node
- */
- public static String getVersionNodeByActiveVersionPath(final String
rulePath, final String activeVersion) {
- return rulePath.replace(ACTIVE_VERSION, VERSIONS) + "/" +
activeVersion;
- }
-
- /**
- * Get meta data node.
- *
- * @return meta data node
- */
- public static String getMetaDataNode() {
- return String.join("/", "", ROOT_NODE);
- }
-}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePath.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePath.java
new file mode 100644
index 00000000000..76f98613910
--- /dev/null
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePath.java
@@ -0,0 +1,134 @@
+/*
+ * 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.metadata.persist.node;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Database meta data node path.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class DatabaseMetaDataNodePath {
+
+ private static final String ROOT_NODE = "metadata";
+
+ private static final String SCHEMAS_NODE = "schemas";
+
+ private static final String TABLES_NODE = "tables";
+
+ private static final String ACTIVE_VERSION = "active_version";
+
+ private static final String VERSIONS = "versions";
+
+ private static final String IDENTIFIER_PATTERN = "([\\w\\-]+)";
+
+ /**
+ * Get meta data root path.
+ *
+ * @return meta data root path
+ */
+ public static String getRootPath() {
+ return String.join("/", "", ROOT_NODE);
+ }
+
+ /**
+ * Get database path.
+ *
+ * @param databaseName database name
+ * @return database path
+ */
+ public static String getDatabasePath(final String databaseName) {
+ return String.join("/", getRootPath(), databaseName);
+ }
+
+ /**
+ * Get schemas path.
+ *
+ * @param databaseName database name
+ * @return schemas path
+ */
+ public static String getSchemasPath(final String databaseName) {
+ return String.join("/", getDatabasePath(databaseName), SCHEMAS_NODE);
+ }
+
+ /**
+ * Get schema path.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ * @return schema path
+ */
+ public static String getSchemaPath(final String databaseName, final String
schemaName) {
+ return String.join("/", getSchemasPath(databaseName), schemaName);
+ }
+
+ /**
+ * Get tables path.
+ *
+ * @param databaseName database name
+ * @param schemaName schema name
+ * @return tables path
+ */
+ public static String getTablesPath(final String databaseName, final String
schemaName) {
+ return String.join("/", getSchemaPath(databaseName, schemaName),
TABLES_NODE);
+ }
+
+ /**
+ * Get version path.
+ *
+ * @param rulePath rule path
+ * @param activeVersion active version
+ * @return version path
+ */
+ public static String getVersionPath(final String rulePath, final String
activeVersion) {
+ return rulePath.replace(ACTIVE_VERSION, VERSIONS) + "/" +
activeVersion;
+ }
+
+ /**
+ * Find database name.
+ *
+ * @param path path
+ * @param containsChildPath whether contains child path
+ * @return found database name
+ */
+ public static Optional<String> findDatabaseName(final String path, final
boolean containsChildPath) {
+ String endPattern = containsChildPath ? "?" : "$";
+ Pattern pattern = Pattern.compile(getDatabasePath(IDENTIFIER_PATTERN)
+ endPattern, Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
+ }
+
+ /**
+ * Find schema name.
+ *
+ * @param path path
+ * @param containsChildPath whether contains child path
+ * @return found schema name
+ */
+ public static Optional<String> findSchemaName(final String path, final
boolean containsChildPath) {
+ String endPattern = containsChildPath ? "?" : "$";
+ Pattern pattern = Pattern.compile(getSchemaPath(IDENTIFIER_PATTERN,
IDENTIFIER_PATTERN) + endPattern, Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
+ }
+}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/database/DatabaseMetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/database/DatabaseMetaDataPersistService.java
index 997d0156efe..6cbc6844bab 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/database/DatabaseMetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/database/DatabaseMetaDataPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.metadata.persist.service.metadata.database;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import java.util.Collection;
@@ -37,7 +37,7 @@ public final class DatabaseMetaDataPersistService {
* @param databaseName to be added database name
*/
public void add(final String databaseName) {
-
repository.persist(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), "");
+
repository.persist(DatabaseMetaDataNodePath.getDatabasePath(databaseName), "");
}
/**
@@ -46,7 +46,7 @@ public final class DatabaseMetaDataPersistService {
* @param databaseName to be dropped database name
*/
public void drop(final String databaseName) {
-
repository.delete(DatabaseMetaDataNode.getDatabaseNamePath(databaseName));
+
repository.delete(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
}
/**
@@ -55,6 +55,6 @@ public final class DatabaseMetaDataPersistService {
* @return loaded database names
*/
public Collection<String> loadAllDatabaseNames() {
- return
repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataNode());
+ return
repository.getChildrenKeys(DatabaseMetaDataNodePath.getRootPath());
}
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/schema/SchemaMetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/schema/SchemaMetaDataPersistService.java
index 3c49e1d4941..dce6e869610 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/schema/SchemaMetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/schema/SchemaMetaDataPersistService.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.metadata.persist.service.metadata.schema;
import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
-import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import
org.apache.shardingsphere.metadata.persist.service.metadata.table.TableMetaDataPersistService;
import
org.apache.shardingsphere.metadata.persist.service.metadata.table.ViewMetaDataPersistService;
import
org.apache.shardingsphere.metadata.persist.service.version.MetaDataVersionPersistService;
@@ -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(DatabaseMetaDataNode.getMetaDataTablesPath(databaseName,
schemaName), "");
+
repository.persist(DatabaseMetaDataNodePath.getTablesPath(databaseName,
schemaName), "");
}
/**
@@ -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(DatabaseMetaDataNode.getMetaDataSchemaPath(databaseName,
schemaName));
+ repository.delete(DatabaseMetaDataNodePath.getSchemaPath(databaseName,
schemaName));
}
/**
@@ -113,7 +113,7 @@ public final class SchemaMetaDataPersistService {
* @return schemas
*/
public Collection<ShardingSphereSchema> load(final String databaseName) {
- return
repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataSchemasPath(databaseName)).stream()
+ return
repository.getChildrenKeys(DatabaseMetaDataNodePath.getSchemasPath(databaseName)).stream()
.map(each -> new ShardingSphereSchema(each,
tableMetaDataPersistService.load(databaseName, each),
viewMetaDataPersistService.load(databaseName,
each))).collect(Collectors.toList());
}
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
index ea7a36d1800..6db7277591c 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.metadata.persist.service.version;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
-import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import java.util.Collection;
@@ -55,7 +55,7 @@ public final class MetaDataVersionPersistService implements
MetaDataVersionBased
@Override
public String getVersionPathByActiveVersion(final String path, final
String activeVersion) {
- return
repository.query(DatabaseMetaDataNode.getVersionNodeByActiveVersionPath(path,
activeVersion));
+ return repository.query(DatabaseMetaDataNodePath.getVersionPath(path,
activeVersion));
}
@Override
diff --git
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePathTest.java
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePathTest.java
new file mode 100644
index 00000000000..fedbb260054
--- /dev/null
+++
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePathTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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.metadata.persist.node;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class DatabaseMetaDataNodePathTest {
+
+ @Test
+ void assertGetRootPath() {
+ assertThat(DatabaseMetaDataNodePath.getRootPath(), is("/metadata"));
+ }
+
+ @Test
+ void assertGetDatabasePath() {
+ assertThat(DatabaseMetaDataNodePath.getDatabasePath("foo_db"),
is("/metadata/foo_db"));
+ }
+
+ @Test
+ void assertGetSchemasPath() {
+ assertThat(DatabaseMetaDataNodePath.getSchemasPath("foo_db"),
is("/metadata/foo_db/schemas"));
+ }
+
+ @Test
+ void assertGetSchemaPath() {
+ assertThat(DatabaseMetaDataNodePath.getSchemaPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
+ }
+
+ @Test
+ void assertGetTablesPath() {
+ assertThat(DatabaseMetaDataNodePath.getTablesPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/tables"));
+ }
+
+ @Test
+ void assertGetVersionPath() {
+ assertThat(DatabaseMetaDataNodePath.getVersionPath("foo_rule", "1"),
is("foo_rule/1"));
+ }
+
+ @Test
+ void assertFindDatabaseNameWithNotContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findDatabaseName("/metadata/foo_db", false);
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_db"));
+ }
+
+ @Test
+ void assertNotFindDatabaseNameWithNotContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findDatabaseName("/metadata/foo_db/schemas/foo_schema",
false);
+ assertFalse(actual.isPresent());
+ }
+
+ @Test
+ void assertFindDatabaseNameWithContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findDatabaseName("/metadata/foo_db/schemas/foo_schema",
true);
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_db"));
+ }
+
+ @Test
+ void assertNotFindDatabaseNameWithContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findDatabaseName("/xxx/foo_db/schemas/foo_schema",
true);
+ assertFalse(actual.isPresent());
+ }
+
+ @Test
+ void assertFindSchemaNameWithNotContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findSchemaName("/metadata/foo_db/schemas/foo_schema",
false);
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_schema"));
+ }
+
+ @Test
+ void assertNotFindSchemaNameWithNotContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
false);
+ assertFalse(actual.isPresent());
+ }
+
+ @Test
+ void assertFindSchemaNameWithContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
true);
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_schema"));
+ }
+
+ @Test
+ void assertNotFindSchemaNameWithContainsChildPath() {
+ Optional<String> actual =
DatabaseMetaDataNodePath.findSchemaName("/xxx/foo_db/schemas/foo_schema/tables",
true);
+ assertFalse(actual.isPresent());
+ }
+}
diff --git
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodeTest.java
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodeTest.java
deleted file mode 100644
index 6ae6e5134f5..00000000000
---
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodeTest.java
+++ /dev/null
@@ -1,108 +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.metadata.persist.node;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.Optional;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class DatabaseMetaDataNodeTest {
-
- @Test
- void assertGetDatabaseNamePath() {
- assertThat(DatabaseMetaDataNode.getDatabaseNamePath("foo_db"),
is("/metadata/foo_db"));
- }
-
- @Test
- void assertGetMetaDataSchemaPath() {
- assertThat(DatabaseMetaDataNode.getMetaDataSchemaPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
- }
-
- @Test
- void assertGetMetaDataSchemasPath() {
- assertThat(DatabaseMetaDataNode.getMetaDataSchemasPath("foo_db"),
is("/metadata/foo_db/schemas"));
- }
-
- @Test
- void assertGetMetaDataTablesPath() {
- assertThat(DatabaseMetaDataNode.getMetaDataTablesPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema/tables"));
- }
-
- @Test
- void assertGetDatabaseName() {
- Optional<String> actual =
DatabaseMetaDataNode.getDatabaseName("/metadata/foo_db");
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_db"));
- }
-
- @Test
- void assertGetDatabaseNameIfNotFound() {
-
assertFalse(DatabaseMetaDataNode.getDatabaseName("/metadata").isPresent());
- }
-
- @Test
- void assertGetDatabaseNameBySchemaNode() {
- Optional<String> actual =
DatabaseMetaDataNode.getDatabaseNameBySchemaNode("/metadata/foo_db/schemas/foo_schema");
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_db"));
- }
-
- @Test
- void assertGetDatabaseNameBySchemaNodeIfNotFound() {
-
assertFalse(DatabaseMetaDataNode.getDatabaseNameBySchemaNode("/xxx/foo_db").isPresent());
- }
-
- @Test
- void assertGetSchemaName() {
- Optional<String> actual =
DatabaseMetaDataNode.getSchemaName("/metadata/foo_db/schemas/foo_schema");
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_schema"));
- }
-
- @Test
- void assertGetSchemaNameIfNotFound() {
-
assertFalse(DatabaseMetaDataNode.getSchemaName("/metadata/foo_db/xxx/foo_schema").isPresent());
- }
-
- @Test
- void assertGetSchemaNameByTableNode() {
- Optional<String> actual =
DatabaseMetaDataNode.getSchemaNameByTableNode("/metadata/foo_db/schemas/foo_schema/tables");
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_schema"));
- }
-
- @Test
- void assertGetSchemaNameByTableNodeIfNotFound() {
-
assertFalse(DatabaseMetaDataNode.getSchemaNameByTableNode("/xxx/foo_db/schemas/foo_schema/tables").isPresent());
- }
-
- @Test
- void assertGetVersionNodeByActiveVersionPath() {
-
assertThat(DatabaseMetaDataNode.getVersionNodeByActiveVersionPath("foo_rule",
"1"), is("foo_rule/1"));
- }
-
- @Test
- void assertGetMetaDataNode() {
- assertThat(DatabaseMetaDataNode.getMetaDataNode(), is("/metadata"));
- }
-}
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 d06f2292f89..7f7c4a030c9 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
@@ -37,7 +37,7 @@ import
org.apache.shardingsphere.infra.rule.ShardingSphereRule;
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.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
@@ -153,7 +153,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(DatabaseMetaDataNode.getMetaDataSchemaPath("foo_db",
"foo_schema"));
+
verify(contextManager.getPersistServiceFacade().getRepository()).delete(DatabaseMetaDataNodePath.getSchemaPath("foo_db",
"foo_schema"));
}
@Test
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 014b6bad9f5..405cb3216a6 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
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata;
-import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import
org.apache.shardingsphere.metadata.persist.node.metadata.DataSourceMetaDataNode;
import
org.apache.shardingsphere.metadata.persist.node.metadata.TableMetaDataNode;
import
org.apache.shardingsphere.metadata.persist.node.metadata.ViewMetaDataNode;
@@ -59,12 +59,12 @@ public final class MetaDataChangedHandler {
*/
public boolean handle(final String databaseName, final DataChangedEvent
event) {
String eventKey = event.getKey();
- Optional<String> schemaName =
DatabaseMetaDataNode.getSchemaName(eventKey);
+ Optional<String> schemaName =
DatabaseMetaDataNodePath.findSchemaName(eventKey, false);
if (schemaName.isPresent()) {
handleSchemaChanged(databaseName, schemaName.get(), event);
return true;
}
- schemaName = DatabaseMetaDataNode.getSchemaNameByTableNode(eventKey);
+ schemaName = DatabaseMetaDataNodePath.findSchemaName(eventKey, true);
if (schemaName.isPresent() && isTableMetaDataChanged(eventKey)) {
handleTableChanged(databaseName, schemaName.get(), event);
return true;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
index b8722aad899..fcd761fc053 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
-import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import org.apache.shardingsphere.metadata.persist.node.StatesNode;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
@@ -55,10 +55,10 @@ public final class ListenerAssistedChangedHandler
implements DataChangedEventHan
private static void handle(final ContextManager contextManager, final
String databaseName, final ListenerAssistedType listenerAssistedType) {
ClusterPersistRepository repository = (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
if (ListenerAssistedType.CREATE_DATABASE == listenerAssistedType) {
-
repository.watch(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
+
repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(databaseName);
} else if (ListenerAssistedType.DROP_DATABASE == listenerAssistedType)
{
-
repository.removeDataListener(DatabaseMetaDataNode.getDatabaseNamePath(databaseName));
+
repository.removeDataListener(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(databaseName);
}
contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(databaseName);
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
index 715e4e1c2db..905d8e977b0 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.dispatch.listener;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.DatabaseMetaDataChangedListener;
@@ -53,7 +53,7 @@ public final class DataChangedEventListenerRegistry {
}
private void registerDatabaseListeners(final String databaseName) {
-
repository.watch(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
+
repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
}
private void registerGlobalHandlers(final DataChangedEventHandler handler)
{
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
index 3c26fbb4f60..ead588692e7 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.exception.core.external.sql.type.wrapper.SQLWrapperException;
import
org.apache.shardingsphere.infra.spi.type.ordered.cache.OrderedServicesCache;
-import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
+import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.MetaDataChangedHandler;
@@ -40,7 +40,7 @@ public final class DatabaseMetaDataChangedListener implements
DataChangedEventLi
@Override
public void onChange(final DataChangedEvent event) {
- Optional<String> databaseName =
DatabaseMetaDataNode.getDatabaseNameBySchemaNode(event.getKey());
+ Optional<String> databaseName =
DatabaseMetaDataNodePath.findDatabaseName(event.getKey(), true);
if (!databaseName.isPresent()) {
return;
}
