You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2026/03/17 05:27:13 UTC

(shardingsphere) branch master updated: Refactor SchemaMetaDataPersistService (#38477)

This is an automated email from the ASF dual-hosted git repository.

menghaoran 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 76e7be2e37e Refactor SchemaMetaDataPersistService (#38477)
76e7be2e37e is described below

commit 76e7be2e37eb9fad0749932afe807bfb38f5f0d6
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Tue Mar 17 13:27:06 2026 +0800

    Refactor SchemaMetaDataPersistService (#38477)
---
 .../metadata/persist/metadata/DatabaseMetaDataPersistFacade.java  | 4 ++--
 .../persist/metadata/service/SchemaMetaDataPersistService.java    | 3 +--
 .../persist/metadata/DatabaseMetaDataPersistFacadeTest.java       | 4 ++--
 .../metadata/service/SchemaMetaDataPersistServiceTest.java        | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
index e3fb2dd45fa..e2bc57965d3 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
@@ -78,8 +78,8 @@ public final class DatabaseMetaDataPersistFacade {
     public void persistReloadDatabase(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) {
         Collection<ShardingSphereSchema> toBeAlteredSchemasWithTablesDropped = GenericSchemaManager.getToBeAlteredSchemasWithTablesDropped(reloadDatabase, currentDatabase);
         Collection<ShardingSphereSchema> toBeAlteredSchemasWithTablesAdded = GenericSchemaManager.getToBeAlteredSchemasWithTablesAdded(reloadDatabase, currentDatabase);
-        toBeAlteredSchemasWithTablesAdded.forEach(each -> table.persist(databaseName, each.getName().toLowerCase(), each.getAllTables()));
-        toBeAlteredSchemasWithTablesDropped.forEach(each -> table.drop(databaseName, each.getName().toLowerCase(), each.getAllTables()));
+        toBeAlteredSchemasWithTablesAdded.forEach(each -> table.persist(databaseName, each.getName(), each.getAllTables()));
+        toBeAlteredSchemasWithTablesDropped.forEach(each -> table.drop(databaseName, each.getName(), each.getAllTables()));
     }
     
     /**
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 5eb6e97ea6c..b218e0295e6 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
@@ -23,7 +23,6 @@ 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.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.persist.service.TableMetaDataPersistService;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
@@ -50,7 +49,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)), "");
+        repository.persist(NodePathGenerator.toPath(new SchemaMetaDataNodePath(databaseName, schemaName)), "");
     }
     
     /**
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacadeTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacadeTest.java
index 636405745a6..d1d1af541e8 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacadeTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacadeTest.java
@@ -120,8 +120,8 @@ class DatabaseMetaDataPersistFacadeTest {
         when(GenericSchemaManager.getToBeAlteredSchemasWithTablesAdded(any(), any()))
                 .thenReturn(Collections.singleton(new ShardingSphereSchema("Foo_Added", mock(DatabaseType.class))));
         databaseMetaDataFacade.persistReloadDatabase("foo_db", mock(ShardingSphereDatabase.class), mock(ShardingSphereDatabase.class));
-        verify(tableMetaDataService).persist(eq("foo_db"), eq("foo_added"), anyCollection());
-        verify(tableMetaDataService).drop(eq("foo_db"), eq("foo_dropped"), anyCollection());
+        verify(tableMetaDataService).persist(eq("foo_db"), eq("Foo_Added"), anyCollection());
+        verify(tableMetaDataService).drop(eq("foo_db"), eq("Foo_Dropped"), anyCollection());
     }
     
     @Test
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistServiceTest.java
index c8af86217b2..c923b359ce2 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistServiceTest.java
@@ -59,7 +59,7 @@ class SchemaMetaDataPersistServiceTest {
     @Test
     void assertAdd() {
         persistService.add("foo_db", "foo_schema");
-        assertThat(repository.query("/metadata/foo_db/schemas/foo_schema/tables"), is(""));
+        assertThat(repository.query("/metadata/foo_db/schemas/foo_schema"), is(""));
     }
     
     @Test
@@ -72,7 +72,7 @@ class SchemaMetaDataPersistServiceTest {
     @Test
     void assertAlterByRefreshWithoutTablesAndViews() {
         persistService.alterByRefresh("foo_db", new ShardingSphereSchema("foo_schema", databaseType));
-        assertThat(repository.query("/metadata/foo_db/schemas/foo_schema/tables"), is(""));
+        assertThat(repository.query("/metadata/foo_db/schemas/foo_schema"), is(""));
         assertTrue(tableMetaDataPersistService.load("foo_db", "foo_schema").isEmpty());
     }
     
@@ -86,13 +86,13 @@ class SchemaMetaDataPersistServiceTest {
     @Test
     void assertAlterByRefreshWithViews() {
         persistService.alterByRefresh("foo_db", new ShardingSphereSchema("foo_schema", databaseType, Collections.emptyList(), Collections.singleton(new ShardingSphereView("Foo_View", "select 1"))));
-        assertFalse(repository.isExisted("/metadata/foo_db/schemas/foo_schema/tables"));
+        assertFalse(repository.isExisted("/metadata/foo_db/schemas/foo_schema"));
     }
     
     @Test
     void assertAlterByRefreshWithRawSchemaName() {
         persistService.alterByRefresh("foo_db", new ShardingSphereSchema("Foo_Schema", databaseType));
-        assertThat(repository.query("/metadata/foo_db/schemas/Foo_Schema/tables"), is(""));
+        assertThat(repository.query("/metadata/foo_db/schemas/Foo_Schema"), is(""));
     }
     
     @Test