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 5910a019db1 Rename ViewMetaDataPersistService.drop() (#34533)
5910a019db1 is described below
commit 5910a019db191f31b582790c1d97d88ef299f7eb
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Jan 30 18:05:51 2025 +0800
Rename ViewMetaDataPersistService.drop() (#34533)
---
.../table/TableMetaDataPersistService.java | 22 +++++++++++-----------
.../metadata/table/ViewMetaDataPersistService.java | 16 ++++++++--------
.../table/ViewMetaDataPersistServiceTest.java | 4 ++--
.../ClusterMetaDataManagerPersistService.java | 2 +-
.../StandaloneMetaDataManagerPersistService.java | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
index e8e8c1d1de3..4a16c108663 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
@@ -43,6 +43,8 @@ public final class TableMetaDataPersistService {
private final MetaDataVersionPersistService metaDataVersionPersistService;
+ private final YamlTableSwapper swapper = new YamlTableSwapper();
+
/**
* Load tables.
*
@@ -64,9 +66,8 @@ public final class TableMetaDataPersistService {
* @return loaded table
*/
public ShardingSphereTable load(final String databaseName, final String
schemaName, final String tableName) {
- String tableContent =
repository.query(TableMetaDataNodePath.getTableVersionPath(databaseName,
schemaName, tableName,
-
repository.query(TableMetaDataNodePath.getTableActiveVersionPath(databaseName,
schemaName, tableName))));
- return new
YamlTableSwapper().swapToObject(YamlEngine.unmarshal(tableContent,
YamlShardingSphereTable.class));
+ String tableContent =
repository.query(TableMetaDataNodePath.getTableVersionPath(databaseName,
schemaName, tableName, getActiveVersion(databaseName, schemaName, tableName)));
+ return swapper.swapToObject(YamlEngine.unmarshal(tableContent,
YamlShardingSphereTable.class));
}
/**
@@ -82,13 +83,12 @@ public final class TableMetaDataPersistService {
String tableName = each.getName().toLowerCase();
List<String> versions =
metaDataVersionPersistService.getVersions(TableMetaDataNodePath.getTableVersionsPath(databaseName,
schemaName, tableName));
String nextActiveVersion = versions.isEmpty() ?
MetaDataVersion.DEFAULT_VERSION :
String.valueOf(Integer.parseInt(versions.get(0)) + 1);
- repository.persist(
- TableMetaDataNodePath.getTableVersionPath(databaseName,
schemaName, tableName, nextActiveVersion), YamlEngine.marshal(new
YamlTableSwapper().swapToYamlConfiguration(each)));
+
repository.persist(TableMetaDataNodePath.getTableVersionPath(databaseName,
schemaName, tableName, nextActiveVersion),
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
if (Strings.isNullOrEmpty(getActiveVersion(databaseName,
schemaName, tableName))) {
repository.persist(TableMetaDataNodePath.getTableActiveVersionPath(databaseName,
schemaName, tableName), MetaDataVersion.DEFAULT_VERSION);
}
- metaDataVersions
- .add(new
MetaDataVersion(TableMetaDataNodePath.getTablePath(databaseName, schemaName,
tableName), getActiveVersion(databaseName, schemaName, tableName),
nextActiveVersion));
+ metaDataVersions.add(
+ new
MetaDataVersion(TableMetaDataNodePath.getTablePath(databaseName, schemaName,
tableName), getActiveVersion(databaseName, schemaName, tableName),
nextActiveVersion));
}
metaDataVersionPersistService.switchActiveVersion(metaDataVersions);
}
@@ -100,8 +100,8 @@ public final class TableMetaDataPersistService {
/**
* Drop table.
*
- * @param databaseName to be dropped database name
- * @param schemaName to be dropped schema name
+ * @param databaseName database name
+ * @param schemaName schema name
* @param tableName to be dropped table name
*/
public void drop(final String databaseName, final String schemaName, final
String tableName) {
@@ -111,8 +111,8 @@ public final class TableMetaDataPersistService {
/**
* Drop tables.
*
- * @param databaseName to be dropped database name
- * @param schemaName to be dropped schema name
+ * @param databaseName database name
+ * @param schemaName schema name
* @param tables to be dropped tables
*/
public void drop(final String databaseName, final String schemaName, final
Collection<ShardingSphereTable> tables) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
index 25ff9f8714f..3ebb0ba7fdb 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
@@ -43,6 +43,8 @@ public final class ViewMetaDataPersistService {
private final MetaDataVersionPersistService metaDataVersionPersistService;
+ private final YamlViewSwapper swapper = new YamlViewSwapper();
+
/**
* Load views.
*
@@ -63,9 +65,8 @@ public final class ViewMetaDataPersistService {
* @return loaded view
*/
public ShardingSphereView load(final String databaseName, final String
schemaName, final String viewName) {
- String view =
repository.query(ViewMetaDataNodePath.getViewVersionPath(databaseName,
schemaName, viewName,
-
repository.query(ViewMetaDataNodePath.getViewActiveVersionPath(databaseName,
schemaName, viewName))));
- return new YamlViewSwapper().swapToObject(YamlEngine.unmarshal(view,
YamlShardingSphereView.class));
+ String view =
repository.query(ViewMetaDataNodePath.getViewVersionPath(databaseName,
schemaName, viewName, getActiveVersion(databaseName, schemaName, viewName)));
+ return swapper.swapToObject(YamlEngine.unmarshal(view,
YamlShardingSphereView.class));
}
/**
@@ -81,8 +82,7 @@ public final class ViewMetaDataPersistService {
String viewName = each.getName().toLowerCase();
List<String> versions =
metaDataVersionPersistService.getVersions(ViewMetaDataNodePath.getViewVersionsPath(databaseName,
schemaName, viewName));
String nextActiveVersion = versions.isEmpty() ?
MetaDataVersion.DEFAULT_VERSION :
String.valueOf(Integer.parseInt(versions.get(0)) + 1);
-
repository.persist(ViewMetaDataNodePath.getViewVersionPath(databaseName,
schemaName, viewName, nextActiveVersion),
- YamlEngine.marshal(new
YamlViewSwapper().swapToYamlConfiguration(each)));
+
repository.persist(ViewMetaDataNodePath.getViewVersionPath(databaseName,
schemaName, viewName, nextActiveVersion),
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
if (Strings.isNullOrEmpty(getActiveVersion(databaseName,
schemaName, viewName))) {
repository.persist(ViewMetaDataNodePath.getViewActiveVersionPath(databaseName,
schemaName, viewName), MetaDataVersion.DEFAULT_VERSION);
}
@@ -96,13 +96,13 @@ public final class ViewMetaDataPersistService {
}
/**
- * Delete view.
+ * Drop view.
*
* @param databaseName database name
* @param schemaName schema name
- * @param viewName view name
+ * @param viewName to be dropped view name
*/
- public void delete(final String databaseName, final String schemaName,
final String viewName) {
+ public void drop(final String databaseName, final String schemaName, final
String viewName) {
repository.delete(ViewMetaDataNodePath.getViewPath(databaseName,
schemaName, viewName.toLowerCase()));
}
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
index 22ecafaf6be..dd1d0c3926d 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
@@ -82,8 +82,8 @@ class ViewMetaDataPersistServiceTest {
}
@Test
- void assertDelete() {
- persistService.delete("foo_db", "foo_schema", "foo_view");
+ void assertDrop() {
+ persistService.drop("foo_db", "foo_schema", "foo_view");
verify(repository).delete("/metadata/foo_db/schemas/foo_schema/views/foo_view");
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 62e53a52b72..94dbbec95b2 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -93,7 +93,7 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
databaseMetaDataFacade.getTable().persist(databaseName, schemaName,
alteredTables);
databaseMetaDataFacade.getView().persist(databaseName, schemaName,
alteredViews);
droppedTables.forEach(each ->
databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
- droppedViews.forEach(each ->
databaseMetaDataFacade.getView().delete(databaseName, schemaName, each));
+ droppedViews.forEach(each ->
databaseMetaDataFacade.getView().drop(databaseName, schemaName, each));
}
@Override
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 48897baadd2..4967f6036fe 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -97,7 +97,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
databaseMetaDataFacade.getTable().persist(databaseName, schemaName,
alteredTables);
databaseMetaDataFacade.getView().persist(databaseName, schemaName,
alteredViews);
droppedTables.forEach(each ->
databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
- droppedViews.forEach(each ->
databaseMetaDataFacade.getView().delete(databaseName, schemaName, each));
+ droppedViews.forEach(each ->
databaseMetaDataFacade.getView().drop(databaseName, schemaName, each));
alteredTables.forEach(each ->
metaDataContextManager.getDatabaseMetaDataManager().alterTable(databaseName,
schemaName, each));
alteredViews.forEach(each ->
metaDataContextManager.getDatabaseMetaDataManager().alterView(databaseName,
schemaName, each));
droppedTables.forEach(each ->
metaDataContextManager.getDatabaseMetaDataManager().dropTable(databaseName,
schemaName, each));
