You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/03/06 03:33:00 UTC

(shardingsphere) branch master updated: Refactor TableChangedHandler (#34895)

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 e252177b0bb Refactor TableChangedHandler (#34895)
e252177b0bb is described below

commit e252177b0bbb9d0ab0d20346db67f5fc315a9e07
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Mar 6 11:32:54 2025 +0800

    Refactor TableChangedHandler (#34895)
    
    * Refactor TableChangedHandler
    
    * Refactor TableChangedHandler
---
 .../metadata/database/TableMetadataNodePath.java   | 10 ++++-----
 .../database/TableMetadataNodePathTest.java        |  8 +++----
 .../type/version/VersionNodePathParserTest.java    |  7 +++---
 .../database/metadata/TableChangedHandler.java     | 26 +++++++++++++---------
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePath.java
index 8b6aefae45a..4585d82bb27 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePath.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePath.java
@@ -38,10 +38,6 @@ public final class TableMetadataNodePath implements NodePath {
     
     private final String tableName;
     
-    public TableMetadataNodePath() {
-        this(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER);
-    }
-    
     /**
      * Create database search criteria.
      *
@@ -65,9 +61,11 @@ public final class TableMetadataNodePath implements NodePath {
     /**
      * Create table search criteria.
      *
+     * @param databaseName database name
+     * @param schemaName schema name
      * @return created search criteria
      */
-    public static NodePathSearchCriteria createTableSearchCriteria() {
-        return new NodePathSearchCriteria(new TableMetadataNodePath(), false, false, 3);
+    public static NodePathSearchCriteria createTableSearchCriteria(final String databaseName, final String schemaName) {
+        return new NodePathSearchCriteria(new TableMetadataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER), false, true, 1);
     }
 }
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePathTest.java
index 5c1c1cfeb29..8b5f8d52101 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePathTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePathTest.java
@@ -64,9 +64,9 @@ class TableMetadataNodePathTest {
     
     @Test
     void assertCreateTableSearchCriteria() {
-        assertThat(NodePathSearcher.find("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl", TableMetadataNodePath.createTableSearchCriteria()), is(Optional.of("foo_tbl")));
-        assertFalse(NodePathSearcher.find("/xxx/foo_db/schemas/foo_schema/tables/foo_tbl", TableMetadataNodePath.createTableSearchCriteria()).isPresent());
-        assertTrue(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl", TableMetadataNodePath.createTableSearchCriteria()));
-        assertFalse(NodePathSearcher.isMatchedPath("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0", TableMetadataNodePath.createTableSearchCriteria()));
+        assertThat(NodePathSearcher.find("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl", TableMetadataNodePath.createTableSearchCriteria("foo_db", "foo_schema")), is(Optional.of("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/version/VersionNodePathParserTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/version/VersionNodePathParserTest.java
index b08d2b4aa22..6bc50c8e26b 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/version/VersionNodePathParserTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/version/VersionNodePathParserTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.mode.node.path.type.version;
 
+import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
 import org.apache.shardingsphere.mode.node.path.type.metadata.database.TableMetadataNodePath;
 import org.junit.jupiter.api.Test;
 
@@ -29,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class VersionNodePathParserTest {
     
-    private final VersionNodePathParser parser = new VersionNodePathParser(new TableMetadataNodePath());
+    private final VersionNodePathParser parser = new VersionNodePathParser(new TableMetadataNodePath("foo_db", "foo_schema", NodePathPattern.IDENTIFIER));
     
     @Test
     void assertIsActiveVersionPath() {
@@ -39,9 +40,7 @@ class VersionNodePathParserTest {
     @Test
     void assertFindIdentifierByActiveVersionPath() {
         String path = "/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version";
-        assertThat(parser.findIdentifierByActiveVersionPath(path, 1), is(Optional.of("foo_db")));
-        assertThat(parser.findIdentifierByActiveVersionPath(path, 2), is(Optional.of("foo_schema")));
-        assertThat(parser.findIdentifierByActiveVersionPath(path, 3), is(Optional.of("foo_tbl")));
+        assertThat(parser.findIdentifierByActiveVersionPath(path, 1), is(Optional.of("foo_tbl")));
     }
     
     @Test
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 d7a5081fc50..ebdea649fad 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
@@ -19,11 +19,11 @@ package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database
 
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;
-import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.DatabaseChangedHandler;
 import org.apache.shardingsphere.mode.metadata.manager.ActiveVersionChecker;
 import org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
+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.metadata.database.TableMetadataNodePath;
 import org.apache.shardingsphere.mode.node.path.type.version.VersionNodePathParser;
@@ -49,8 +49,7 @@ public final class TableChangedHandler implements DatabaseChangedHandler {
     
     @Override
     public boolean isSubscribed(final String databaseName, final DataChangedEvent event) {
-        return NodePathSearcher.isMatchedPath(event.getKey(), TableMetadataNodePath.createTableSearchCriteria())
-                || new VersionNodePathParser(new TableMetadataNodePath()).isActiveVersionPath(event.getKey());
+        return new VersionNodePathParser(new TableMetadataNodePath(databaseName, NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER)).isActiveVersionPath(event.getKey());
     }
     
     @Override
@@ -59,16 +58,22 @@ public final class TableChangedHandler implements DatabaseChangedHandler {
         if (!schemaName.isPresent()) {
             return;
         }
-        if ((Type.ADDED == event.getType() || Type.UPDATED == event.getType()) && new VersionNodePathParser(new TableMetadataNodePath()).isActiveVersionPath(event.getKey())) {
-            handleCreatedOrAltered(databaseName, schemaName.get(), event);
-        } else if (Type.DELETED == event.getType() && NodePathSearcher.isMatchedPath(event.getKey(), TableMetadataNodePath.createTableSearchCriteria())) {
-            handleDropped(databaseName, schemaName.get(), event);
+        switch (event.getType()) {
+            case ADDED:
+            case UPDATED:
+                handleCreatedOrAltered(databaseName, schemaName.get(), event);
+                break;
+            case DELETED:
+                handleDropped(databaseName, schemaName.get(), event);
+                break;
+            default:
+                break;
         }
     }
     
     private void handleCreatedOrAltered(final String databaseName, final String schemaName, final DataChangedEvent event) {
-        String tableName = new VersionNodePathParser(new TableMetadataNodePath())
-                .findIdentifierByActiveVersionPath(event.getKey(), 3).orElseThrow(() -> new IllegalStateException("Table name not found."));
+        String tableName = NodePathSearcher.find(event.getKey(), TableMetadataNodePath.createTableSearchCriteria(databaseName, schemaName))
+                .orElseThrow(() -> new IllegalStateException("Table name not found."));
         if (!activeVersionChecker.checkSame(event)) {
             return;
         }
@@ -78,7 +83,8 @@ public final class TableChangedHandler implements DatabaseChangedHandler {
     }
     
     private void handleDropped(final String databaseName, final String schemaName, final DataChangedEvent event) {
-        String tableName = NodePathSearcher.find(event.getKey(), TableMetadataNodePath.createTableSearchCriteria()).orElseThrow(() -> new IllegalStateException("Table name not found."));
+        String tableName = NodePathSearcher.find(event.getKey(), TableMetadataNodePath.createTableSearchCriteria(databaseName, schemaName))
+                .orElseThrow(() -> new IllegalStateException("Table name not found."));
         contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropTable(databaseName, schemaName, tableName);
         statisticsRefreshEngine.asyncRefresh();
     }