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 fd9234fd4c7 Add MetaDataNodePath (#34677)
fd9234fd4c7 is described below
commit fd9234fd4c7c2203a45368a13abfffbd044cd4d0
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 15 17:23:19 2025 +0800
Add MetaDataNodePath (#34677)
---
.../metadata/database/schema/QualifiedSchema.java | 60 ++++++++++++++++++++++
.../database/schema/QualifiedSchemaTest.java | 24 ++-------
.../service/DatabaseMetaDataPersistService.java | 3 +-
.../mode/node/path/metadata/MetaDataNodePath.java | 33 ++++++++++++
.../DatabaseMetaDataNodePathGenerator.java | 14 +----
.../database/DatabaseMetaDataNodePathParser.java | 23 ++-------
.../DatabaseRuleMetaDataNodePathGenerator.java | 5 +-
.../DataSourceMetaDataNodePathGenerator.java | 5 +-
.../DatabaseMetaDataNodePathGeneratorTest.java | 6 ---
.../DatabaseMetaDataNodePathParserTest.java | 49 +++++-------------
.../database/metadata/MetaDataChangedHandler.java | 17 +++---
.../type/DatabaseMetaDataChangedListener.java | 9 ++--
12 files changed, 137 insertions(+), 111 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedSchema.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedSchema.java
new file mode 100644
index 00000000000..c4bec5ff504
--- /dev/null
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedSchema.java
@@ -0,0 +1,60 @@
+/*
+ * 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.infra.metadata.database.schema;
+
+import lombok.EqualsAndHashCode;
+import
org.apache.shardingsphere.infra.metadata.identifier.ShardingSphereIdentifier;
+
+/**
+ * Qualified schema.
+ */
+@EqualsAndHashCode
+public final class QualifiedSchema {
+
+ private final ShardingSphereIdentifier databaseName;
+
+ private final ShardingSphereIdentifier schemaName;
+
+ public QualifiedSchema(final String databaseName, final String schemaName)
{
+ this.databaseName = new ShardingSphereIdentifier(databaseName);
+ this.schemaName = new ShardingSphereIdentifier(schemaName);
+ }
+
+ /**
+ * Get database name.
+ *
+ * @return database name
+ */
+ public String getDatabaseName() {
+ return databaseName.getValue();
+ }
+
+ /**
+ * Get schema name.
+ *
+ * @return schema name
+ */
+ public String getSchemaName() {
+ return schemaName.getValue();
+ }
+
+ @Override
+ public String toString() {
+ return String.join(".", getDatabaseName(), getSchemaName());
+ }
+}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGeneratorTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedSchemaTest.java
similarity index 54%
copy from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGeneratorTest.java
copy to
infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedSchemaTest.java
index 22724d0c91e..6ff633852e7 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGeneratorTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedSchemaTest.java
@@ -15,33 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.metadata.database;
+package org.apache.shardingsphere.infra.metadata.database.schema;
-import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class DatabaseMetaDataNodePathGeneratorTest {
+class QualifiedSchemaTest {
@Test
- void assertGetRootPath() {
-
MatcherAssert.assertThat(DatabaseMetaDataNodePathGenerator.getRootPath(),
is("/metadata"));
- }
-
- @Test
- void assertGetDatabasePath() {
-
assertThat(DatabaseMetaDataNodePathGenerator.getDatabasePath("foo_db"),
is("/metadata/foo_db"));
- }
-
- @Test
- void assertGetSchemaRootPath() {
-
assertThat(DatabaseMetaDataNodePathGenerator.getSchemaRootPath("foo_db"),
is("/metadata/foo_db/schemas"));
- }
-
- @Test
- void assertGetSchemaPath() {
- assertThat(DatabaseMetaDataNodePathGenerator.getSchemaPath("foo_db",
"foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
+ void assertToString() {
+ assertThat(new QualifiedSchema("foo_db", "foo_schema").toString(),
is("foo_db.foo_schema"));
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
index 83951fac3d1..acccf8b9df7 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.mode.node.path.metadata.MetaDataNodePath;
import
org.apache.shardingsphere.mode.node.path.metadata.database.DatabaseMetaDataNodePathGenerator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -55,6 +56,6 @@ public final class DatabaseMetaDataPersistService {
* @return loaded database names
*/
public Collection<String> loadAllDatabaseNames() {
- return
repository.getChildrenKeys(DatabaseMetaDataNodePathGenerator.getRootPath());
+ return repository.getChildrenKeys(MetaDataNodePath.ROOT_NODE);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/MetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/MetaDataNodePath.java
new file mode 100644
index 00000000000..6afc8a20a12
--- /dev/null
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/MetaDataNodePath.java
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+/**
+ * Meta data node path.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class MetaDataNodePath {
+
+ /**
+ * Root node.
+ */
+ public static final String ROOT_NODE = "/metadata";
+}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGenerator.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGenerator.java
index 8f2b7c85789..07c0dd5a94b 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGenerator.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGenerator.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.mode.node.path.metadata.database;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.mode.node.path.metadata.MetaDataNodePath;
/**
* Database meta data node path generator.
@@ -26,19 +27,8 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DatabaseMetaDataNodePathGenerator {
- private static final String ROOT_NODE = "/metadata";
-
private static final String SCHEMAS_NODE = "schemas";
- /**
- * Get meta data root path.
- *
- * @return meta data root path
- */
- public static String getRootPath() {
- return ROOT_NODE;
- }
-
/**
* Get database path.
*
@@ -46,7 +36,7 @@ public final class DatabaseMetaDataNodePathGenerator {
* @return database path
*/
public static String getDatabasePath(final String databaseName) {
- return String.join("/", getRootPath(), databaseName);
+ return String.join("/", MetaDataNodePath.ROOT_NODE, databaseName);
}
/**
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParser.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParser.java
index 7b011d9e8a4..138d8de5225 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParser.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParser.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.mode.node.path.metadata.database;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedSchema;
import org.apache.shardingsphere.mode.node.path.NodePathPattern;
import java.util.Optional;
@@ -32,30 +33,16 @@ import java.util.regex.Pattern;
public final class DatabaseMetaDataNodePathParser {
/**
- * Find database name.
+ * Find qualified schema.
*
* @param path path
* @param containsChildPath whether contains child path
- * @return found database name
+ * @return found qualified schema
*/
- public static Optional<String> findDatabaseName(final String path, final
boolean containsChildPath) {
- String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
Pattern.compile(DatabaseMetaDataNodePathGenerator.getDatabasePath(NodePathPattern.IDENTIFIER)
+ 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) {
+ public static Optional<QualifiedSchema> findQualifiedSchema(final String
path, final boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
Pattern pattern =
Pattern.compile(DatabaseMetaDataNodePathGenerator.getSchemaPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
- return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
+ return matcher.find() ? Optional.of(new
QualifiedSchema(matcher.group(1), matcher.group(2))) : 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/DatabaseRuleMetaDataNodePathGenerator.java
index 1b84c02411b..ad5ac1ac01f 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/DatabaseRuleMetaDataNodePathGenerator.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.mode.node.path.metadata.rule;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.mode.node.path.config.database.item.DatabaseRuleItem;
+import org.apache.shardingsphere.mode.node.path.metadata.MetaDataNodePath;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
@@ -28,8 +29,6 @@ import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DatabaseRuleMetaDataNodePathGenerator {
- private static final String ROOT_NODE = "/metadata";
-
private static final String RULE_NODE = "rules";
/**
@@ -39,7 +38,7 @@ public final class DatabaseRuleMetaDataNodePathGenerator {
* @return database root path
*/
public static String getRootPath(final String databaseName) {
- return String.join("/", ROOT_NODE, databaseName, RULE_NODE);
+ return String.join("/", MetaDataNodePath.ROOT_NODE, databaseName,
RULE_NODE);
}
/**
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/DataSourceMetaDataNodePathGenerator.java
index e0098dddb66..7dfb7c938b0 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/DataSourceMetaDataNodePathGenerator.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.mode.node.path.metadata.storage;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.mode.node.path.metadata.MetaDataNodePath;
import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
@@ -27,8 +28,6 @@ import
org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DataSourceMetaDataNodePathGenerator {
- private static final String ROOT_NODE = "/metadata";
-
private static final String DATA_SOURCES_NODE = "data_sources";
private static final String NODES_NODE = "nodes";
@@ -42,7 +41,7 @@ public final class DataSourceMetaDataNodePathGenerator {
* @return data source root path
*/
public static String getDataSourceRootPath(final String databaseName) {
- return String.join("/", ROOT_NODE, databaseName, DATA_SOURCES_NODE);
+ return String.join("/", MetaDataNodePath.ROOT_NODE, databaseName,
DATA_SOURCES_NODE);
}
/**
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGeneratorTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGeneratorTest.java
index 22724d0c91e..b20d3437b80 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGeneratorTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathGeneratorTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mode.node.path.metadata.database;
-import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -25,11 +24,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
class DatabaseMetaDataNodePathGeneratorTest {
- @Test
- void assertGetRootPath() {
-
MatcherAssert.assertThat(DatabaseMetaDataNodePathGenerator.getRootPath(),
is("/metadata"));
- }
-
@Test
void assertGetDatabasePath() {
assertThat(DatabaseMetaDataNodePathGenerator.getDatabasePath("foo_db"),
is("/metadata/foo_db"));
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParserTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParserTest.java
index 45619ef6f09..50c8f80ca6d 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParserTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/DatabaseMetaDataNodePathParserTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.mode.node.path.metadata.database;
+import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedSchema;
import org.junit.jupiter.api.Test;
import java.util.Optional;
@@ -29,54 +30,30 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
class DatabaseMetaDataNodePathParserTest {
@Test
- void assertFindDatabaseNameWithNotContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findDatabaseName("/metadata/foo_db", false);
+ void assertFindQualifiedSchemaWithNotContainsChildPath() {
+ Optional<QualifiedSchema> actual =
DatabaseMetaDataNodePathParser.findQualifiedSchema("/metadata/foo_db/schemas/foo_schema",
false);
assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_db"));
+ assertThat(actual.get().getDatabaseName(), is("foo_db"));
+ assertThat(actual.get().getSchemaName(), is("foo_schema"));
}
@Test
- void assertNotFindDatabaseNameWithNotContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findDatabaseName("/metadata/foo_db/schemas/foo_schema",
false);
+ void assertNotFindQualifiedSchemaWithNotContainsChildPath() {
+ Optional<QualifiedSchema> actual =
DatabaseMetaDataNodePathParser.findQualifiedSchema("/metadata/foo_db/schemas/foo_schema/tables",
false);
assertFalse(actual.isPresent());
}
@Test
- void assertFindDatabaseNameWithContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findDatabaseName("/metadata/foo_db/schemas/foo_schema",
true);
+ void assertFindQualifiedSchemaWithContainsChildPath() {
+ Optional<QualifiedSchema> actual =
DatabaseMetaDataNodePathParser.findQualifiedSchema("/metadata/foo_db/schemas/foo_schema/tables",
true);
assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_db"));
+ assertThat(actual.get().getDatabaseName(), is("foo_db"));
+ assertThat(actual.get().getSchemaName(), is("foo_schema"));
}
@Test
- void assertNotFindDatabaseNameWithContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findDatabaseName("/xxx/foo_db/schemas/foo_schema",
true);
- assertFalse(actual.isPresent());
- }
-
- @Test
- void assertFindSchemaNameWithNotContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema",
false);
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_schema"));
- }
-
- @Test
- void assertNotFindSchemaNameWithNotContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
false);
- assertFalse(actual.isPresent());
- }
-
- @Test
- void assertFindSchemaNameWithContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findSchemaName("/metadata/foo_db/schemas/foo_schema/tables",
true);
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_schema"));
- }
-
- @Test
- void assertNotFindSchemaNameWithContainsChildPath() {
- Optional<String> actual =
DatabaseMetaDataNodePathParser.findSchemaName("/xxx/foo_db/schemas/foo_schema/tables",
true);
+ void assertNotFindQualifiedSchemaWithContainsChildPath() {
+ Optional<QualifiedSchema> actual =
DatabaseMetaDataNodePathParser.findQualifiedSchema("/xxx/foo_db/schemas/foo_schema/tables",
true);
assertFalse(actual.isPresent());
}
}
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 271927c066a..8b525e7395a 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,6 +17,7 @@
package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedSchema;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -64,18 +65,18 @@ public final class MetaDataChangedHandler {
*/
public boolean handle(final String databaseName, final DataChangedEvent
event) {
String eventKey = event.getKey();
- Optional<String> schemaName =
DatabaseMetaDataNodePathParser.findSchemaName(eventKey, false);
- if (schemaName.isPresent()) {
- handleSchemaChanged(databaseName, schemaName.get(), event);
+ Optional<QualifiedSchema> qualifiedSchema =
DatabaseMetaDataNodePathParser.findQualifiedSchema(eventKey, false);
+ if (qualifiedSchema.isPresent()) {
+ handleSchemaChanged(databaseName,
qualifiedSchema.get().getSchemaName(), event);
return true;
}
- schemaName = DatabaseMetaDataNodePathParser.findSchemaName(eventKey,
true);
- if (schemaName.isPresent() && isTableMetaDataChanged(eventKey)) {
- handleTableChanged(databaseName, schemaName.get(), event);
+ qualifiedSchema =
DatabaseMetaDataNodePathParser.findQualifiedSchema(eventKey, true);
+ if (qualifiedSchema.isPresent() && isTableMetaDataChanged(eventKey)) {
+ handleTableChanged(databaseName,
qualifiedSchema.get().getSchemaName(), event);
return true;
}
- if (schemaName.isPresent() && isViewMetaDataChanged(eventKey)) {
- handleViewChanged(databaseName, schemaName.get(), event);
+ if (qualifiedSchema.isPresent() && isViewMetaDataChanged(eventKey)) {
+ handleViewChanged(databaseName,
qualifiedSchema.get().getSchemaName(), event);
return true;
}
if (DataSourceMetaDataNodePathParser.isDataSourceRootPath(eventKey)) {
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 5f8979885ac..6033307bfb9 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
@@ -19,6 +19,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.metadata.database.schema.QualifiedSchema;
import
org.apache.shardingsphere.infra.spi.type.ordered.cache.OrderedServicesCache;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -40,16 +41,16 @@ public final class DatabaseMetaDataChangedListener
implements DataChangedEventLi
@Override
public void onChange(final DataChangedEvent event) {
- Optional<String> databaseName =
DatabaseMetaDataNodePathParser.findDatabaseName(event.getKey(), true);
- if (!databaseName.isPresent()) {
+ Optional<QualifiedSchema> qualifiedSchema =
DatabaseMetaDataNodePathParser.findQualifiedSchema(event.getKey(), true);
+ if (!qualifiedSchema.isPresent()) {
return;
}
OrderedServicesCache.clearCache();
- if (new
MetaDataChangedHandler(contextManager).handle(databaseName.get(), event)) {
+ if (new
MetaDataChangedHandler(contextManager).handle(qualifiedSchema.get().getDatabaseName(),
event)) {
return;
}
try {
- new
RuleConfigurationChangedHandler(contextManager).handle(databaseName.get(),
event);
+ new
RuleConfigurationChangedHandler(contextManager).handle(qualifiedSchema.get().getDatabaseName(),
event);
} catch (final SQLException ex) {
throw new SQLWrapperException(ex);
}
