This is an automated email from the ASF dual-hosted git repository.
soulasuna 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 78f31e00039 Remove SchemaMetaDataPersistService.compareAndPersist
interface (#21073)
78f31e00039 is described below
commit 78f31e000390d7752fc5a3a5b234457ac9f1c487
Author: zhaojinchao <[email protected]>
AuthorDate: Tue Sep 20 10:43:13 2022 +0800
Remove SchemaMetaDataPersistService.compareAndPersist interface (#21073)
* Remove SchemaMetaDataPersistService.compareAndPersist interface
* Remove unless unit test
---
.../metadata/persist/service/DatabaseMetaDataPersistService.java | 6 +++++-
.../persist/service/schema/SchemaMetaDataPersistService.java | 9 ---------
.../persist/service/schema/TableMetaDataPersistService.java | 8 --------
.../persist/service/schema/ViewMetaDataPersistService.java | 4 ----
.../service/config/schema/TableMetaDataPersistServiceTest.java | 9 ---------
5 files changed, 5 insertions(+), 31 deletions(-)
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
index f7328f8b6fd..324677e2869 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
@@ -18,7 +18,9 @@
package org.apache.shardingsphere.mode.metadata.persist.service;
import lombok.Getter;
+import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import
org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import
org.apache.shardingsphere.mode.metadata.persist.service.schema.TableMetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.service.schema.ViewMetaDataPersistService;
@@ -104,7 +106,9 @@ public final class DatabaseMetaDataPersistService {
if (schema.getTables().isEmpty() && schema.getViews().isEmpty()) {
addSchema(databaseName, schemaName);
}
- tableMetaDataPersistService.compareAndPersist(databaseName,
schemaName, schema.getTables());
+ Map<String, ShardingSphereTable> currentTables =
tableMetaDataPersistService.load(databaseName, schemaName);
+ tableMetaDataPersistService.persist(databaseName, schemaName,
SchemaManager.getToBeAddedTables(schema.getTables(), currentTables));
+ SchemaManager.getToBeDeletedTables(schema.getTables(),
currentTables).forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
}
/**
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetaDataPersistService.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetaDataPersistService.java
index eaed207c630..7dc80c25fa3 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetaDataPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/SchemaMetaDataPersistService.java
@@ -24,15 +24,6 @@ package
org.apache.shardingsphere.mode.metadata.persist.service.schema;
*/
public interface SchemaMetaDataPersistService<T> {
- /**
- * Compare and persist meta data.
- *
- * @param databaseName database name
- * @param schemaName schema name
- * @param schema schema meta data
- */
- void compareAndPersist(String databaseName, String schemaName, T schema);
-
/**
* Persist meta data.
*
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetaDataPersistService.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetaDataPersistService.java
index 53a154d591a..f1b0a4030ca 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetaDataPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/TableMetaDataPersistService.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.mode.metadata.persist.service.schema;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
-import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
@@ -40,13 +39,6 @@ public final class TableMetaDataPersistService implements
SchemaMetaDataPersistS
private final PersistRepository repository;
- @Override
- public void compareAndPersist(final String databaseName, final String
schemaName, final Map<String, ShardingSphereTable> loadedTables) {
- Map<String, ShardingSphereTable> currentTables = load(databaseName,
schemaName);
- persist(databaseName, schemaName,
SchemaManager.getToBeAddedTables(loadedTables, currentTables));
- SchemaManager.getToBeDeletedTables(loadedTables,
currentTables).forEach((key, value) -> delete(databaseName, schemaName, key));
- }
-
@Override
public void persist(final String databaseName, final String schemaName,
final Map<String, ShardingSphereTable> tables) {
tables.forEach((key, value) ->
repository.persist(DatabaseMetaDataNode.getTableMetaDataPath(databaseName,
schemaName, key.toLowerCase()),
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetaDataPersistService.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetaDataPersistService.java
index 488a2673c20..65adcf86376 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetaDataPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/schema/ViewMetaDataPersistService.java
@@ -39,10 +39,6 @@ public final class ViewMetaDataPersistService implements
SchemaMetaDataPersistSe
private final PersistRepository repository;
- @Override
- public void compareAndPersist(final String databaseName, final String
schemaName, final Map<String, ShardingSphereView> loadedViews) {
- }
-
@Override
public void persist(final String databaseName, final String schemaName,
final Map<String, ShardingSphereView> views) {
views.forEach((key, value) ->
repository.persist(DatabaseMetaDataNode.getViewMetaDataPath(databaseName,
schemaName, key.toLowerCase()),
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetaDataPersistServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetaDataPersistServiceTest.java
index cd513b2b2c4..be95fdd03a7 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetaDataPersistServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/schema/TableMetaDataPersistServiceTest.java
@@ -45,15 +45,6 @@ public final class TableMetaDataPersistServiceTest {
@Mock
private PersistRepository repository;
- @Test
- public void assertCompareAndPersist() {
- TableMetaDataPersistService tableMetaDataPersistService = new
TableMetaDataPersistService(repository);
-
when(repository.getChildrenKeys("/metadata/foo_db/schemas/foo_schema/tables")).thenReturn(Collections.singletonList("t_order"));
-
when(repository.get("/metadata/foo_db/schemas/foo_schema/tables/t_order")).thenReturn(readYAML());
- tableMetaDataPersistService.compareAndPersist("foo_db", "foo_schema",
Collections.emptyMap());
-
verify(repository).delete("/metadata/foo_db/schemas/foo_schema/tables/t_order");
- }
-
@Test
public void assertPersist() {
ShardingSphereTable table = new ShardingSphereTable("foo_table",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
